Changeset 2877

Timestamp:

Mar 31, 2009, 2:41:24 PM (16 years ago)

Author:

bknecht

Message:

reverted back everything, sorry KDevelop screws things up sometimes

File:

• code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (modified) (17 diffs)

code/trunk/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h

@@ -5 +5 @@
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
@@ -33 +33 @@
  * Bullet comes with autogenerated Project Files for Microsoft Visual Studio 6, 7, 7.1 and 8.
  * The main Workspace/Solution is located in Bullet/msvc/8/wksbullet.sln (replace 8 with your version).
- *
+ * 
  * Under other platforms, like Linux or Mac OS-X, Bullet can be build using either using make, cmake, http://www.cmake.org , or jam, http://www.perforce.com/jam/jam.html . cmake can autogenerate Xcode, KDevelop, MSVC and other build systems. just run cmake . in the root of Bullet.
  * So if you are not using MSVC or cmake, you can run ./autogen.sh ./configure to create both Makefile and Jamfile and then run make or jam.
  * Jam is a build system that can build the library, demos and also autogenerate the MSVC Project Files.
  * If you don't have jam installed, you can make jam from the included jam-2.5 sources, or download jam from ftp://ftp.perforce.com/jam
- *
+ * 
  * @subsection step3 Step 3: Testing demos
  * Try to run and experiment with BasicDemo executable as a starting point.
  * Bullet can be used in several ways, as Full Rigid Body simulation, as Collision Detector Library or Low Level / Snippets like the GJK Closest Point calculation.
  * The Dependencies can be seen in this documentation under Directories
- *
+ * 
  * @subsection step4 Step 4: Integrating in your application, full Rigid Body and Soft Body simulation
  * Check out BasicDemo how to create a btDynamicsWorld, btRigidBody and btCollisionShape, Stepping the simulation and synchronizing your graphics object transform.
@@ -57 +57 @@
  * Special thanks to all visitors of the Bullet Physics forum, and in particular above contributors, John McCutchan, Nathanael Presson, Dave Eberle, Dirk Gregorius, Erin Catto, Dave Eberle, Adam Moravanszky,
  * Pierre Terdiman, Kenny Erleben, Russell Smith, Oliver Strunk, Jan Paul van Waveren, Marten Svanfeldt.
- *
+ * 
  */
 
 
+ 
+ 
 
 #ifndef COLLISION_WORLD_H
@@ -81 +83 @@
 
 
+        
 protected:
 
         btAlignedObjectArray<btCollisionObject*>        m_collisionObjects;
 
+        
         btDispatcher*   m_dispatcher1;
 
@@ -96 +100 @@
 
 
+        
 public:
 
@@ -137 +142 @@
 
 
+        
         virtual void    setDebugDrawer(btIDebugDraw*    debugDrawer)
         {
@@ -155 +161 @@
                 int     m_triangleIndex;
 
+                
                 //const btCollisionShape*       m_shapeTemp;
                 //const btTransform*    m_shapeLocalTransform;
@@ -161 +168 @@
         struct  LocalRayResult
         {
-                LocalRayResult(btCollisionObject*       collisionObject,
+                LocalRayResult(btCollisionObject*       collisionObject, 
                         LocalShapeInfo* localShapeInfo,
                         const btVector3&                hitNormalLocal,
@@ -228 +235 @@
                 btVector3       m_hitPointWorld;
 
+                        
                 virtual btScalar        addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace)
                 {
@@ -233 +241 @@
                         btAssert(rayResult.m_hitFraction <= m_closestHitFraction);
 
+                        
                         m_closestHitFraction = rayResult.m_hitFraction;
                         m_collisionObject = rayResult.m_collisionObject;
@@ -251 +260 @@
         struct LocalConvexResult
         {
-                LocalConvexResult(btCollisionObject*    hitCollisionObject,
+                LocalConvexResult(btCollisionObject*    hitCollisionObject, 
                         LocalShapeInfo* localShapeInfo,
                         const btVector3&                hitNormalLocal,
@@ -279 +288 @@
                 short int       m_collisionFilterMask;
 
+                
                 ConvexResultCallback()
                         :m_closestHitFraction(btScalar(1.)),
@@ -290 +300 @@
                 }
 
+                
                 bool    hasHit() const
                 {
@@ -296 +307 @@
 
 
+                
 
                 virtual bool needsCollision(btBroadphaseProxy* proxy0) const
@@ -323 +335 @@
                 btCollisionObject*      m_hitCollisionObject;
 
+                
                 virtual btScalar        addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace)
                 {
@@ -328 +341 @@
                         btAssert(convexResult.m_hitFraction <= m_closestHitFraction);
 
+                                                
                         m_closestHitFraction = convexResult.m_hitFraction;
                         m_hitCollisionObject = convexResult.m_hitCollisionObject;
@@ -350 +364 @@
         /// rayTest performs a raycast on all objects in the btCollisionWorld, and calls the resultCallback
         /// This allows for several queries: first hit, all hits, any hit, dependent on the value returned by the callback.
-        void    rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const;
+        void    rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const; 
 
         // convexTest performs a swept convex cast on all objects in the btCollisionWorld, and calls the resultCallback