BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Physics!!!!!1111oneoneonetwo

Browse Source
This commit is contained in:
ViktorLjung
2014-04-06 03:39:50 +02:00
parent d6fc82c91e
commit 1d0747076f
12 changed files with 373 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs12/Returngeance/Returngeance.vcxproj
+6 -3
View File
@@ -61,7 +61,7 @@
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32d.lib;glfw3dll.lib;BulletCollision_Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>BulletCollision_Debug.lib;BulletDynamics_Debug.lib;LinearMath_Debug.lib;OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32d.lib;glfw3dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep />
</ItemDefinitionGroup>
@@ -80,7 +80,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32.lib;glfw3dll.lib;BulletCollision.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>BulletCollision.lib;BulletDynamics.lib;LinearMath.lib;OpenAL32.lib;opengl32.lib;glu32.lib;SOIL.lib;glew32.lib;glfw3dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep />
</ItemDefinitionGroup>
@@ -95,8 +95,10 @@
<ClCompile Include="..\..\src\Renderer.cpp" />
<ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\Skybox.cpp" />
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp" />
<ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\InputSystem.cpp" />
<ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TransformSystem.cpp" />
<ClCompile Include="..\..\src\Texture.cpp" />
@@ -110,7 +112,6 @@
<ClInclude Include="..\..\src\Components\BoxShape.h" />
<ClInclude Include="..\..\src\Components\Camera.h" />
<ClInclude Include="..\..\src\Components\Collision.h" />
<ClInclude Include="..\..\src\Components\CustomShape.h" />
<ClInclude Include="..\..\src\Components\DirectionalLight.h" />
<ClInclude Include="..\..\src\Components\FreeSteering.h" />
<ClInclude Include="..\..\src\Components\Input.h" />
@@ -137,8 +138,10 @@
<ClInclude Include="..\..\src\ShaderProgram.h" />
<ClInclude Include="..\..\src\Skybox.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Systems\DebugSystem.h" />
<ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\InputSystem.h" />
<ClInclude Include="..\..\src\Systems\PhysicsSystem.h" />
<ClInclude Include="..\..\src\Systems\RenderSystem.h" />
<ClInclude Include="..\..\src\Systems\TransformSystem.h" />
<ClInclude Include="..\..\src\Texture.h" />
vs12/Returngeance/Returngeance.vcxproj.filters
+11 -2
View File
@@ -25,6 +25,12 @@
<ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp">
<Filter>Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp">
<Filter>Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp">
<Filter>Systems</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Util">
@@ -130,8 +136,11 @@
<ClInclude Include="..\..\src\Components\BoxShape.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\CustomShape.h">
<Filter>Components</Filter>
<ClInclude Include="..\..\src\Systems\PhysicsSystem.h">
<Filter>Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\DebugSystem.h">
<Filter>Systems</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>