| @@ -96,7 +96,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18 | |||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\people\touky\private\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\people\touky\private\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" | ||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BtPhysTest", "..\..\test\BtPhysTest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" | |||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" | |||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" | ||||
| EndProject | EndProject | ||||
| @@ -126,9 +126,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583 | |||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}" | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}" | ||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeshViewer", "..\..\test\MeshViewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" | |||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\..\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" | |||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactics", "..\..\people\touky\private\Tactics\Tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" | |||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" | |||||
| EndProject | EndProject | ||||
| Global | Global | ||||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||
| @@ -31,21 +31,19 @@ benchsuite_SOURCES = benchsuite.cpp \ | |||||
| benchsuite_CPPFLAGS = $(AM_CPPFLAGS) | benchsuite_CPPFLAGS = $(AM_CPPFLAGS) | ||||
| benchsuite_DEPENDENCIES = @LOL_DEPENDENCIES@ | benchsuite_DEPENDENCIES = @LOL_DEPENDENCIES@ | ||||
| btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h PhysicObject.h \ | |||||
| Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \ | |||||
| Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \ | |||||
| Physics/Src/EasyCharacterController.cpp \ | |||||
| Physics/Include/EasyCharacterController.h \ | |||||
| Physics/Src/EasyConstraint.cpp \ | |||||
| Physics/Include/EasyConstraint.h \ | |||||
| Physics/Src/BulletCharacterController.cpp \ | |||||
| Physics/Include/BulletCharacterController.h | |||||
| btphystest_SOURCES = \ | |||||
| btphystest.cpp btphystest.h physicobject.h \ | |||||
| physics/easyphysics.cpp physics/easyphysics.h \ | |||||
| physics/lolbtphysicsintegration.h physics/lolphysics.h \ | |||||
| physics/easycharactercontroller.cpp physics/easycharactercontroller.h \ | |||||
| physics/easyconstraint.cpp physics/easyconstraint.h \ | |||||
| physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h | |||||
| btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \ | btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \ | ||||
| -DHAVE_PHYS_USE_BULLET | -DHAVE_PHYS_USE_BULLET | ||||
| btphystest_DEPENDENCIES = @LOL_DEPENDENCIES@ | btphystest_DEPENDENCIES = @LOL_DEPENDENCIES@ | ||||
| meshviewer_SOURCES = MeshViewer.cpp \ | |||||
| shinyMVTexture.lolfx shinyfur.lolfx | |||||
| meshviewer_SOURCES = meshviewer.cpp \ | |||||
| shinymvtexture.lolfx shinyfur.lolfx | |||||
| meshviewer_CPPFLAGS = $(AM_CPPFLAGS) | meshviewer_CPPFLAGS = $(AM_CPPFLAGS) | ||||
| meshviewer_DEPENDENCIES = @LOL_DEPENDENCIES@ | meshviewer_DEPENDENCIES = @LOL_DEPENDENCIES@ | ||||
| @@ -33,10 +33,10 @@ using namespace lol; | |||||
| #define HAVE_PHYS_USE_BULLET | #define HAVE_PHYS_USE_BULLET | ||||
| #endif /* HAVE_PHYS_USE_BULLET */ | #endif /* HAVE_PHYS_USE_BULLET */ | ||||
| #include "Physics/Include/LolPhysics.h" | |||||
| #include "Physics/Include/EasyPhysics.h" | |||||
| #include "PhysicObject.h" | |||||
| #include "BtPhysTest.h" | |||||
| #include "physics/include/lolphysics.h" | |||||
| #include "physics/include/easyphysics.h" | |||||
| #include "physicobject.h" | |||||
| #include "btphystest.h" | |||||
| using namespace lol::phys; | using namespace lol::phys; | ||||
| @@ -35,7 +35,7 @@ | |||||
| </ProjectConfiguration> | </ProjectConfiguration> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClInclude Include="BtPhysTest.h" /> | |||||
| <ClInclude Include="btphystest.h" /> | |||||
| <ClInclude Include="PhysicObject.h" /> | <ClInclude Include="PhysicObject.h" /> | ||||
| <ClInclude Include="Physics\Include\BulletCharacterController.h" /> | <ClInclude Include="Physics\Include\BulletCharacterController.h" /> | ||||
| <ClInclude Include="Physics\Include\EasyCharacterController.h" /> | <ClInclude Include="Physics\Include\EasyCharacterController.h" /> | ||||
| @@ -45,7 +45,7 @@ | |||||
| <ClInclude Include="Physics\Include\LolPhysics.h" /> | <ClInclude Include="Physics\Include\LolPhysics.h" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="BtPhysTest.cpp" /> | |||||
| <ClCompile Include="btphystest.cpp" /> | |||||
| <ClCompile Include="Physics\Src\BulletCharacterController.cpp" /> | <ClCompile Include="Physics\Src\BulletCharacterController.cpp" /> | ||||
| <ClCompile Include="Physics\Src\EasyCharacterController.cpp" /> | <ClCompile Include="Physics\Src\EasyCharacterController.cpp" /> | ||||
| <ClCompile Include="Physics\Src\EasyConstraint.cpp" /> | <ClCompile Include="Physics\Src\EasyConstraint.cpp" /> | ||||
| @@ -24,7 +24,7 @@ using namespace lol; | |||||
| static int const TEXTURE_WIDTH = 256; | static int const TEXTURE_WIDTH = 256; | ||||
| LOLFX_RESOURCE_DECLARE(shinyfur); | LOLFX_RESOURCE_DECLARE(shinyfur); | ||||
| LOLFX_RESOURCE_DECLARE(shinyMVTexture); | |||||
| LOLFX_RESOURCE_DECLARE(shinymvtexture); | |||||
| #define IPT_CAM_RESET "Cam_Center" | #define IPT_CAM_RESET "Cam_Center" | ||||
| #define IPT_CAM_FORWARD "Cam_Forward" | #define IPT_CAM_FORWARD "Cam_Forward" | ||||
| @@ -69,7 +69,7 @@ public: | |||||
| m_camera->SetOrtho((float)video_size.x, (float)video_size.y, .1f, 1000.f); | m_camera->SetOrtho((float)video_size.x, (float)video_size.y, .1f, 1000.f); | ||||
| } | } | ||||
| MeshViewer(char const *file_name = "MeshViewerBuffer.txt") | |||||
| MeshViewer(char const *file_name = "data/mesh-buffer.txt") | |||||
| : m_file_name(file_name) | : m_file_name(file_name) | ||||
| { | { | ||||
| //Input setup | //Input setup | ||||
| @@ -331,10 +331,10 @@ public: | |||||
| if (!DefaultTexture) | if (!DefaultTexture) | ||||
| { | { | ||||
| m_texture_shader = Shader::Create(LOLFX_RESOURCE_NAME(shinyMVTexture)); | |||||
| m_texture_shader = Shader::Create(LOLFX_RESOURCE_NAME(shinymvtexture)); | |||||
| m_texture_uni = m_texture_shader->GetUniformLocation("u_Texture"); | m_texture_uni = m_texture_shader->GetUniformLocation("u_Texture"); | ||||
| //m_image = new Image("data/MeshViewerTestTexture.png"); | |||||
| DefaultTexture = Tiler::Register("data/MeshViewerTestTexture.png", ivec2(0), ivec2(0,1)); | |||||
| //m_image = new Image("data/test-texture.png"); | |||||
| DefaultTexture = Tiler::Register("data/test-texture.png", ivec2(0), ivec2(0,1)); | |||||
| //ivec2 size = m_image->GetSize(); | //ivec2 size = m_image->GetSize(); | ||||
| //// m_image->GetFormat() | //// m_image->GetFormat() | ||||
| @@ -35,7 +35,7 @@ | |||||
| </ProjectConfiguration> | </ProjectConfiguration> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <ClCompile Include="MeshViewer.cpp" /> | |||||
| <ClCompile Include="meshviewer.cpp" /> | |||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj"> | <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj"> | ||||
| @@ -46,13 +46,13 @@ | |||||
| </ProjectReference> | </ProjectReference> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <None Include="MeshViewerBuffer.txt"> | |||||
| <None Include="data\mesh-buffer.txt"> | |||||
| <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||||
| </None> | </None> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <LolFxCompile Include="shinyfur.lolfx" /> | <LolFxCompile Include="shinyfur.lolfx" /> | ||||
| <LolFxCompile Include="shinyMVTexture.lolfx" /> | |||||
| <LolFxCompile Include="shinymvtexture.lolfx" /> | |||||
| </ItemGroup> | </ItemGroup> | ||||
| <PropertyGroup Label="Globals"> | <PropertyGroup Label="Globals"> | ||||
| <ProjectGuid>{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}</ProjectGuid> | <ProjectGuid>{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}</ProjectGuid> | ||||
| @@ -74,4 +74,4 @@ | |||||
| <ImportGroup Label="ExtensionTargets"> | <ImportGroup Label="ExtensionTargets"> | ||||
| <Import Project="$(SolutionDir)\Lol.Fx.targets" /> | <Import Project="$(SolutionDir)\Lol.Fx.targets" /> | ||||
| </ImportGroup> | </ImportGroup> | ||||
| </Project> | |||||
| </Project> | |||||
| @@ -13,9 +13,9 @@ | |||||
| #include "core.h" | #include "core.h" | ||||
| #include "easymesh/easymesh.h" | #include "easymesh/easymesh.h" | ||||
| #include "Physics/Include/EasyPhysics.h" | |||||
| #include "Physics/Include/EasyCharacterController.h" | |||||
| #include "Physics/Include/EasyConstraint.h" | |||||
| #include "physics/include/easyphysics.h" | |||||
| #include "physics/include/easycharactercontroller.h" | |||||
| #include "physics/include/easyconstraint.h" | |||||
| using namespace lol; | using namespace lol; | ||||
| using namespace lol::phys; | using namespace lol::phys; | ||||
| @@ -19,10 +19,10 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | #include "core.h" | ||||
| #include <stdio.h> | #include <stdio.h> | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #include "../Include/EasyCharacterController.h" | |||||
| #include "../Include/BulletCharacterController.h" | |||||
| #include "../include/lolbtphysicsintegration.h" | |||||
| #include "../include/lolphysics.h" | |||||
| #include "../include/easycharactercontroller.h" | |||||
| #include "../include/bulletcharactercontroller.h" | |||||
| //#include "LinearMath/btIDebugDraw.h" | //#include "LinearMath/btIDebugDraw.h" | ||||
| //#include "BulletCollision/CollisionDispatch/btGhostObject.h" | //#include "BulletCollision/CollisionDispatch/btGhostObject.h" | ||||
| //#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" | //#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" | ||||
| @@ -20,7 +20,7 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | #include "core.h" | ||||
| #include "EasyPhysics.h" | |||||
| #include "easyphysics.h" | |||||
| //#include "BulletDynamics\Character\btCharacterControllerInterface.h" | //#include "BulletDynamics\Character\btCharacterControllerInterface.h" | ||||
| #endif | #endif | ||||
| @@ -14,9 +14,9 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #include "../Include/EasyCharacterController.h" | |||||
| #include "../include/lolbtphysicsintegration.h" | |||||
| #include "../include/lolphysics.h" | |||||
| #include "../include/easycharactercontroller.h" | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -22,8 +22,8 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | #include "core.h" | ||||
| #include "EasyPhysics.h" | |||||
| #include "BulletCharacterController.h" | |||||
| #include "easyphysics.h" | |||||
| #include "bulletcharactercontroller.h" | |||||
| #include <BulletDynamics/Character/btKinematicCharacterController.h> | #include <BulletDynamics/Character/btKinematicCharacterController.h> | ||||
| #endif | #endif | ||||
| @@ -3,9 +3,9 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #include "../Include/EasyConstraint.h" | |||||
| #include "../include/lolbtphysicsintegration.h" | |||||
| #include "../include/lolphysics.h" | |||||
| #include "../include/easyconstraint.h" | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -19,7 +19,7 @@ | |||||
| #ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
| #include "core.h" | #include "core.h" | ||||
| #include "EasyPhysics.h" | |||||
| #include "easyphysics.h" | |||||
| #endif | #endif | ||||
| namespace lol | namespace lol | ||||
| @@ -14,8 +14,8 @@ | |||||
| # include "config.h" | # include "config.h" | ||||
| #endif | #endif | ||||
| #include "../Include/LolBtPhysicsIntegration.h" | |||||
| #include "../Include/LolPhysics.h" | |||||
| #include "../include/lolbtphysicsintegration.h" | |||||
| #include "../include/lolphysics.h" | |||||
| namespace lol | namespace lol | ||||
| { | { | ||||
| @@ -13,9 +13,9 @@ | |||||
| #include <bullet/btBulletDynamicsCommon.h> | #include <bullet/btBulletDynamicsCommon.h> | ||||
| #include <bullet/btBulletCollisionCommon.h> | #include <bullet/btBulletCollisionCommon.h> | ||||
| #include <BulletDynamics/Character/btKinematicCharacterController.h> | #include <BulletDynamics/Character/btKinematicCharacterController.h> | ||||
| #include "LolBtPhysicsIntegration.h" | |||||
| #include "EasyPhysics.h" | |||||
| #include "EasyConstraint.h" | |||||
| #include "lolbtphysicsintegration.h" | |||||
| #include "easyphysics.h" | |||||
| #include "easyconstraint.h" | |||||
| #endif | #endif | ||||
| namespace lol | namespace lol | ||||