Changeset 3474

Timestamp:

03/01/10 07:22:54 (5 months ago)

Author:

trichards

Message:

More work on ZODE and ZTerrain.

Location:

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2

Files:

• ZODE/src/HeightfieldResource.cpp (modified) (2 diffs)
• ZODE/src/HeightfieldResource.hpp (modified) (1 diff)
• ZTerrain/src/Terrain.cpp (modified) (1 diff)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZODE/src/HeightfieldResource.cpp

@@ -28 +28 @@
 #include <Zen/Core/Math/Math.hpp>
 
+#include <boost/archive/binary_iarchive.hpp>
+
 #include <boost/lexical_cast.hpp>
+#include <boost/cstdint.hpp>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <vector>
+
+#include <fstream>
+#include <sstream>
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
@@ -79 +84 @@
     /// While we're reading the height data, we can get the
     /// height bounds of the heightmap as well.
-    /// (These may need to be scaled versions of the raw min/max 
+    /// (These may need to be scaled versions of the raw min/max
     /// based on the scale config param).
-    const short *pBuffer;
+
+    std::vector<boost::int16_t> buffer(widthSamples * depthSamples);
+
+        boost::int16_t min = SHRT_MAX;
+        boost::int16_t max = SHRT_MIN;
+
+    std::ifstream stream(fileName, std::ios::in|std::ios::binary);
+
+    boost::archive::binary_iarchive inputArchive(stream, boost::archive::no_header |
+            boost::archive::no_tracking);
+
+    // Read the input stream if it exists
+    if(stream.good())
+    {
+        for(int x = 0; x < widthSamples; x++)
+        {
+            for(int y = 0; y < depthSamples; y++)
+            {
+                boost::uint16_t c;
+                inputArchive & c;
+                buffer[x * widthSamples + y] = c;
+                max = max > c ? max : c;
+                min = min < c ? min : c;
+
+            }
+        }
+    }
+    else
+    {
+        std::stringstream errorMessage;
+        errorMessage << "Error opening " << fileName
+            << "file for input." << std::endl;
+        throw Zen::Utility::runtime_exception(errorMessage.str());
+    }
+
+    const short *pBuffer = &buffer[0];
+
     Math::Real minHeight;
     Math::Real maxHeight;

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZODE/src/HeightfieldResource.hpp

@@ -91 +91 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 
-#endif ZEN_ZODE_HEIGHTFIELD_RESOURCE_HPP
+#endif // ZEN_ZODE_HEIGHTFIELD_RESOURCE_HPP

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZTerrain/src/Terrain.cpp

@@ -101 +101 @@
 Terrain::loadPhysicsFromRaw(const std::string& _rawFileName, size_t _size, float _maxHeight, float _scaleXY, const Math::Matrix4& _transform, bool _bSerialize)
 {
+        Zen::Engine::Resource::I_ResourceService::config_type config;
+
+        config["fileName"] = _rawFileName;
+
+        m_pTerrainService->getPhysicsResourceService()->loadResource(config);
+
     Zen::Engine::World::I_Terrain::pPhysicsActor_type pActor = m_pTerrainService->getPhysicsZone()->createActor();
     pActor->setCollisionShape(