Merge remote-tracking branch 'scrawl/bullet283'

components/nifbullet/bulletnifloader.cpp

@@ -123,7 +123,7 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     mCompoundShape = NULL;
     mStaticMesh = NULL;
 
-    Nif::NIFFilePtr pnif (Nif::Cache::getInstance().load(mResourceName.substr(0, mResourceName.length()-7)));
+    Nif::NIFFilePtr pnif (Nif::Cache::getInstance().load(mResourceName));
     Nif::NIFFile & nif = *pnif.get ();
     if (nif.numRoots() < 1)
     {
@@ -134,7 +134,7 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     // Have to load controlled nodes from the .kf
     // FIXME: the .kf has to be loaded both for rendering and physics, ideally it should be opened once and then reused
     mControlledNodes.clear();
-    std::string kfname = mResourceName.substr(0, mResourceName.length()-7);
+    std::string kfname = mResourceName;
     Misc::StringUtils::toLower(kfname);
     if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
         kfname.replace(kfname.size()-4, 4, ".kf");

libs/openengine/bullet/physic.cpp

@@ -455,8 +455,7 @@ namespace Physic
         float scale, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation,
         Ogre::Vector3* scaledBoxTranslation, Ogre::Quaternion* boxRotation, bool raycasting, bool placeable)
     {
-        std::string sid = (boost::format("%07.3f") % scale).str();
-        std::string outputstring = mesh + sid;
+        std::string outputstring = mesh;
 
         //get the shape from the .nif
         mShapeLoader->load(outputstring,"General");
@@ -475,20 +474,35 @@ namespace Physic
 
         btCollisionShape* collisionShape = raycasting ? shape->mRaycastingShape : shape->mCollisionShape;
 
-        // If this is an animated compound shape, we must duplicate it so we can animate
-        // multiple instances independently.
-        if (!raycasting && !shape->mAnimatedShapes.empty())
-            collisionShape = duplicateCollisionShape(collisionShape);
-        if (raycasting && !shape->mAnimatedRaycastingShapes.empty())
-            collisionShape = duplicateCollisionShape(collisionShape);
+// TODO: check this from cmake?
+#if BT_BULLET_VERSION < 283
+#error "Bullet version 2.83 or later required"
+#endif
 
-        collisionShape->setLocalScaling( btVector3(scale,scale,scale));
+        bool needDelete = false;
+        if (btBvhTriangleMeshShape* triangleShape = dynamic_cast<btBvhTriangleMeshShape*>(shape->mCollisionShape))
+        {
+            btScaledBvhTriangleMeshShape* scaled = new btScaledBvhTriangleMeshShape(triangleShape, btVector3(scale,scale,scale));
+            collisionShape = scaled;
+            needDelete = true;
+        }
+        else
+        {
+            // If this is an animated compound shape, we must duplicate it so we can animate
+            // multiple instances independently.
+            if (!raycasting && !shape->mAnimatedShapes.empty())
+                collisionShape = duplicateCollisionShape(collisionShape);
+            if (raycasting && !shape->mAnimatedRaycastingShapes.empty())
+                collisionShape = duplicateCollisionShape(collisionShape);
+        }
 
         //create the real body
         btRigidBody::btRigidBodyConstructionInfo CI = btRigidBody::btRigidBodyConstructionInfo
                 (0,0, collisionShape);
         RigidBody* body = new RigidBody(CI,name);
         body->mPlaceable = placeable;
+        if (needDelete)
+            body->mCollisionShape.reset(collisionShape);
 
         if (!raycasting && !shape->mAnimatedShapes.empty())
         {

libs/openengine/bullet/physic.hpp

@@ -63,6 +63,9 @@ namespace Physic
         virtual ~RigidBody();
         std::string mName;
 
+        // May be empty if the collision shape is a shared resource
+        std::auto_ptr<btCollisionShape> mCollisionShape;
+
         // Hack: placeable objects (that can be picked up by the player) have different collision behaviour.
         // This variable needs to be passed to BulletNifLoader.
         bool mPlaceable;