Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2009-03-03 06:41:24 +0300
committerErwin Coumans <blender@erwincoumans.com>2009-03-03 06:41:24 +0300
commit982a5cc60dd93b21ce110b3fff831d05720047bf (patch)
tree5d6245b0006f249c48e900b748aedd4484c10da3 /extern/bullet2/src/LinearMath/btQuickprof.h
parentf8ef887880ac217cc831b2ab9677e1f9e825537b (diff)
Upgraded to Bullet 2.74. The upgrade introduced a few bugs, which need to be fixed before Blender 2.49.
In particular, the Bullet vehicle seems broken, and some soft-body demos don't work. No new features or benefits are added yet, but a few improvements are planned before Blender 2.49 release. Please update the build systems, and add those 3 files: extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp I'll watch the Blender mailing list, in case this commit causes some issues.
Diffstat (limited to 'extern/bullet2/src/LinearMath/btQuickprof.h')
-rw-r--r--extern/bullet2/src/LinearMath/btQuickprof.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.h b/extern/bullet2/src/LinearMath/btQuickprof.h
index b033940ca5c..f8d47c36861 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.h
+++ b/extern/bullet2/src/LinearMath/btQuickprof.h
@@ -10,14 +10,20 @@
// Credits: The Clock class was inspired by the Timer classes in
// Ogre (www.ogre3d.org).
+
+
#ifndef QUICK_PROF_H
#define QUICK_PROF_H
+//To disable built-in profiling, please comment out next line
+//#define BT_NO_PROFILE 1
+#ifndef BT_NO_PROFILE
+
#include "btScalar.h"
#include "LinearMath/btAlignedAllocator.h"
#include <new>
-//To disable built-in profiling, please comment out next line
-//#define BT_NO_PROFILE 1
+
+
//if you don't need btClock, you can comment next line
@@ -321,6 +327,10 @@ public:
}
static void Release_Iterator( CProfileIterator * iterator ) { delete ( iterator); }
+ static void dumpRecursive(CProfileIterator* profileIterator, int spacing);
+
+ static void dumpAll();
+
private:
static CProfileNode Root;
static CProfileNode * CurrentNode;
@@ -344,12 +354,14 @@ public:
}
};
-#if !defined(BT_NO_PROFILE)
+
#define BT_PROFILE( name ) CProfileSample __profile( name )
+
#else
+
#define BT_PROFILE( name )
-#endif
+#endif //#ifndef BT_NO_PROFILE