diff options
24 files changed, 287 insertions, 112 deletions
diff --git a/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj new file mode 100644 index 0000000..01c1b89 --- /dev/null +++ b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <VCProjectVersion>15.0</VCProjectVersion>
+ <ProjectGuid>{0189015F-D8AE-40DE-8EDF-089EB08EC960}</ProjectGuid>
+ <RootNamespace>MapEditor</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>v141</PlatformToolset>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <SDLCheck>true</SDLCheck>
+ <ConformanceMode>true</ConformanceMode>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.filters b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.filters new file mode 100644 index 0000000..6546942 --- /dev/null +++ b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.filters @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="源文件">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="头文件">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+ </Filter>
+ <Filter Include="资源文件">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.user b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.user new file mode 100644 index 0000000..6e2aec7 --- /dev/null +++ b/Client/Project/VisualStudio/MapEditor/MapEditor.vcxproj.user @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file diff --git a/Client/Project/VisualStudio/PND.sln b/Client/Project/VisualStudio/PND.sln index 3169007..0503ff2 100644 --- a/Client/Project/VisualStudio/PND.sln +++ b/Client/Project/VisualStudio/PND.sln @@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{3D588F3B-8 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_json", "test_json\test_json.vcxproj", "{ED1DC038-8E90-443F-88DE-C2F2D0D81052}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapEditor", "MapEditor\MapEditor.vcxproj", "{0189015F-D8AE-40DE-8EDF-089EB08EC960}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -127,6 +129,14 @@ Global {ED1DC038-8E90-443F-88DE-C2F2D0D81052}.Release|x64.Build.0 = Release|x64
{ED1DC038-8E90-443F-88DE-C2F2D0D81052}.Release|x86.ActiveCfg = Release|Win32
{ED1DC038-8E90-443F-88DE-C2F2D0D81052}.Release|x86.Build.0 = Release|Win32
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Debug|x64.ActiveCfg = Debug|x64
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Debug|x64.Build.0 = Debug|x64
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Debug|x86.ActiveCfg = Debug|Win32
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Debug|x86.Build.0 = Debug|Win32
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Release|x64.ActiveCfg = Release|x64
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Release|x64.Build.0 = Release|x64
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Release|x86.ActiveCfg = Release|Win32
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -142,6 +152,7 @@ Global {88E2113C-BC15-4D54-8D09-5DBFB3A47C6D} = {845A763B-9CD8-4795-A3C4-D83146B3550C}
{3D588F3B-81F5-44EF-8E6E-074D111DCE46} = {845A763B-9CD8-4795-A3C4-D83146B3550C}
{ED1DC038-8E90-443F-88DE-C2F2D0D81052} = {3D588F3B-81F5-44EF-8E6E-074D111DCE46}
+ {0189015F-D8AE-40DE-8EDF-089EB08EC960} = {69D9F6A1-FE05-4A58-B87C-E62A6C69BE8F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3501AE41-C1E5-4131-9AB2-0DCBD10D9E3F}
diff --git a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj index e3748f7..25822a6 100644 --- a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj +++ b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj @@ -136,6 +136,7 @@ <ClInclude Include="..\..\..\Source\PND\GameCode\Components\MovementComponent.h" />
<ClInclude Include="..\..\..\Source\PND\GameCode\Entity.h" />
<ClInclude Include="..\..\..\Source\PND\Math\Vector2.h" />
+ <ClInclude Include="..\..\..\ThirdParty\json\json.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\PND\GameCode\Component.cpp" />
diff --git a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters index ef1ebf5..2213dc5 100644 --- a/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters +++ b/Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters @@ -1,2 +1,81 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Animation">
+ <UniqueIdentifier>{73913a85-4152-4ecb-8a2c-3e36849d21ae}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Common">
+ <UniqueIdentifier>{c5ed6e67-2e83-4845-97bc-5c013f8bfb7d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="GameCode">
+ <UniqueIdentifier>{72e20810-8126-4b0f-a36f-32f11b3ac19c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="GameCode\Components">
+ <UniqueIdentifier>{2a4fa516-8c89-428b-afcb-aca4806a13e5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Graphics">
+ <UniqueIdentifier>{bc2c69cb-ebb4-4e55-b0eb-6174efd4e970}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="GUI">
+ <UniqueIdentifier>{e49ff05d-4b4e-433a-a335-683439b65561}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Math">
+ <UniqueIdentifier>{bdc96687-46e3-490a-b612-7b467803bd0f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Networking">
+ <UniqueIdentifier>{466d0dc0-cd4d-4a68-a37c-b66db796e643}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Phy2D">
+ <UniqueIdentifier>{4812f18a-79bd-4ef3-a6a2-6df76e06ce8e}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Sand2D">
+ <UniqueIdentifier>{3420320a-2fd5-4ae5-bddc-b3190e2be605}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="ThirdParty">
+ <UniqueIdentifier>{185e4d48-3278-408e-8952-9eae4c54e052}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="ThirdParty\json">
+ <UniqueIdentifier>{dd6facc4-308c-4259-a1db-5f2f50ce2f2f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="ThirdParty\libfixmath">
+ <UniqueIdentifier>{ae16fdbc-3f39-4b3c-b727-e54b65b622c4}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="ThirdParty\glad">
+ <UniqueIdentifier>{1ab66501-f8e9-4d46-883b-43d72d037a2c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Threading">
+ <UniqueIdentifier>{8b068df4-700c-43c7-875e-38c6e5181d55}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\Source\PND\Animation\Animation.h">
+ <Filter>Animation</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\PND\Common\Type.h">
+ <Filter>Common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\PND\GameCode\Component.h">
+ <Filter>GameCode</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\PND\GameCode\Entity.h">
+ <Filter>GameCode</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\PND\GameCode\Components\MovementComponent.h">
+ <Filter>GameCode\Components</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\PND\Math\Vector2.h">
+ <Filter>Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\ThirdParty\json\json.hpp">
+ <Filter>ThirdParty\json</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Source\PND\GameCode\Component.cpp">
+ <Filter>GameCode</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Source\PND\GameCode\Entity.cpp">
+ <Filter>GameCode</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj index 51acc0e..5dd7295 100644 --- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj +++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj @@ -137,6 +137,9 @@ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp" />
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat22.cpp" />
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat33.cpp" />
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Vec2.cpp" />
<ClCompile Include="..\..\..\Source\Phy2D\Tests\test_p2d.cpp" />
<ClCompile Include="..\..\..\Source\Phy2D\Tests\test_math.cpp" />
<ClCompile Include="..\..\..\ThirdParty\glad\glad.c" />
@@ -161,6 +164,9 @@ <ClInclude Include="..\..\..\Source\Phy2D\Common\Math.h" />
<ClInclude Include="..\..\..\Source\Phy2D\Common\Settings.h" />
<ClInclude Include="..\..\..\Source\Phy2D\Common\Type.h" />
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat22.h" />
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat33.h" />
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Vec2.h" />
<ClInclude Include="..\..\..\Source\Phy2D\Phy2D.h" />
<ClInclude Include="..\..\..\Source\Phy2D\Rendering\Visualize.h" />
<ClInclude Include="..\..\..\Source\Phy2D\Tests\test.h" />
diff --git a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters index 1c1e5ec..79e95cb 100644 --- a/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters +++ b/Client/Project/VisualStudio/Phy2D/Phy2D.vcxproj.filters @@ -34,6 +34,12 @@ <Filter Include="Libs\sll">
<UniqueIdentifier>{fc4d6710-2d01-480a-892c-79a461ad0ec4}</UniqueIdentifier>
</Filter>
+ <Filter Include="Joints">
+ <UniqueIdentifier>{9b93e921-176b-4735-9194-f47fccd6ca60}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Math">
+ <UniqueIdentifier>{ea4df851-7347-4fbd-a050-e7b4adf1bb68}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\Phy2D\Common\Math.cpp">
@@ -96,6 +102,15 @@ <ClCompile Include="..\..\..\ThirdParty\math-sll\math-sll.c">
<Filter>Libs\sll</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat22.cpp">
+ <Filter>Math</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Mat33.cpp">
+ <Filter>Math</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Source\Phy2D\Math\Vec2.cpp">
+ <Filter>Math</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\Phy2D\Phy2D.h" />
@@ -171,6 +186,15 @@ <ClInclude Include="..\..\..\ThirdParty\fix32\fix32.hpp">
<Filter>Libs\fix32</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat22.h">
+ <Filter>Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Mat33.h">
+ <Filter>Math</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\Phy2D\Math\Vec2.h">
+ <Filter>Math</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\..\Source\Phy2D\README.txt" />
diff --git a/Client/Source/PND/Common/Type.h b/Client/Source/PND/Common/Type.h index 9b768e9..5ac3660 100644 --- a/Client/Source/PND/Common/Type.h +++ b/Client/Source/PND/Common/Type.h @@ -3,6 +3,7 @@ #include "libfixmath/libfixmath/fix16.hpp"
#include "fix32/fix32.hpp"
-typedef Fix32 fixed32;
-typedef Fix16 fixed16;
-typedef fixed32 fixed;
+typedef Fix32 fixed32; // Q32.32
+typedef Fix16 fixed16; // Q16.16
+
+using fixed = fixed32;
diff --git a/Client/Source/PND/Math/Vector2.h b/Client/Source/PND/Math/Vector2.h index 67ac4b7..ab5ec5c 100644 --- a/Client/Source/PND/Math/Vector2.h +++ b/Client/Source/PND/Math/Vector2.h @@ -1,14 +1,12 @@ #pragma once
-
+//
#include <vector>
#include <unordered_map>
#include "../Common/Type.h"
-
class Vector2
{
public:
- fixed32 x, y;
-
+ fixed x,y;
};
diff --git a/Client/Source/PND/main.cpp b/Client/Source/PND/main.cpp index 5f2628a..4655eb9 100644 --- a/Client/Source/PND/main.cpp +++ b/Client/Source/PND/main.cpp @@ -10,4 +10,4 @@ int main() getchar();
return 0;
-}
\ No newline at end of file +}
diff --git a/Client/Source/Phy2D/Common/Settings.h b/Client/Source/Phy2D/Common/Settings.h index b03ecad..7368f9c 100644 --- a/Client/Source/Phy2D/Common/Settings.h +++ b/Client/Source/Phy2D/Common/Settings.h @@ -1,111 +1,10 @@ #pragma once
-#define NUMBER_FLOAT 1
-#define NUMBER_LIBFIX 2
-#define NUMBER_FPM 3
-#define NUMBER_FIX32 4
-
-#define NUMBER_ALIAS NUMBER_FIX32
-
-#if NUMBER_ALIAS == NUMBER_LIBFIX
-#include "libfixmath/libfixmath/fixmath.h"
-#elif NUMBER_ALIAS == NUMBER_FPM
-#include "fpm/include/fpm/fixed.hpp"
-#include "fpm/include/fpm/math.hpp"
-#elif NUMBER_ALIAS == NUMBER_FIX32
-#include "fix32/fix32.hpp"
-#endif
+#include "Type.h"
namespace Phy2D
{
-#if NUMBER_ALIAS == NUMBER_FLOAT
-
- typedef float fixed;
-#define NUMBER_MAX (FLT_MAX)
-#define NUMBER_MIN (FLT_MIN)
-#define SQRT(a) (sqrt((a)))
-#define SIN(a) (sin((a)))
-#define COS(a) (cos((a)))
-#define PI (3.1415925f)
-
-#elif NUMBER_ALIAS == NUMBER_LIBFIX
-
- typedef Fix16 fixed;
-#define NUMBER_MAX (fix16_maximum)
-#define NUMBER_MIN (fix16_minimum)
-#define SQRT(a) ((a).sqrt())
-#define SIN(a) ((a).sin())
-#define COS(a) ((a).cos())
-#define PI (fix16_pi)
-
-#elif NUMBER_ALIAS == NUMBER_FPM
- - template <typename T> - struct Limits {}; - - template <> - struct Limits<fpm::fixed_16_16> - { - static constexpr bool is_signed() noexcept { return true; } - static constexpr int digits() noexcept { return 31; } - static constexpr int max_digits10() noexcept { return 5 + 5; } - static constexpr int min_exponent() noexcept { return -15; } - static constexpr int max_exponent() noexcept { return 15; } - static constexpr int min_exponent10() noexcept { return -4; } - static constexpr int max_exponent10() noexcept { return 4; } - static constexpr fpm::fixed_16_16 min() noexcept { return fpm::fixed_16_16::from_raw_value(-2147483647 - 1); } - static constexpr fpm::fixed_16_16 max() noexcept { return fpm::fixed_16_16::from_raw_value(2147483647); } - }; - - template <> - struct Limits<fpm::fixed_24_8> - { - static constexpr bool is_signed() noexcept { return true; } - static constexpr int digits() noexcept { return 31; } - static constexpr int max_digits10() noexcept { return 7 + 3; } - static constexpr int min_exponent() noexcept { return -7; } - static constexpr int max_exponent() noexcept { return 23; } - static constexpr int min_exponent10() noexcept { return -2; } - static constexpr int max_exponent10() noexcept { return 6; } - static constexpr fpm::fixed_24_8 min() noexcept { return fpm::fixed_24_8::from_raw_value(-2147483647 - 1); } - static constexpr fpm::fixed_24_8 max() noexcept { return fpm::fixed_24_8::from_raw_value(2147483647); } - }; - - template <> - struct Limits<fpm::fixed_8_24> - { - static constexpr bool is_signed() noexcept { return true; } - static constexpr int digits() noexcept { return 31; } - static constexpr int max_digits10() noexcept { return 3 + 8; } - static constexpr int min_exponent() noexcept { return -23; } - static constexpr int max_exponent() noexcept { return 7; } - static constexpr int min_exponent10() noexcept { return -7; } - static constexpr int max_exponent10() noexcept { return 2; } - static constexpr fpm::fixed_8_24 min() noexcept { return fpm::fixed_8_24::from_raw_value(-2147483647 - 1); } - static constexpr fpm::fixed_8_24 max() noexcept { return fpm::fixed_8_24::from_raw_value(2147483647); } - }; -
- typedef fpm::fixed_16_16 fixed;
-#define NUMBER_MAX (Limits<fixed>::max())
-#define NUMBER_MIN (Limits<fixed>::min())
-#define SQRT(a) (fpm::sqrt((a)))
-#define SIN(a) (fpm::sin((a)))
-#define COS(a) (fpm::cos((a)))
-#define PI (fixed::pi())
-
-#elif NUMBER_ALIAS == NUMBER_FIX32
-
- typedef Fix32 fixed32; // Q32.32
- typedef fixed32 fixed;
-
-#define NUMBER_MAX (CONST_MAX)
-#define NUMBER_MIN (CONST_MIN)
-#define SQRT(a) ((a).sqrt())
-#define SIN(a) ((a).sin())
-#define COS(a) ((a).cos())
-#define PI (CONST_PI)
-#endif
}
\ No newline at end of file diff --git a/Client/Source/Phy2D/Common/Type.h b/Client/Source/Phy2D/Common/Type.h index e69de29..c985d99 100644 --- a/Client/Source/Phy2D/Common/Type.h +++ b/Client/Source/Phy2D/Common/Type.h @@ -0,0 +1,9 @@ +#include "fix32/fix32.hpp"
+
+namespace Phy2D
+{
+
+ using fixed = Fix32;
+
+}
+
diff --git a/Client/Source/Phy2D/Documents/Phy2D.xlsx b/Client/Source/Phy2D/Documents/Phy2D.xlsx Binary files differnew file mode 100644 index 0000000..5b6ba93 --- /dev/null +++ b/Client/Source/Phy2D/Documents/Phy2D.xlsx diff --git a/Client/Source/Phy2D/Documents/UnityPhysics2D.xlsx b/Client/Source/Phy2D/Documents/UnityPhysics2D.xlsx Binary files differnew file mode 100644 index 0000000..25bc056 --- /dev/null +++ b/Client/Source/Phy2D/Documents/UnityPhysics2D.xlsx diff --git a/Client/Source/Phy2D/Math/Mat22.cpp b/Client/Source/Phy2D/Math/Mat22.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Mat22.cpp diff --git a/Client/Source/Phy2D/Math/Mat22.h b/Client/Source/Phy2D/Math/Mat22.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Mat22.h diff --git a/Client/Source/Phy2D/Math/Mat33.cpp b/Client/Source/Phy2D/Math/Mat33.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Mat33.cpp diff --git a/Client/Source/Phy2D/Math/Mat33.h b/Client/Source/Phy2D/Math/Mat33.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Mat33.h diff --git a/Client/Source/Phy2D/Math/Vec2.cpp b/Client/Source/Phy2D/Math/Vec2.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Vec2.cpp diff --git a/Client/Source/Phy2D/Math/Vec2.h b/Client/Source/Phy2D/Math/Vec2.h new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Client/Source/Phy2D/Math/Vec2.h diff --git a/Client/Source/Phy2D/Phy2D.h b/Client/Source/Phy2D/Phy2D.h index 0fc0011..2f41e80 100644 --- a/Client/Source/Phy2D/Phy2D.h +++ b/Client/Source/Phy2D/Phy2D.h @@ -1,4 +1,5 @@ #pragma once
-
//
+
+
diff --git a/Client/ThirdParty/README.txt b/Client/ThirdParty/README.txt new file mode 100644 index 0000000..a815db8 --- /dev/null +++ b/Client/ThirdParty/README.txt @@ -0,0 +1 @@ +游戏和工具共用的库目录
\ No newline at end of file diff --git a/Client/Tools/README.txt b/Client/Tools/README.txt new file mode 100644 index 0000000..c8501c1 --- /dev/null +++ b/Client/Tools/README.txt @@ -0,0 +1,2 @@ +开发工具
+* Me
\ No newline at end of file |