diff --git a/msvc/6/appMovingConcaveDemo.dsp b/msvc/6/appMovingConcaveDemo.dsp
index c9292cc4b..9f10edf88 100644
--- a/msvc/6/appMovingConcaveDemo.dsp
+++ b/msvc/6/appMovingConcaveDemo.dsp
@@ -45,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 "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTBullet"
+# 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 "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTBullet"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -76,11 +76,11 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "..\..\out\release_dbl6\build\appMovingConcaveDemo\"
# 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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTBullet"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTBullet"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -108,11 +108,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 "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTBullet"
+# 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 "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTBullet"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -139,11 +139,11 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appMovingConcaveDemo\"
# 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 "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTBullet"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTBullet"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appMovingConcaveDemo\appMovingConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
diff --git a/msvc/6/libGIMPACT.dsp b/msvc/6/libGIMPACT.dsp
index fa42aba60..f73b7cbde 100644
--- a/msvc/6/libGIMPACT.dsp
+++ b/msvc/6/libGIMPACT.dsp
@@ -172,55 +172,27 @@ SOURCE="$(InputPath)"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_boxpruning.cpp
+SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_contact.cpp
+SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_math.cpp
+SOURCE=..\..\Extras\GIMPACT\src\core\gim_box_set.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_memory.cpp
+SOURCE=..\..\Extras\GIMPACT\src\core\gim_contact.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_tri_tri_overlap.cpp
+SOURCE=..\..\Extras\GIMPACT\src\core\gim_memory.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh_capsule_collision.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh_data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh_ray_collision.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh_sphere_collision.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_trimesh_trimesh_collision.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gim_vertex_buffer_util.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACT\src\gimpact.cpp
+SOURCE=..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp
# End Source File
# End Group
# End Target
diff --git a/msvc/6/libGIMPACTBullet.dsp b/msvc/6/libGIMPACTBullet.dsp
deleted file mode 100644
index 8bc6539b5..000000000
--- a/msvc/6/libGIMPACTBullet.dsp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libGIMPACTBullet" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libGIMPACTBullet - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libGIMPACTBullet.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libGIMPACTBullet.mak" CFG="libGIMPACTBullet - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libGIMPACTBullet - Win32 DebugDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACTBullet - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACTBullet - Win32 ReleaseDoublePrecision" (based on "Win32 (x86) Static Library")
-!MESSAGE "libGIMPACTBullet - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libGIMPACTBullet - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "release"
-# PROP BASE Intermediate_Dir "release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\out\release6\build\libGIMPACTBullet\"
-# PROP Intermediate_Dir "..\..\out\release6\build\libGIMPACTBullet\"
-# 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 "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACTBullet" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libGIMPACTBullet\libGIMPACTBullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACTBullet" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\release6\libs\libGIMPACTBullet.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 /nologo /version:4.0 /machine:I386 /OPT:NOREF /subsystem:windows
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "libGIMPACTBullet - 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\libGIMPACTBullet\"
-# PROP Intermediate_Dir "..\..\out\release_dbl6\build\libGIMPACTBullet\"
-# 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 /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACTBullet" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libGIMPACTBullet\libGIMPACTBullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACTBullet" /i "..\..\Extras\GIMPACT\include"
-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 /nologo /version:4.0 /machine:I386 /subsystem:windows
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "libGIMPACTBullet - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "debug"
-# PROP BASE Intermediate_Dir "debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\out\debug6\build\libGIMPACTBullet\"
-# PROP Intermediate_Dir "..\..\out\debug6\build\libGIMPACTBullet\"
-# 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 /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACTBullet" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libGIMPACTBullet\libGIMPACTBullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACTBullet" /i "..\..\Extras\GIMPACT\include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\out\debug6\libs\libGIMPACTBullet_d.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 /nologo /version:4.0 /machine:I386 /debug /pdbtype:sept /subsystem:windows
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "libGIMPACTBullet - 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\libGIMPACTBullet\"
-# PROP Intermediate_Dir "..\..\out\debug_dbl6\build\libGIMPACTBullet\"
-# 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 /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "WIN32" /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACTBullet" /I "..\..\Extras\GIMPACT\include"
-# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS"
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libGIMPACTBullet\libGIMPACTBullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACTBullet" /i "..\..\Extras\GIMPACT\include"
-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 /nologo /version:4.0 /machine:I386 /subsystem:windows
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "libGIMPACTBullet - Win32 Release"
-# Name "libGIMPACTBullet - Win32 ReleaseDoublePrecision"
-# Name "libGIMPACTBullet - Win32 Debug"
-# Name "libGIMPACTBullet - Win32 DebugDoublePrecision"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACTBullet\btConcaveConcaveCollisionAlgorithm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACTBullet\btGIMPACTMeshShape.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACTBullet\btConcaveConcaveCollisionAlgorithm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Extras\GIMPACTBullet\btGIMPACTMeshShape.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/msvc/6/wksbullet.dsw b/msvc/6/wksbullet.dsw
index fb090bda4..335f063b6 100644
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -323,9 +323,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name libGIMPACT
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libGIMPACTBullet
- End Project Dependency
}}}
###############################################################################
@@ -377,9 +374,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name libGIMPACT
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libGIMPACTBullet
- End Project Dependency
}}}
###############################################################################
@@ -573,9 +567,6 @@ Package=<4>
Project_Dep_Name libGIMPACT
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libGIMPACTBullet
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name liblibxml
End Project Dependency
Begin Project Dependency
@@ -690,9 +681,6 @@ Package=<4>
Project_Dep_Name libGIMPACT
End Project Dependency
Begin Project Dependency
- Project_Dep_Name libGIMPACTBullet
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name liblibxml
End Project Dependency
Begin Project Dependency
@@ -810,18 +798,6 @@ Package=<4>
###############################################################################
-Project: "libGIMPACTBullet"=.\libGIMPACTBullet.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "liblibxml"=.\liblibxml.dsp - Package Owner=<4>
Package=<5>
diff --git a/msvc/7/appBasicDemo.vcproj b/msvc/7/appBasicDemo.vcproj
index 8c01c7c7b..c8d1d75c2 100644
--- a/msvc/7/appBasicDemo.vcproj
+++ b/msvc/7/appBasicDemo.vcproj
@@ -52,7 +52,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\ReleaseBasicDemo.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -117,7 +117,7 @@
@@ -102,7 +102,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\release_dbl7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\release_dbl7\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\release_dbl7\build\appMovingConcaveDemo\"
@@ -117,7 +117,7 @@
@@ -172,7 +172,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug7\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug7\build\appMovingConcaveDemo\"
@@ -190,7 +190,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\DebugMovingConcaveDemo.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -219,7 +219,7 @@
@@ -245,7 +245,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug_dbl7\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug_dbl7\build\appMovingConcaveDemo\"
@@ -260,7 +260,7 @@
diff --git a/msvc/7/appRaytracer.vcproj b/msvc/7/appRaytracer.vcproj
index 7e315edf5..c49ee0564 100644
--- a/msvc/7/appRaytracer.vcproj
+++ b/msvc/7/appRaytracer.vcproj
@@ -52,7 +52,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\ReleaseRaytracer.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -117,7 +117,7 @@
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
diff --git a/msvc/7/libGIMPACTBullet.vcproj b/msvc/7/libGIMPACTBullet.vcproj
deleted file mode 100644
index 98b48861c..000000000
--- a/msvc/7/libGIMPACTBullet.vcproj
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/msvc/7/wksbullet.sln b/msvc/7/wksbullet.sln
index 26c1e60be..3ceee6b28 100644
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "l
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTBullet", "libGIMPACTBullet.vcproj", "{1B60957B-504A-C45E-7B5C-9AA77F133898}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -132,7 +130,6 @@ Global
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -142,7 +139,6 @@ Global
{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -187,9 +183,8 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
@@ -218,9 +213,8 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
@@ -471,14 +465,6 @@ Global
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.ActiveCfg = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.Build.0 = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.ActiveCfg = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.Build.0 = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
diff --git a/msvc/71/appBasicDemo.vcproj b/msvc/71/appBasicDemo.vcproj
index e9b02f2ad..82833673a 100644
--- a/msvc/71/appBasicDemo.vcproj
+++ b/msvc/71/appBasicDemo.vcproj
@@ -52,7 +52,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\ReleaseBasicDemo.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -117,7 +117,7 @@
@@ -102,7 +102,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\release_dbl71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\release_dbl71\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\release_dbl71\build\appMovingConcaveDemo\"
@@ -117,7 +117,7 @@
@@ -172,7 +172,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug71\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug71\build\appMovingConcaveDemo\"
@@ -190,7 +190,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\DebugMovingConcaveDemo.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -219,7 +219,7 @@
@@ -245,7 +245,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug_dbl71\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug_dbl71\build\appMovingConcaveDemo\"
@@ -260,7 +260,7 @@
diff --git a/msvc/71/appRaytracer.vcproj b/msvc/71/appRaytracer.vcproj
index 24d519309..1baed90bd 100644
--- a/msvc/71/appRaytracer.vcproj
+++ b/msvc/71/appRaytracer.vcproj
@@ -52,7 +52,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD"
OutputFile="..\..\ReleaseRaytracer.exe"
- SubSystem="2"
+ SubSystem="1"
AdditionalOptions=" "
AdditionalDependencies="glut32.lib"
IgnoreImportLibrary="TRUE"
@@ -117,7 +117,7 @@
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
diff --git a/msvc/71/libGIMPACTBullet.vcproj b/msvc/71/libGIMPACTBullet.vcproj
deleted file mode 100644
index a02bb6eee..000000000
--- a/msvc/71/libGIMPACTBullet.vcproj
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/msvc/71/wksbullet.sln b/msvc/71/wksbullet.sln
index 9577d8e5b..ed2b83fd9 100644
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "l
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTBullet", "libGIMPACTBullet.vcproj", "{1B60957B-504A-C45E-7B5C-9AA77F133898}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -132,7 +130,6 @@ Global
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -142,7 +139,6 @@ Global
{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -187,9 +183,8 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
@@ -218,9 +213,8 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
@@ -471,14 +465,6 @@ Global
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.ActiveCfg = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.Build.0 = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.ActiveCfg = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.Build.0 = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
diff --git a/msvc/8/appMovingConcaveDemo.vcproj b/msvc/8/appMovingConcaveDemo.vcproj
index 9e94703db..c0c54cc15 100644
--- a/msvc/8/appMovingConcaveDemo.vcproj
+++ b/msvc/8/appMovingConcaveDemo.vcproj
@@ -32,7 +32,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\release8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\release8\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\release8\build\appMovingConcaveDemo\"
@@ -81,7 +81,7 @@
@@ -102,7 +102,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\release_dbl8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\release_dbl8\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\release_dbl8\build\appMovingConcaveDemo\"
@@ -146,7 +146,7 @@
@@ -172,7 +172,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug8\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug8\build\appMovingConcaveDemo\"
@@ -219,7 +219,7 @@
@@ -245,7 +245,7 @@
OptimizeForProcessor="1"
ExceptionHandling="0"
AdditionalOptions=" "
- AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTBullet"
+ AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appMovingConcaveDemo\appMovingConcaveDemo.pch"
AssemblerListingLocation="..\..\out\debug_dbl8\build\appMovingConcaveDemo\"
ObjectFile="..\..\out\debug_dbl8\build\appMovingConcaveDemo\"
@@ -289,7 +289,7 @@
diff --git a/msvc/8/libGIMPACT.vcproj b/msvc/8/libGIMPACT.vcproj
index bbcdd7bca..e6cc19b78 100644
--- a/msvc/8/libGIMPACT.vcproj
+++ b/msvc/8/libGIMPACT.vcproj
@@ -291,43 +291,22 @@
Name="Source Files"
Filter="">
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactCollisionAlgorithm.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactShape.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_box_set.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_contact.cpp">
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_memory.cpp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ RelativePath="..\..\Extras\GIMPACT\src\core\gim_tri_collision.cpp">
diff --git a/msvc/8/libGIMPACTBullet.vcproj b/msvc/8/libGIMPACTBullet.vcproj
deleted file mode 100644
index 538ba6944..000000000
--- a/msvc/8/libGIMPACTBullet.vcproj
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/msvc/8/wksbullet.sln b/msvc/8/wksbullet.sln
index b11364689..df0830701 100644
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "l
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACT", "libGIMPACT.vcproj", "{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGIMPACTBullet", "libGIMPACTBullet.vcproj", "{1B60957B-504A-C45E-7B5C-9AA77F133898}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibxml", "liblibxml.vcproj", "{A0958CD9-0E39-4A77-3711-9B488F508FBF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libquickstep", "libquickstep.vcproj", "{D7036964-B44D-8207-0ACC-D838D0BDA379}"
@@ -132,7 +130,6 @@ Global
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {1125C7F3-9E0D-27B1-C97B-CDAB5CE161A3}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -142,7 +139,6 @@ Global
{2D714360-B8EC-F8E0-ED74-E95336301075}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
{2D714360-B8EC-F8E0-ED74-E95336301075}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
{2D714360-B8EC-F8E0-ED74-E95336301075}.4 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {2D714360-B8EC-F8E0-ED74-E95336301075}.5 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
@@ -187,9 +183,8 @@ Global
{6210A080-01C0-6D67-F1DB-669393175402}.25 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{6210A080-01C0-6D67-F1DB-669393175402}.26 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{6210A080-01C0-6D67-F1DB-669393175402}.27 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {6210A080-01C0-6D67-F1DB-669393175402}.28 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {6210A080-01C0-6D67-F1DB-669393175402}.29 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {6210A080-01C0-6D67-F1DB-669393175402}.30 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {6210A080-01C0-6D67-F1DB-669393175402}.28 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {6210A080-01C0-6D67-F1DB-669393175402}.29 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
{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 = {2707A1D2-F23C-0C78-B99B-AA148865D6DD}
@@ -218,9 +213,8 @@ Global
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {6AB01C9C-9163-F400-B5C3-20D046631E17}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {1B60957B-504A-C45E-7B5C-9AA77F133898}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
- {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.11 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.9 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+ {DFAF0062-4CD7-9AB8-0683-A6026B326F56}.10 = {D7036964-B44D-8207-0ACC-D838D0BDA379}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{3578834A-4B06-DE6F-78AC-FE11F7226D35}.Release.ActiveCfg = Release|Win32
@@ -471,14 +465,6 @@ Global
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.Debug.Build.0 = Debug|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
{F8318FC6-B9C4-D5A1-DCC0-C9CE42ADAE22}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.ActiveCfg = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Release.Build.0 = Release|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.ReleaseDoublePrecision.Build.0 = ReleaseDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.ActiveCfg = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.Debug.Build.0 = Debug|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.ActiveCfg = DebugDoublePrecision|Win32
- {1B60957B-504A-C45E-7B5C-9AA77F133898}.DebugDoublePrecision.Build.0 = DebugDoublePrecision|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.ActiveCfg = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.Release.Build.0 = Release|Win32
{A0958CD9-0E39-4A77-3711-9B488F508FBF}.ReleaseDoublePrecision.ActiveCfg = ReleaseDoublePrecision|Win32