Changeset 387

Timestamp:

Jun 16, 2012, 1:57:23 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (3 diffs)
• DistortionSetupStrategyProjectSyntropy.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• resources/ProjectSyntropy/TexCoords/warpmap_2.csv (added)
• resources/ProjectSyntropy/Vertices/warpmap_2.csv (added)

experimental/distortionNG/DistortionManipulator.cpp

@@ -547 +547 @@
         for(unsigned int i=0;i<_distortionSet->getDistortionMesh()->size();i++)
         {
+                osg::Vec4 tmpSrc = _distortionSet->getDistortionMesh()->at(i);
+
                 // Scale vector with the screen resolution
-                osg::Vec3 tmpVec = osg::Vec3(   _distortionSet->getDistortionMesh()->at(i).x()*_screenPixWidth,
-                                                                                _distortionSet->getDistortionMesh()->at(i).y()*_screenPixHeight,
+                osg::Vec3 tmpVec = osg::Vec3(   tmpSrc.x()*_screenPixWidth,
+                                                                                tmpSrc.y()*_screenPixHeight,
                                                                                 0.0     );
                 vertices->push_back( tmpVec );
@@ -555 +557 @@
 
                 // Note texCoords
-                osg::Vec2 tmpTexCoords = osg::Vec2(     _distortionSet->getDistortionMesh()->at(i).z()*_screenPixWidth,
-                                                                                        _distortionSet->getDistortionMesh()->at(i).w()*_screenPixHeight );
+                osg::Vec2 tmpTexCoords = osg::Vec2(     tmpSrc.z()*_screenPixWidth,
+                                                                                        tmpSrc.w()*_screenPixHeight );
                 texCoords->push_back(tmpTexCoords);
+                //OSG_ALWAYS<<"Transfering texcoord vertex : X:"<<tmpTexCoords.x()<<" Y:"<<tmpTexCoords.y()<<std::endl;
 
                 colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
         }
 
-        // Apply arrays
+        // --------- Apply Arrays -----------------
         osg::Geometry* geom = _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry();
 
-        geom->removePrimitiveSet(0);
+        // If arraysize differs: Replace primite sets
+        bool regeneratePrimitiveSets = true;
+        osg::Vec3Array* prevArray = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
+        if(prevArray) 
+                regeneratePrimitiveSets = prevArray->size()!=vertices->size()?true:false;
+        
+        // Set new Arrays
         geom->setVertexArray(vertices);
         geom->setTexCoordArray(0, texCoords);   // todo: 0 ist hardcoded und müsste durch getTexUnitScene() ersetzt werden
         geom->setColorArray(colors);
-        
-        // Quads grid
+
+        // If required: regenerate primitiveset:
+        OSG_ALWAYS<<"PrimitiveSet regeneration required!"<<std::endl;
+        geom->removePrimitiveSet(0, geom->getNumPrimitiveSets());       
+        //// Create new primitives : Quads grid
         unsigned int rows = _distortionSet->getDistortionMeshRows();
         unsigned int columns = _distortionSet->getDistortionMeshColumns();
@@ -583 +595 @@
                 geom->addPrimitiveSet( de.get() );
         }
-        
-        //geom->dirtyDisplayList();
-}
+}

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -387 +387 @@
                                 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
-                                        if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
+                                        float x=(float)col/(float)(distortionMeshColumns-1);    // Vertex X
+                                        float y=(float)row/(float)(distortionMeshRows-1);               // Vertex Y
+                                        float z=(float)col/(float)(distortionMeshColumns-1);    // TexCoord X
+                                        float w=(float)row/(float)(distortionMeshRows-1);               // TexCoord Y
+
+        /*                              if(_distortionType==VERTEXDISTORTION || _distortionType==COMBINEDDISTORTION)
                                         {
                                                 x = vertexMeshVec2->at(row*col).x();
@@ -400 +401 @@
                                                 z = texCoordMeshVec2->at(row*col).x();
                                                 w = texCoordMeshVec2->at(row*col).y();
-                                        }
+                                        }*/
 
                                         distortionMesh->at(row*distortionMeshColumns+col).set(x,y,z,w);
                                 }
                         }
+
+                        for (osg::Vec4Array::iterator it = distortionMesh->begin(); it != distortionMesh->end(); ++it)
+                        {
+                                OSG_ALWAYS<<"final vector: "<<(*it).x()<<" "<<(*it).y()<<" "<<(*it).z()<<" "<<(*it).w()<<std::endl;
+                        }
+
 
                         distortionSet->setDistortionMesh(distortionMesh);

experimental/distortionNG/main.cpp

@@ -58 +58 @@
 // ---- test plugin read / write
         //osgDB::writeObjectFile( *_distortionSet, "distortionset.dist" );
-        _distortionSet = NULL;
-        _distortionSet = dynamic_cast<osgViewer::DistortionSet*>( osgDB::readObjectFile( "distortionset.dist" ) );
+        //_distortionSet = NULL;
+        //_distortionSet = dynamic_cast<osgViewer::DistortionSet*>( osgDB::readObjectFile( "distortionset.dist" ) );
 // ------------ Test ende -----------