Changeset 383 for experimental/distortionNG/DistortionSet.cpp

Timestamp:

Jun 15, 2012, 9:14:07 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/distortionNG/DistortionSet.cpp (modified) (3 diffs)

experimental/distortionNG/DistortionSet.cpp

@@ -24 +24 @@
 DistortionSet::DistortionSet()
 {
-        _dirty = false;
+        _meshDirty = false;
+        _matrixDirty = false;
 
         _distortionMeshRows = 2;
         _distortionMeshColumns = 2;
-        //GLenum _meshType;
+        _distortionMesh = new osg::Vec4Array();
         
         _intensityMap = NULL;
@@ -50 +51 @@
 }
 
-void DistortionSet::setDistortionMesh(osg::Geometry*)
+void DistortionSet::setDistortionMeshDimensions(int rows, int cols)
 {
-        // todo: denormalisieren und mesh dann an seine passenden Platz vom Switch packen.
+        _distortionMeshRows = rows;
+        _distortionMeshColumns = cols;
+
+        if(_distortionMesh->size() != _distortionMeshRows * _distortionMeshRows)        // If dimensions differ: discard current mesh and createa new one
+        {
+                _distortionMesh = new osg::Vec4Array(_distortionMeshRows * _distortionMeshRows);
+                for(int row=0;row<_distortionMeshRows;row++)
+                {
+                        for(int col=0;col<_distortionMeshColumns;col++)
+                        {
+                                float x=col/_distortionMeshColumns;     // Vertex X
+                                float y=row/_distortionMeshRows;        // Vertex Y
+                                float z=col/_distortionMeshColumns;     // TexCoord X
+                                float w=row/_distortionMeshRows;        // TexCoord Y
+
+                                _distortionMesh->at(row*_distortionMeshColumns+col).set(x,y,z,w);
+                        }
+                }
+        }
 }
 
-const osg::Geometry* DistortionSet::getDistortionMesh() const
-{
-        // Todo: Normalisieren und dann zurückgeben
-        return NULL;
-}
 
 REGISTER_OBJECT_WRAPPER( osgViewer_DistortionSet,                  // The unique wrapper name
@@ -69 +83 @@
         ADD_INT_SERIALIZER( DistortionMeshRows, 1 );    //int _distortionMeshRows;
         ADD_INT_SERIALIZER( DistortionMeshColumns, 1 ); //int _distortionMeshColumns;
-        ADD_OBJECT_SERIALIZER( DistortionMesh, osg::Geometry, NULL );   // Normalisiertes Mesh
+        ADD_OBJECT_SERIALIZER( DistortionMesh, osg::Vec4Array, NULL );  // x,y = vertex coordinates, z,t=textureCoordinates, Werte sind normalisiert auf 0-1
 
     ADD_GLENUM_SERIALIZER( MeshType, GLenum, GL_QUAD_STRIP );  //osg::PrimitiveSet::Mode _MeshType