diff --git a/Demos/ForkLiftDemo/ForkLiftDemo.cpp b/Demos/ForkLiftDemo/ForkLiftDemo.cpp
index 4c5a8dc27..c9ffad358 100644
--- a/Demos/ForkLiftDemo/ForkLiftDemo.cpp
+++ b/Demos/ForkLiftDemo/ForkLiftDemo.cpp
@@ -71,7 +71,9 @@ const int maxOverlap = 65535;
///notice that for higher-quality slow-moving vehicles, another approach might be better
///implementing explicit hinged-wheel constraints with cylinder collision, rather then raycasts
float gEngineForce = 0.f;
-float gBreakingForce = 0.f;
+
+float defaultBreakingForce = 10.f;
+float gBreakingForce = 10.f;
float maxEngineForce = 1000.f;//this should be engine/velocity dependent
float maxBreakingForce = 100.f;
@@ -544,21 +546,12 @@ void ForkLiftDemo::renderme()
glColor3f(0, 0, 0);
char buf[124];
glRasterPos3f(400, 20, 0);
- sprintf(buf,"PgUp - rotate lift up");
+ sprintf(buf,"SHIFT+Cursor Left/Right - rotate lift");
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
glRasterPos3f(400, 40, 0);
- sprintf(buf,"PgUp - rotate lift down");
+ sprintf(buf,"SHIFT+Cursor UP/Down - move fork up/down");
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
glRasterPos3f(400, 60, 0);
- sprintf(buf,"Home - move fork up");
- BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
- glRasterPos3f(400, 80, 0);
- sprintf(buf,"End - move fork down");
- BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
- glRasterPos3f(400, 100, 0);
- sprintf(buf,"Insert - move vehicle back");
- BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
- glRasterPos3f(400, 120, 0);
sprintf(buf,"F5 - toggle camera mode");
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf);
@@ -686,6 +679,7 @@ void ForkLiftDemo::clientResetScene()
btTransform liftTrans;
liftTrans.setIdentity();
liftTrans.setOrigin(m_liftStartPos);
+ m_liftBody->activate();
m_liftBody->setCenterOfMassTransform(liftTrans);
m_liftBody->setLinearVelocity(btVector3(0,0,0));
m_liftBody->setAngularVelocity(btVector3(0,0,0));
@@ -693,6 +687,7 @@ void ForkLiftDemo::clientResetScene()
btTransform forkTrans;
forkTrans.setIdentity();
forkTrans.setOrigin(m_forkStartPos);
+ m_forkBody->activate();
m_forkBody->setCenterOfMassTransform(forkTrans);
m_forkBody->setLinearVelocity(btVector3(0,0,0));
m_forkBody->setAngularVelocity(btVector3(0,0,0));
@@ -700,13 +695,15 @@ void ForkLiftDemo::clientResetScene()
m_liftHinge->setLimit(-LIFT_EPS, LIFT_EPS);
m_liftHinge->enableAngularMotor(false, 0, 0);
+
m_forkSlider->setLowerLinLimit(0.1f);
m_forkSlider->setUpperLinLimit(0.1f);
- m_forkSlider->setPoweredLinMotor(false);
+ m_forkSlider->setPoweredLinMotor(false);
btTransform loadTrans;
loadTrans.setIdentity();
loadTrans.setOrigin(m_loadStartPos);
+ m_loadBody->activate();
m_loadBody->setCenterOfMassTransform(loadTrans);
m_loadBody->setLinearVelocity(btVector3(0,0,0));
m_loadBody->setAngularVelocity(btVector3(0,0,0));
@@ -718,109 +715,129 @@ void ForkLiftDemo::clientResetScene()
void ForkLiftDemo::specialKeyboardUp(int key, int x, int y)
{
switch (key)
- {
- case GLUT_KEY_UP :
+ {
+ case GLUT_KEY_UP :
{
+ lockForkSlider();
gEngineForce = 0.f;
+ gBreakingForce = defaultBreakingForce;
break;
}
case GLUT_KEY_DOWN :
- {
- gBreakingForce = 0.f;
+ {
+ lockForkSlider();
+ gEngineForce = 0.f;
+ gBreakingForce = defaultBreakingForce;
break;
}
- case GLUT_KEY_PAGE_UP:
- lockLiftHinge();
- break;
- case GLUT_KEY_PAGE_DOWN:
- lockLiftHinge();
- break;
- case GLUT_KEY_HOME:
- lockForkSlider();
- break;
- case GLUT_KEY_END:
- lockForkSlider();
- break;
+ case GLUT_KEY_LEFT:
+ case GLUT_KEY_RIGHT:
+ {
+ lockLiftHinge();
+ break;
+ }
default:
DemoApplication::specialKeyboardUp(key,x,y);
- break;
- }
-
+ break;
+ }
}
void ForkLiftDemo::specialKeyboard(int key, int x, int y)
{
-// printf("key = %i x=%i y=%i\n",key,x,y);
+ if (key==GLUT_KEY_END)
+ return;
- switch (key)
- {
- case GLUT_KEY_LEFT :
- {
- gVehicleSteering += steeringIncrement;
- if ( gVehicleSteering > steeringClamp)
- gVehicleSteering = steeringClamp;
+ // printf("key = %i x=%i y=%i\n",key,x,y);
- break;
- }
- case GLUT_KEY_RIGHT :
- {
- gVehicleSteering -= steeringIncrement;
- if ( gVehicleSteering < -steeringClamp)
- gVehicleSteering = -steeringClamp;
+ int state;
+ state=glutGetModifiers();
+ if (state & GLUT_ACTIVE_SHIFT)
+ {
+ switch (key)
+ {
+ case GLUT_KEY_LEFT :
+ {
+
+ m_liftHinge->setLimit(-M_PI/16.0f, M_PI/8.0f);
+ m_liftHinge->enableAngularMotor(true, -0.1, 10.0);
+ break;
+ }
+ case GLUT_KEY_RIGHT :
+ {
+
+ m_liftHinge->setLimit(-M_PI/16.0f, M_PI/8.0f);
+ m_liftHinge->enableAngularMotor(true, 0.1, 10.0);
+ break;
+ }
+ case GLUT_KEY_UP :
+ {
+ m_forkSlider->setLowerLinLimit(0.1f);
+ m_forkSlider->setUpperLinLimit(3.9f);
+ m_forkSlider->setPoweredLinMotor(true);
+ m_forkSlider->setMaxLinMotorForce(10.0);
+ m_forkSlider->setTargetLinMotorVelocity(1.0);
+ break;
+ }
+ case GLUT_KEY_DOWN :
+ {
+ m_forkSlider->setLowerLinLimit(0.1f);
+ m_forkSlider->setUpperLinLimit(3.9f);
+ m_forkSlider->setPoweredLinMotor(true);
+ m_forkSlider->setMaxLinMotorForce(10.0);
+ m_forkSlider->setTargetLinMotorVelocity(-1.0);
+ break;
+ }
- break;
- }
- case GLUT_KEY_UP :
- {
- gEngineForce = maxEngineForce;
- gBreakingForce = 0.f;
- break;
- }
- case GLUT_KEY_DOWN :
- {
- gBreakingForce = maxBreakingForce;
- gEngineForce = 0.f;
- break;
- }
- case GLUT_KEY_INSERT :
- {
- gEngineForce = -maxEngineForce;
- gBreakingForce = 0.f;
- break;
- }
- case GLUT_KEY_PAGE_UP:
- m_liftHinge->setLimit(-M_PI/16.0f, M_PI/8.0f);
- m_liftHinge->enableAngularMotor(true, 0.1, 10.0);
- break;
- case GLUT_KEY_PAGE_DOWN:
- m_liftHinge->setLimit(-M_PI/16.0f, M_PI/8.0f);
- m_liftHinge->enableAngularMotor(true, -0.1, 10.0);
- break;
- case GLUT_KEY_HOME:
- m_forkSlider->setLowerLinLimit(0.1f);
- m_forkSlider->setUpperLinLimit(3.9f);
- m_forkSlider->setPoweredLinMotor(true);
- m_forkSlider->setMaxLinMotorForce(10.0);
- m_forkSlider->setTargetLinMotorVelocity(1.0);
- break;
- case GLUT_KEY_END:
- m_forkSlider->setLowerLinLimit(0.1f);
- m_forkSlider->setUpperLinLimit(3.9f);
- m_forkSlider->setPoweredLinMotor(true);
- m_forkSlider->setMaxLinMotorForce(10.0);
- m_forkSlider->setTargetLinMotorVelocity(-1.0);
- break;
- case GLUT_KEY_F5:
- m_useDefaultCamera = !m_useDefaultCamera;
- break;
- default:
- DemoApplication::specialKeyboard(key,x,y);
- break;
- }
+ default:
+ DemoApplication::specialKeyboard(key,x,y);
+ break;
+ }
-// glutPostRedisplay();
+ } else
+ {
+ switch (key)
+ {
+ case GLUT_KEY_LEFT :
+ {
+ gVehicleSteering += steeringIncrement;
+ if ( gVehicleSteering > steeringClamp)
+ gVehicleSteering = steeringClamp;
+
+ break;
+ }
+ case GLUT_KEY_RIGHT :
+ {
+ gVehicleSteering -= steeringIncrement;
+ if ( gVehicleSteering < -steeringClamp)
+ gVehicleSteering = -steeringClamp;
+
+ break;
+ }
+ case GLUT_KEY_UP :
+ {
+ gEngineForce = maxEngineForce;
+ gBreakingForce = 0.f;
+ break;
+ }
+ case GLUT_KEY_DOWN :
+ {
+ gEngineForce = -maxEngineForce;
+ gBreakingForce = 0.f;
+ break;
+ }
+
+ case GLUT_KEY_F5:
+ m_useDefaultCamera = !m_useDefaultCamera;
+ break;
+ default:
+ DemoApplication::specialKeyboard(key,x,y);
+ break;
+ }
+
+ }
+ // glutPostRedisplay();
}
@@ -906,7 +923,7 @@ void ForkLiftDemo::lockForkSlider(void)
btScalar linDepth = m_forkSlider->getLinearPos();
btScalar lowLim = m_forkSlider->getLowerLinLimit();
btScalar hiLim = m_forkSlider->getUpperLinLimit();
- m_forkSlider->setPoweredLinMotor(false);
+ m_forkSlider->setPoweredLinMotor(false);
if(linDepth <= lowLim)
{
m_forkSlider->setLowerLinLimit(lowLim);
diff --git a/msvc/6/appForkLiftDemo.dsp b/msvc/6/appForkLiftDemo.dsp
index b4d9e6e57..16fd36dda 100644
--- a/msvc/6/appForkLiftDemo.dsp
+++ b/msvc/6/appForkLiftDemo.dsp
@@ -17,7 +17,9 @@ CFG=appForkLiftDemo - Win32 Release
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
+!MESSAGE "appForkLiftDemo - Win32 DebugDoublePrecision" (based on "Win32 (x86) Console Application")
!MESSAGE "appForkLiftDemo - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "appForkLiftDemo - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Console Application")
!MESSAGE "appForkLiftDemo - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE
@@ -43,11 +45,11 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -57,9 +59,34 @@ LIB32=link.exe -lib
LINK32=link.exe
# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /OPT:NOREF /out:"..\..\ForkLiftDemo.exe" /subsystem:console /libpath:"..\..\Glut"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "appForkLiftDemo - Win32 ReleaseDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries
+# PROP BASE Output_Dir "release_dbl"
+# PROP BASE Intermediate_Dir "release_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries
+# PROP Output_Dir "..\..\out\release_dbl6\build\appForkLiftDemo\"
+# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appForkLiftDemo\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\ForkLiftDemo.exe" /subsystem:console /libpath:"..\..\Glut"
!ELSEIF "$(CFG)" == "appForkLiftDemo - Win32 Debug"
@@ -75,11 +102,11 @@ SOURCE="$(InputPath)"
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -89,16 +116,43 @@ LIB32=link.exe -lib
LINK32=link.exe
# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /out:"..\..\ForkLiftDemo.exe" /subsystem:console /libpath:"..\..\Glut"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "appForkLiftDemo - Win32 DebugDoublePrecision"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries
+# PROP BASE Output_Dir "debug_dbl"
+# PROP BASE Intermediate_Dir "debug_dbl"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries
+# PROP Output_Dir "..\..\out\debug_dbl6\build\appForkLiftDemo\"
+# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appForkLiftDemo\"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\ConvexHull"
+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appForkLiftDemo\appForkLiftDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\ConvexHull"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib /nologo /machine:I386
+# ADD LINK32 shell32.lib user32.lib gdi32.lib advapi32.lib glut32.lib /nologo /version:4.0 /machine:I386 /out:"..\..\ForkLiftDemo.exe" /subsystem:console /libpath:"..\..\Glut"
!ENDIF
# Begin Target
# Name "appForkLiftDemo - Win32 Release"
+# Name "appForkLiftDemo - Win32 ReleaseDoublePrecision"
# Name "appForkLiftDemo - Win32 Debug"
+# Name "appForkLiftDemo - Win32 DebugDoublePrecision"
# Begin Group "Source Files"
# PROP Default_Filter ""
@@ -106,6 +160,10 @@ SOURCE="$(InputPath)"
SOURCE=..\..\Demos\ForkLiftDemo\ForkLiftDemo.cpp
# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\ForkLiftDemo\main.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index 825bd835f..47b0f3de1 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -417,6 +417,30 @@ Package=<4>
###############################################################################
+Project: "appForkLiftDemo"=.\appForkLiftDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libbulletcollision
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletdynamics
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletmath
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libbulletopenglsupport
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "appGenericJointDemo"=.\appGenericJointDemo.dsp - Package Owner=<4>
Package=<5>
@@ -825,6 +849,9 @@ Package=<4>
Project_Dep_Name appEPAPenDepthDemo
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name appForkLiftDemo
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name appGenericJointDemo
End Project Dependency
Begin Project Dependency
@@ -966,6 +993,9 @@ Package=<4>
Project_Dep_Name appEPAPenDepthDemo
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name appForkLiftDemo
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name appGenericJointDemo
End Project Dependency
Begin Project Dependency
diff --git a/msvc/7/appForkLiftDemo.vcproj b/msvc/7/appForkLiftDemo.vcproj
index 01d5100ad..05691193a 100644
--- a/msvc/7/appForkLiftDemo.vcproj
+++ b/msvc/7/appForkLiftDemo.vcproj
@@ -28,11 +28,11 @@
RuntimeLibrary="0"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
PrecompiledHeaderFile="..\..\out\release7\build\appForkLiftDemo\appForkLiftDemo.pch"
AssemblerListingLocation="..\..\out\release7\build\appForkLiftDemo\"
ObjectFile="..\..\out\release7\build\appForkLiftDemo\"
@@ -51,7 +51,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
- OutputFile="..\..\ForkLiftDemo.exe"
+ OutputFile="..\..\ReleaseForkLiftDemo.exe"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
@@ -66,22 +66,85 @@
SuppressStartupBanner="TRUE"/>
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,11 +166,11 @@
DebugInformationFormat="4"
RuntimeTypeInfo="FALSE"
RuntimeLibrary="1"
- PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
PrecompiledHeaderFile="..\..\out\debug7\build\appForkLiftDemo\appForkLiftDemo.pch"
AssemblerListingLocation="..\..\out\debug7\build\appForkLiftDemo\"
ObjectFile="..\..\out\debug7\build\appForkLiftDemo\"
@@ -124,7 +187,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
- OutputFile="..\..\ForkLiftDemo.exe"
+ OutputFile="..\..\DebugForkLiftDemo.exe"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
@@ -139,22 +202,90 @@
SuppressStartupBanner="TRUE"/>
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -169,6 +300,9 @@
+
+
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,11 +166,11 @@
DebugInformationFormat="4"
RuntimeTypeInfo="FALSE"
RuntimeLibrary="1"
- PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
PrecompiledHeaderFile="..\..\out\debug71\build\appForkLiftDemo\appForkLiftDemo.pch"
AssemblerListingLocation="..\..\out\debug71\build\appForkLiftDemo\"
ObjectFile="..\..\out\debug71\build\appForkLiftDemo\"
@@ -124,7 +187,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
- OutputFile="..\..\ForkLiftDemo.exe"
+ OutputFile="..\..\DebugForkLiftDemo.exe"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
@@ -139,22 +202,90 @@
SuppressStartupBanner="TRUE"/>
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -169,6 +300,9 @@
+
+
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,11 +166,11 @@
DebugInformationFormat="4"
RuntimeTypeInfo="FALSE"
RuntimeLibrary="1"
- PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32"
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\ConvexHull"
PrecompiledHeaderFile="..\..\out\debug8\build\appForkLiftDemo\appForkLiftDemo.pch"
AssemblerListingLocation="..\..\out\debug8\build\appForkLiftDemo\"
ObjectFile="..\..\out\debug8\build\appForkLiftDemo\"
@@ -124,7 +187,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
- OutputFile="..\..\ForkLiftDemo.exe"
+ OutputFile="..\..\DebugForkLiftDemo.exe"
SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
@@ -139,22 +202,90 @@
SuppressStartupBanner="TRUE"/>
+ Name="VCPostBuildEventTool"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -169,6 +300,9 @@
+
+