From 1b2883e563bb046068affbaf105b34875e12b6ca Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 13 Dec 2021 09:44:15 +0800 Subject: *misc --- Client/Project/VisualStudio/Ragdolls/Ragdolls.sln | 3 +++ Client/Source/Math/Vector2.hpp | 2 -- .../\350\256\276\350\256\241.xlsx" | Bin 8446381 -> 8446389 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Client/Project/VisualStudio/Ragdolls/Ragdolls.sln b/Client/Project/VisualStudio/Ragdolls/Ragdolls.sln index 2126b83..4a53f75 100644 --- a/Client/Project/VisualStudio/Ragdolls/Ragdolls.sln +++ b/Client/Project/VisualStudio/Ragdolls/Ragdolls.sln @@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeshBuilder", "MeshBuilder\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ragdolls", "Ragdolls\Ragdolls.vcxproj", "{2F2534C8-5E6C-4F97-A0E6-17A523FD8AED}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Box2D", "Box2D", "{3A2F4BBE-AD5D-4CD4-9B33-8C9907083A46}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -41,6 +43,7 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {C16CF3E1-0B6C-4166-A89C-846F7B28CA42} = {DA076690-8AD4-41EF-A512-A2883924E841} + {3A2F4BBE-AD5D-4CD4-9B33-8C9907083A46} = {CCEAD487-2900-4EC3-BA6C-663849A5517E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4711990F-AE3C-42FE-8E31-1AB4861146E0} diff --git a/Client/Source/Math/Vector2.hpp b/Client/Source/Math/Vector2.hpp index 65f2c10..fed1fe7 100644 --- a/Client/Source/Math/Vector2.hpp +++ b/Client/Source/Math/Vector2.hpp @@ -49,7 +49,6 @@ public: return res; } - float x, y; static Vector2Template zero; @@ -60,7 +59,6 @@ public: using Vector2f = Vector2Template; using Vector2i = Vector2Template; - template Vector2Template Vector2Template::zero = Vector2Template(0, 0); template diff --git "a/Documents/\350\256\276\350\256\241/\350\256\276\350\256\241.xlsx" "b/Documents/\350\256\276\350\256\241/\350\256\276\350\256\241.xlsx" index aa2b56a..1a76cea 100644 Binary files "a/Documents/\350\256\276\350\256\241/\350\256\276\350\256\241.xlsx" and "b/Documents/\350\256\276\350\256\241/\350\256\276\350\256\241.xlsx" differ -- cgit v1.1-26-g67d0