updated quickstep solver (for comparison), enabled GPU physics again (but WIN32 doesn't have the VertexTextureSupport enabled)

This commit is contained in:
ejcoumans
2006-10-13 23:58:52 +00:00
parent 2c66be25fc
commit d878885db4
18 changed files with 890 additions and 83 deletions

View File

@@ -30,7 +30,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch"
AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\"
ObjectFile="..\..\out\release8\build\grpapps_bullet\"
@@ -78,7 +78,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=8"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch"
AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\"
ObjectFile="..\..\out\debug8\build\grpapps_bullet\"
@@ -149,7 +149,7 @@
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=8"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>

202
msvc/8/libquickstep.vcproj Normal file
View File

@@ -0,0 +1,202 @@
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="libquickstep"
ProjectGUID="{D7036964-B44D-8207-0ACC-D838D0BDA379}"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory="..\..\out\release8\build\libquickstep\"
IntermediateDirectory="..\..\out\release8\build\libquickstep\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
StringPooling="TRUE"
EnableFunctionLevelLinking="TRUE"
RuntimeLibrary="0"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\quickstep\src"
PrecompiledHeaderFile="..\..\out\release8\build\libquickstep\libquickstep.pch"
AssemblerListingLocation="..\..\out\release8\build\libquickstep\"
ObjectFile="..\..\out\release8\build\libquickstep\"
ProgramDataBaseFileName="..\..\out\release8\build\libquickstep\quickstep.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
TreatWChar_tAsBuiltInType="false"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
AdditionalOptions=" "
AdditionalDependencies=""
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
GenerateManifest="false"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\release8\build\libquickstep\quickstep.pdb"
TargetMachine="1"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\out\release8\libs\libquickstep.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName="..\..\out\release8\build\libquickstep\libquickstep.tlb"/>
<Tool
Name="VCPostBuildEventTool"
/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\quickstep\src"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\..\out\debug8\build\libquickstep\"
IntermediateDirectory="..\..\out\debug8\build\libquickstep\"
ConfigurationType="4"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
MinimalRebuild="TRUE"
DebugInformationFormat="4"
RuntimeTypeInfo="FALSE"
RuntimeLibrary="1"
PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\quickstep\src"
PrecompiledHeaderFile="..\..\out\debug8\build\libquickstep\libquickstep.pch"
AssemblerListingLocation="..\..\out\debug8\build\libquickstep\"
ObjectFile="..\..\out\debug8\build\libquickstep\"
ProgramDataBaseFileName="..\..\out\debug8\build\libquickstep\quickstep.pdb"
WarningLevel="3"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
TreatWChar_tAsBuiltInType="false"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
AdditionalOptions=" "
AdditionalDependencies=""
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
GenerateManifest="false"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\out\debug8\build\libquickstep\quickstep.pdb"
TargetMachine="1"/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\out\debug8\libs\libquickstep_d.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName="..\..\out\debug8\build\libquickstep\libquickstep.tlb"/>
<Tool
Name="VCPostBuildEventTool"
/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\quickstep\src"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Source Files"
Filter="">
<File
RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.cpp">
</File>
<File
RelativePath="..\..\Extras\quickstep\OdeContactJoint.cpp">
</File>
<File
RelativePath="..\..\Extras\quickstep\OdeJoint.cpp">
</File>
<File
RelativePath="..\..\Extras\quickstep\OdeSolverBody.cpp">
</File>
<File
RelativePath="..\..\Extras\quickstep\SorLcp.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="">
<File
RelativePath="..\..\Extras\quickstep\OdeConstraintSolver.h">
</File>
<File
RelativePath="..\..\Extras\quickstep\odecontactjoint.h">
</File>
<File
RelativePath="..\..\Extras\quickstep\OdeJoint.h">
</File>
<File
RelativePath="..\..\Extras\quickstep\OdeSolverBody.h">
</File>
<File
RelativePath="..\..\Extras\quickstep\SorLcp.h">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@@ -22,6 +22,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appRaytracer", "appRaytracer.vcproj", "{60F71B6A-F888-C449-EF49-268BB9F7C963}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimplexDemo.vcproj", "{60A1DC9D-F837-3923-E9DE-A7925394A578}"
@@ -130,16 +132,17 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
{6210A080-01C0-6D67-F1DB-669393175402}.9 = {69C821C7-1E18-D894-068D-C55E063F4859}
{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
{6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
{6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
{6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
{6210A080-01C0-6D67-F1DB-669393175402}.15 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{6210A080-01C0-6D67-F1DB-669393175402}.16 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{6210A080-01C0-6D67-F1DB-669393175402}.18 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{6210A080-01C0-6D67-F1DB-669393175402}.19 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.20 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.21 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {3578834A-4B06-DE6F-78AC-FE11F7226D35}
{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {7284F809-AF30-6315-88C6-86F1C0798760}
@@ -151,9 +154,10 @@ Global
{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {69C821C7-1E18-D894-068D-C55E063F4859}
{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -207,6 +211,10 @@ Global
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.Build.0 = Debug|Win32
{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.ActiveCfg = Release|Win32
{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Release.Build.0 = Release|Win32
{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.ActiveCfg = Debug|Win32
{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}.Debug.Build.0 = Debug|Win32
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.ActiveCfg = Release|Win32
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Release.Build.0 = Release|Win32
{60F71B6A-F888-C449-EF49-268BB9F7C963}.Debug.ActiveCfg = Debug|Win32