Changeset 3363

Timestamp:

02/03/10 16:44:16 (6 weeks ago)

Author:

Azaezel

Message:

simplified direct serialization from raw

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsZone.cpp (modified) (4 diffs)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsZone.cpp

@@ -37 +37 @@
 #include <Zen/Core/Math/Vector4.hpp>
 
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 namespace Zen {
@@ -410 +411 @@
     pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
 
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateTreeCollision(m_pZone, NULL));
-    std::cout << "\nTreeCollision construction begun from RAW file..." << std::endl;
-    NewtonTreeCollisionBeginBuild((dynamic_cast<CollisionShape*>(pShape.get())->getShapePtr()));
-
     // TODO - verify the file is a RAW file
     FILE* file;
     file = fopen(_filename.c_str(), "rb");
     if( file== NULL )
-        {
+    {
         std::cout << "Error: could not open file " << _filename.c_str() << "in CollisionShape::initHeightFieldShape()." << std::endl;
-        
-            throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::createHeightFieldShapeFromRaw - Could not Open File!");
+        throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::createHeightFieldShapeFromRaw - Could not Open File!");
     }
 
@@ -436 +432 @@
         {
             fread(&height, sizeof(U16), 1, file);
-            pHeightFieldArray[column + (row * _size)] = height / heightScaleFactor;
+            pHeightFieldArray[column + (row * _size)] = height;
         }
     }
     fclose(file);
 
-    // now parse the array to create triangle vertices
-    std::cout << "TreeCollision finished reading into Array.  Now assigning vertices for row ";
-    Zen::Math::Real vertexArray[9];
-    const Zen::Math::Real* pVertexArray = &vertexArray[0];
-    size_t sizeMinusOne = _size - 1;
-    size_t arrIndex;
-    int strideSize = sizeof(Zen::Math::Real) * 3;
-    for (row = 0; row < sizeMinusOne; row++)
-    {
-        std::cout << " " << row;
-        for (column = 0; column < sizeMinusOne; column++)
-        {
-            arrIndex = column + (row * _size);
-
-            vertexArray[0] = (Zen::Math::Real)column * _scaleXY;
-            vertexArray[1] = pHeightFieldArray[arrIndex + _size];
-            vertexArray[2] = (Zen::Math::Real)(row + 1.0f) * _scaleXY;
-
-            vertexArray[3] = (Zen::Math::Real)(column + 1.0f) * _scaleXY;
-            vertexArray[4] = pHeightFieldArray[arrIndex + 1];
-            vertexArray[5] = (Zen::Math::Real)row * _scaleXY;
-
-            vertexArray[6] = (Zen::Math::Real)column * _scaleXY;
-            vertexArray[7] = pHeightFieldArray[arrIndex];
-            vertexArray[8] = (Zen::Math::Real)row * _scaleXY;
-
-            NewtonTreeCollisionAddFace(dynamic_cast<CollisionShape*>(pShape.get())->getShapePtr(), 3, pVertexArray, strideSize, 0);
-
-            vertexArray[0] = (Zen::Math::Real)(column + 1.0f) * _scaleXY;
-            vertexArray[1] = pHeightFieldArray[arrIndex + _size + 1];
-            vertexArray[2] = (Zen::Math::Real)(row + 1.0f) * _scaleXY;
-
-            vertexArray[3] = (Zen::Math::Real)(column + 1.0f) * _scaleXY;
-            vertexArray[4] = pHeightFieldArray[arrIndex + 1];
-            vertexArray[5] = (Zen::Math::Real)row * _scaleXY;
-
-            vertexArray[6] = (Zen::Math::Real)column * _scaleXY;
-            vertexArray[7] = pHeightFieldArray[arrIndex + _size];
-            vertexArray[8] = (Zen::Math::Real)(row + 1.0f) * _scaleXY;
-
-            NewtonTreeCollisionAddFace(dynamic_cast<CollisionShape*>(pShape.get())->getShapePtr(), 3, pVertexArray, strideSize, 0);
-        }
-    }
-
-    std::cout << "\nTreeCollision finished assigning vertices.\nNow beginning mesh optimization...\n\nPlease be patient, as this may take a few MINUTES depending on your computer." << std::endl;
-    // TODO - reset this to final parm of 1 to force optimization.  set to 0 for testing speed only.
-    NewtonTreeCollisionEndBuild(dynamic_cast<CollisionShape*>(pShape.get())->getShapePtr(), 1);
-    //NewtonTreeCollisionEndBuild(collision, 0);
-    std::cout << "TreeCollision finished optimizing.  Completed." << std::endl;
+    //btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
+    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(new btHeightfieldTerrainShape(_scaleXY,_scaleXY,&pHeightFieldArray,_maxHeight,0,true,false));
+//    std::cout << "\nTreeCollision finished assigning vertices.\nNow beginning mesh optimization...\n\nPlease be patient, as this may take a few MINUTES depending on your computer." << std::endl;
     delete pHeightFieldArray;
 
-    if (_bSerialize)
-    {
-            //FILE* file;
-        //errno_t errcode;
-        std::string serializeFile = _filename;
-            serializeFile.append(".collision");
-                file = fopen(serializeFile.c_str(), "wb");
-                if( file== NULL )
-                {
-            std::cout << "Error: could not open file " << _filename.c_str() << " for writing while serializing terrain." << std::endl;
-            throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::createHeightFieldShapeFromRaw - Could not Serialize File!");
-        }
-        std::cout << "\nTreeCollision serializing started to file " << serializeFile.c_str() << std::endl;
-            NewtonTreeCollisionSerialize(dynamic_cast<CollisionShape*>(pShape.get())->getShapePtr(), ZBulletSerializeFile, file);
-        std::cout << "TreeCollision serializing completed." << std::endl;
-            fclose(file);
-    }
-
+    return pShape;
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+PhysicsZone::pCollisionShape_type
+PhysicsZone::createHeightFieldShapeFromSerialization(std::string _filename, const Math::Matrix4& _transform)
+{
+    std::cout << "\nLoading TreeCollision from file " << _filename.c_str() << std::endl;
+        FILE* file;
+
+    file = fopen(_filename.c_str(), "rb");
+    if( file==0 )
+    {
+        std::cout << "Error: could not open file " << _filename.c_str() << " for loading terrain." << std::endl;
+        throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::createHeightFieldShapeFromSerialization - Could not Open File!");
+    }
+    
+    CollisionShape* pRawPointer = new CollisionShape();
+    pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
+
+    //dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateTreeCollision(m_pZone, NULL));
+
+    //dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateTreeCollisionFromSerialization(m_pZone, NULL, ZBulletDeSerializeFile, file));
+        fclose (file);
+    std::cout << "Finished loading TreeCollision from file." << std::endl;
+    
     /* this is not description logic
     // Note: collision is deleted in attachBody() so do not use it after this function call.
@@ -519 +477 @@
     return true;
     */
-
-    return pShape;
-}
-
-//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-PhysicsZone::pCollisionShape_type
-PhysicsZone::createHeightFieldShapeFromSerialization(std::string _filename, const Math::Matrix4& _transform)
-{
-    std::cout << "\nLoading TreeCollision from file " << _filename.c_str() << std::endl;
-        FILE* file;
-
-    file = fopen(_filename.c_str(), "rb");
-    if( file==0 )
-    {
-        std::cout << "Error: could not open file " << _filename.c_str() << " for loading terrain." << std::endl;
-        throw Zen::Utility::runtime_exception("Zen::ZBullet::PhysicsZone::createHeightFieldShapeFromSerialization - Could not Open File!");
-    }
-    
-    CollisionShape* pRawPointer = new CollisionShape();
-    pCollisionShape_type pShape(pRawPointer, boost::bind(&PhysicsZone::destroyCollisionShape, this, _1));
-
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateTreeCollision(m_pZone, NULL));
-
-    dynamic_cast<CollisionShape*>(pShape.get())->setShapePtr(NewtonCreateTreeCollisionFromSerialization(m_pZone, NULL, ZBulletDeSerializeFile, file));
-        fclose (file);
-    std::cout << "Finished loading TreeCollision from file." << std::endl;
-    
-    /* this is not description logic
-    // Note: collision is deleted in attachBody() so do not use it after this function call.
-    if (!attachBody((btCollisionShape *)pShape->getShapePtr()))
-        return false;
-
-    btRigidBodySetMatrix(pShape->getActorPtr(), _transform.m_array);
-
-    return true;
-    */
     return pShape;
 }