| @@ -63,7 +63,6 @@ build/vs2010/*.XGD | |||||
| # Our binaries | # Our binaries | ||||
| test/benchsuite | test/benchsuite | ||||
| test/btphystest | test/btphystest | ||||
| test/quad | |||||
| test/testsuite | test/testsuite | ||||
| test/sandbox/sample | test/sandbox/sample | ||||
| test/math/pi | test/math/pi | ||||
| @@ -24,11 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "..\..\src\lolcor | |||||
| EndProject | EndProject | ||||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" | ||||
| EndProject | EndProject | ||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quad", "..\..\test\debug\quad.vcxproj", "{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}" | |||||
| ProjectSection(ProjectDependencies) = postProject | |||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} | |||||
| EndProjectSection | |||||
| EndProject | |||||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" | ||||
| ProjectSection(ProjectDependencies) = postProject | ProjectSection(ProjectDependencies) = postProject | ||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} | ||||
| @@ -183,24 +178,6 @@ Global | |||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 | ||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360 | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Build.0 = Release|Xbox 360 | ||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 | ||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.ActiveCfg = Debug|PS3 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|PS3.Build.0 = Debug|PS3 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.ActiveCfg = Debug|Win32 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Win32.Build.0 = Debug|Win32 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.ActiveCfg = Debug|x64 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|x64.Build.0 = Debug|x64 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.ActiveCfg = Release|PS3 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|PS3.Build.0 = Release|PS3 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.ActiveCfg = Release|Win32 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Win32.Build.0 = Release|Win32 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.ActiveCfg = Release|x64 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|x64.Build.0 = Release|x64 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Build.0 = Release|Xbox 360 | |||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 | |||||
| {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|PS3 | {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.ActiveCfg = Debug|PS3 | ||||
| {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.Build.0 = Debug|PS3 | {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|PS3.Build.0 = Debug|PS3 | ||||
| {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 | {B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32 | ||||
| @@ -482,7 +459,6 @@ Global | |||||
| {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F} | {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F} | ||||
| {17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} | {17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} | ||||
| {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} | {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} | ||||
| {53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E} = {E0491194-35E3-4513-9D31-608EA3165ECF} | |||||
| {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} | {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} | ||||
| {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF} | {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF} | ||||
| {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {E0491194-35E3-4513-9D31-608EA3165ECF} | {EE203B88-44CF-4859-9D42-7A1F43FECB52} = {E0491194-35E3-4513-9D31-608EA3165ECF} | ||||
| @@ -65,8 +65,7 @@ liblol_a_SOURCES = \ | |||||
| \ | \ | ||||
| loldebug.h \ | loldebug.h \ | ||||
| debug/fps.cpp debug/fps.h debug/sphere.cpp debug/sphere.h \ | debug/fps.cpp debug/fps.h debug/sphere.cpp debug/sphere.h \ | ||||
| debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h \ | |||||
| debug/quad.cpp debug/quad.h | |||||
| debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h | |||||
| liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet | liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet | ||||
| SUFFIXES = .lolfx | SUFFIXES = .lolfx | ||||
| @@ -1,46 +0,0 @@ | |||||
| // | |||||
| // Lol Engine | |||||
| // | |||||
| // Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net> | |||||
| // This program is free software; you can redistribute it and/or | |||||
| // modify it under the terms of the Do What The Fuck You Want To | |||||
| // Public License, Version 2, as published by Sam Hocevar. See | |||||
| // http://sam.zoy.org/projects/COPYING.WTFPL for more details. | |||||
| // | |||||
| // | |||||
| // The DebugQuad class | |||||
| // ------------------- | |||||
| // | |||||
| #if !defined __LOL_DEBUGTRI_H__ | |||||
| #define __LOL_DEBUGTRI_H__ | |||||
| #include "entity.h" | |||||
| namespace lol | |||||
| { | |||||
| class DebugQuadData; | |||||
| class DebugQuad : public Entity | |||||
| { | |||||
| public: | |||||
| DebugQuad(); | |||||
| virtual ~DebugQuad(); | |||||
| protected: | |||||
| virtual void TickGame(float seconds); | |||||
| virtual void TickDraw(float seconds); | |||||
| private: | |||||
| void ResetState(); | |||||
| void Advance(); | |||||
| DebugQuadData *data; | |||||
| }; | |||||
| } /* namespace lol */ | |||||
| #endif // __LOL_DEBUGTRI_H__ | |||||
| @@ -235,7 +235,6 @@ | |||||
| <ClCompile Include="bullet\LinearMath\btSerializer.cpp" /> | <ClCompile Include="bullet\LinearMath\btSerializer.cpp" /> | ||||
| <ClCompile Include="camera.cpp" /> | <ClCompile Include="camera.cpp" /> | ||||
| <ClCompile Include="debug\fps.cpp" /> | <ClCompile Include="debug\fps.cpp" /> | ||||
| <ClCompile Include="debug\quad.cpp" /> | |||||
| <ClCompile Include="debug\record.cpp" /> | <ClCompile Include="debug\record.cpp" /> | ||||
| <ClCompile Include="debug\sphere.cpp" /> | <ClCompile Include="debug\sphere.cpp" /> | ||||
| <ClCompile Include="debug\stats.cpp" /> | <ClCompile Include="debug\stats.cpp" /> | ||||
| @@ -548,7 +547,6 @@ | |||||
| <ClInclude Include="camera.h" /> | <ClInclude Include="camera.h" /> | ||||
| <ClInclude Include="core.h" /> | <ClInclude Include="core.h" /> | ||||
| <ClInclude Include="debug\fps.h" /> | <ClInclude Include="debug\fps.h" /> | ||||
| <ClInclude Include="debug\quad.h" /> | |||||
| <ClInclude Include="debug\record.h" /> | <ClInclude Include="debug\record.h" /> | ||||
| <ClInclude Include="debug\sphere.h" /> | <ClInclude Include="debug\sphere.h" /> | ||||
| <ClInclude Include="debug\stats.h" /> | <ClInclude Include="debug\stats.h" /> | ||||
| @@ -70,9 +70,6 @@ | |||||
| <ClCompile Include="debug\fps.cpp"> | <ClCompile Include="debug\fps.cpp"> | ||||
| <Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="debug\quad.cpp"> | |||||
| <Filter>src\debug</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="debug\record.cpp"> | <ClCompile Include="debug\record.cpp"> | ||||
| <Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -639,9 +636,6 @@ | |||||
| <ClInclude Include="debug\fps.h"> | <ClInclude Include="debug\fps.h"> | ||||
| <Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="debug\quad.h"> | |||||
| <Filter>src\debug</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="debug\record.h"> | <ClInclude Include="debug\record.h"> | ||||
| <Filter>src\debug</Filter> | <Filter>src\debug</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -1613,4 +1607,4 @@ | |||||
| <Filter>src\gpu</Filter> | <Filter>src\gpu</Filter> | ||||
| </None> | </None> | ||||
| </ItemGroup> | </ItemGroup> | ||||
| </Project> | |||||
| </Project> | |||||
| @@ -17,7 +17,6 @@ | |||||
| #define __LOL_LOLDEBUG_H__ | #define __LOL_LOLDEBUG_H__ | ||||
| #include "debug/fps.h" | #include "debug/fps.h" | ||||
| #include "debug/quad.h" | |||||
| #include "debug/record.h" | #include "debug/record.h" | ||||
| #include "debug/sphere.h" | #include "debug/sphere.h" | ||||
| #include "debug/stats.h" | #include "debug/stats.h" | ||||
| @@ -17,7 +17,7 @@ CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \ | |||||
| EXTRA_DIST = data/gradient.png | EXTRA_DIST = data/gradient.png | ||||
| noinst_PROGRAMS = quad benchsuite $(testsuite) btphystest | |||||
| noinst_PROGRAMS = benchsuite $(testsuite) btphystest | |||||
| TESTS = $(testsuite) | TESTS = $(testsuite) | ||||
| @@ -41,11 +41,6 @@ benchsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ | |||||
| benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ | benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ | ||||
| benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a | benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a | ||||
| quad_SOURCES = debug/quad.cpp | |||||
| quad_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ | |||||
| quad_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ | |||||
| quad_DEPENDENCIES = $(top_builddir)/src/liblol.a | |||||
| btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \ | btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h \ | ||||
| Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \ | Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \ | ||||
| Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \ | Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \ | ||||
| @@ -1,34 +0,0 @@ | |||||
| // | |||||
| // Lol Engine - Debug Quad test program | |||||
| // | |||||
| // Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net> | |||||
| // This program is free software; you can redistribute it and/or | |||||
| // modify it under the terms of the Do What The Fuck You Want To | |||||
| // Public License, Version 2, as published by Sam Hocevar. See | |||||
| // http://sam.zoy.org/projects/COPYING.WTFPL for more details. | |||||
| // | |||||
| #if defined HAVE_CONFIG_H | |||||
| # include "config.h" | |||||
| #endif | |||||
| #include "core.h" | |||||
| #include "lolgl.h" | |||||
| #include "loldebug.h" | |||||
| using namespace std; | |||||
| using namespace lol; | |||||
| int main(int argc, char **argv) | |||||
| { | |||||
| Application app("Quad", ivec2(640, 480), 60.0f); | |||||
| /* Register some debug stuff */ | |||||
| new DebugFps(5, 5); | |||||
| //new DebugQuad(); | |||||
| app.Run(); | |||||
| return EXIT_SUCCESS; | |||||
| } | |||||
| @@ -1,65 +0,0 @@ | |||||
| <?xml version="1.0" encoding="utf-8"?> | |||||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||||
| <ItemGroup Label="ProjectConfigurations"> | |||||
| <ProjectConfiguration Include="Debug|PS3"> | |||||
| <Configuration>Debug</Configuration> | |||||
| <Platform>PS3</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Debug|Win32"> | |||||
| <Configuration>Debug</Configuration> | |||||
| <Platform>Win32</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Debug|x64"> | |||||
| <Configuration>Debug</Configuration> | |||||
| <Platform>x64</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Debug|Xbox 360"> | |||||
| <Configuration>Debug</Configuration> | |||||
| <Platform>Xbox 360</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Release|PS3"> | |||||
| <Configuration>Release</Configuration> | |||||
| <Platform>PS3</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Release|Win32"> | |||||
| <Configuration>Release</Configuration> | |||||
| <Platform>Win32</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Release|x64"> | |||||
| <Configuration>Release</Configuration> | |||||
| <Platform>x64</Platform> | |||||
| </ProjectConfiguration> | |||||
| <ProjectConfiguration Include="Release|Xbox 360"> | |||||
| <Configuration>Release</Configuration> | |||||
| <Platform>Xbox 360</Platform> | |||||
| </ProjectConfiguration> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ClCompile Include="quad.cpp" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj"> | |||||
| <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project> | |||||
| </ProjectReference> | |||||
| </ItemGroup> | |||||
| <PropertyGroup Label="Globals"> | |||||
| <ProjectGuid>{53D9D96F-55C0-4044-BDB1-4A5E8EDBDF0E}</ProjectGuid> | |||||
| <ConfigurationType>Application</ConfigurationType> | |||||
| <Keyword>Win32Proj</Keyword> | |||||
| </PropertyGroup> | |||||
| <Import Project="$(SolutionDir)\Lol.Core.Config.props" /> | |||||
| <ImportGroup Label="ExtensionSettings"> | |||||
| <Import Project="$(SolutionDir)\Lol.Fx.props" /> | |||||
| </ImportGroup> | |||||
| <ImportGroup Label="PropertySheets"> | |||||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |||||
| <Import Project="$(SolutionDir)\Lol.Core.Vars.props" /> | |||||
| </ImportGroup> | |||||
| <PropertyGroup Label="UserMacros" /> | |||||
| <Import Project="$(SolutionDir)\Lol.Core.Rules.props" /> | |||||
| <ItemDefinitionGroup /> | |||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | |||||
| <ImportGroup Label="ExtensionTargets"> | |||||
| <Import Project="$(SolutionDir)\Lol.Fx.targets" /> | |||||
| </ImportGroup> | |||||
| </Project> | |||||