[tubras] r1916 committed - Fix for recent bullet updates.

[tub...@googlecode.com]

Revision: 1916
Author: pc0...@gmail.com
Date: Fri Jun 8 10:59:14 2012
Log: Fix for recent bullet updates.

http://code.google.com/p/tubras/source/detail?r=1916

Modified:
/trunk/include/TRayResult.h
/trunk/projects/win32/vc9/Tubras.vcproj

=======================================
--- /trunk/include/TRayResult.h Sat Jan 9 12:52:25 2010
+++ /trunk/include/TRayResult.h Fri Jun 8 10:59:14 2012
@@ -17,7 +17,7 @@
protected:
bool m_hasHit;
TReal m_closestHitFraction;
- btCollisionObject* m_bulletCollisionObject;
+ const btCollisionObject* m_bulletCollisionObject;
TPhysicsObject* m_collisionObject;
TVector3 m_hitNormalWorld;
TVector3 m_hitPointWorld;
@@ -30,7 +30,7 @@

bool hasHit() {return m_hasHit;}
TPhysicsObject* getCollisionObject() {return
m_collisionObject;}
- btCollisionObject* getBulletCollisionObject() {return
m_bulletCollisionObject;}
+ const btCollisionObject* getBulletCollisionObject() {return
m_bulletCollisionObject;}
TVector3 getHitNormalWorld() {return m_hitNormalWorld;}
TVector3 getHitPointWorld() {return m_hitPointWorld;}
};
=======================================
--- /trunk/projects/win32/vc9/Tubras.vcproj Sun Dec 11 16:19:48 2011
+++ /trunk/projects/win32/vc9/Tubras.vcproj Fri Jun 8 10:59:14 2012
@@ -5957,6 +5957,42 @@
<File
RelativePath="..\..\..\deps\bullet\src\LinearMath\btTransformUtil.h"
>
+ </File>
+ <File
+ RelativePath="..\..\..\deps\bullet\src\LinearMath\btVector3.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\deps\bullet\src\LinearMath\btVector3.h"