Changeset 384

Timestamp:

Jun 15, 2012, 10:09:08 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionManipulator.cpp (modified) (2 diffs)
• DistortionSetupStrategyProjectSyntropy.cpp (modified) (1 diff)

experimental/distortionNG/DistortionManipulator.cpp

@@ -518 +518 @@
         updateDistortionViewProjectionMatrix();
         updateDistortionMesh();
+        _distortionSet->clearDirtyStatus();
 }
 
@@ -539 +540 @@
 void DistortionManipulator::updateDistortionMesh()
 {
-
-}
+        // Create mesh vertex array
+
+        // Create textCoord array
+
+        // Apply arrays
+
+        osg::Vec3Array* vertices = new osg::Vec3Array;
+        osg::Vec2Array* texCoords = new osg::Vec2Array;
+
+        for(unsigned int i=0;i<_distortionSet->getDistortionMesh()->size();i++)
+        {
+                // Scale vector with the screen resolution
+                osg::Vec3 tmpVec = osg::Vec3(   _distortionSet->getDistortionMesh()->at(i).x()*_screenPixWidth,
+                                                                                _distortionSet->getDistortionMesh()->at(i).y()*_screenPixHeight,
+                                                                                0.0     );
+                vertices->push_back( tmpVec );
+                OSG_ALWAYS<<"X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
+
+                // Note texCoords
+                osg::Vec2 tmpTexCoords = osg::Vec2(     _distortionSet->getDistortionMesh()->at(i).z()*_screenPixWidth,
+                                                                                        _distortionSet->getDistortionMesh()->at(i).w()*_screenPixHeight );
+                texCoords->push_back(tmpTexCoords);
+        }
+
+        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setVertexArray(vertices);
+        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setTexCoordArray(0, texCoords);    // todo: 0 ist hardcoded und müsste durch getTexUnitScene() ersetzt werden
+        _distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->dirtyDisplayList();
+
+}

experimental/distortionNG/DistortionSetupStrategyProjectSyntropy.cpp

@@ -409 +409 @@
                         distortionSet->setDistortionMeshColumns(distortionMeshColumns);
                         distortionSet->setDistortionMeshRows(distortionMeshRows);
-
-                        // apply new settings
-                        //if((_distortionType==TEXCOORDDISTORTION) || (_distortionType==COMBINEDDISTORTION))
-                        //{
-                        //      distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setTexCoordArray(0,tmpMeshVec2);
-                        //}
-
-                        //if((_distortionType==VERTEXDISTORTION) || (_distortionType==COMBINEDDISTORTION))
-                        //{
-                        //      OSG_ALWAYS<<"New mesh ---------------------------"<<std::endl;
-                        //      for(unsigned int i=0;i<tmpMeshVec2->size();i++)
-                        //      {
-                        //              // Scale vector with the screen resolution
-                        //              osg::Vec3 tmpVec = osg::Vec3(   tmpMeshVec2->at(i).x()*width,
-                        //                                                                              tmpMeshVec2->at(i).y()*height,
-                        //                                                                              0.0     );
-                        //              vertexMeshVec3->push_back( tmpVec );
-                        //              OSG_ALWAYS<<"X:"<<tmpVec.x()<<" Y:"<<tmpVec.y()<<" Z:"<<tmpVec.z()<<std::endl;
-                        //      }
-                        //      OSG_ALWAYS<<"tmpMeshVec2 size:"<<tmpMeshVec2->size()<<std::endl;
-                        //      distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setVertexArray(vertexMeshVec3);
-                        //      distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->setTexCoordArray
-                        //      distortionSet->getDistortionInternals()->getChild(osgViewer::DistortionSet::MESH)->asGeode()->getDrawable(0)->asGeometry()->dirtyDisplayList();
-                        //}
                 }
         }