Changeset 54

Timestamp:

04/23/07 17:09:02 (2 years ago)

Author:

astraw

Message:

commit heightfield patch from Stou Sandalski

Files:

• trunk/pyosg/osg/Shape3.cpp (modified) (3 diffs)

trunk/pyosg/osg/Shape3.cpp

@@ -13 +13 @@
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/copy_const_reference.hpp>
+#include <boost/python/numeric.hpp>
+#include <boost/python/tuple.hpp>
-
+#include <iostream>
-#include <osg/Shape>
-
@@ -22 +25 @@
-
-namespace PyOSG {
+
+void osgHeightField_setData(osg::HeightField * self, numeric::array& data)
+{
+    object shape = data.getshape();
+    int rows = extract<int>(shape[0]);
+    int cols = extract<int>(shape[1]);
+
+    if((rows == 0) || (cols == 0))
+    {
+
+        PyErr_SetString(PyExc_ValueError, "Invalid array dimensions");
+        throw_error_already_set();
+        return;
+    }
+
+    // Switch this to R,C maybe?
+    self->allocate(cols,rows);
+
+    float value = 0.0f;
+
+    for(int r = 0; r < rows; ++r)
+    {
+        for(int c = 0; c < cols; ++c)
+        {
+           value = extract<float>(data[make_tuple(r,c)]);
+           self->setHeight(c, r, value);
+        }
+    }
+}
+
-void init_Shape3()
-{
@@ -80 +113 @@
-        &osg::HeightField::getHeight);
-
+
+    hfield.def("setHeightData", &osgHeightField_setData);
+   
+
-    hfield.def("getVertex", &osg::HeightField::getVertex);
-    hfield.def("getNormal", &osg::HeightField::getNormal);