Changeset 374

Timestamp:

Jun 2, 2012, 11:53:38 PM (12 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/distortionNG

Files:

• DistortionSet.cpp (modified) (2 diffs)
• DistortionSet.h (modified) (3 diffs)
• extViewer.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

experimental/distortionNG/DistortionSet.cpp

@@ -48 +48 @@
 }
 
+void DistortionSet::setDistortionMesh(osg::Geometry*)
+{
+        // todo: denormalisieren und mesh dann an seine passenden Platz vom Switch packen.
+}
+
+const osg::Geometry* DistortionSet::getDistortionMesh() const
+{
+        // Todo: Normalisieren und dann zurückgeben
+        return NULL;
+}
+
 REGISTER_OBJECT_WRAPPER( osgViewer_DistortionSet,                  // The unique wrapper name
                          new osgViewer::DistortionSet,             // The proto
@@ -56 +67 @@
         ADD_INT_SERIALIZER( DistortionMeshRows, 1 );    //int _distortionMeshRows;
         ADD_INT_SERIALIZER( DistortionMeshColumns, 1 ); //int _distortionMeshColumns;
+        ADD_OBJECT_SERIALIZER( DistortionMesh, osg::Geometry, NULL );   // Normalisiertes Mesh
 
     ADD_GLENUM_SERIALIZER( MeshType, GLenum, GL_QUAD_STRIP );  //osg::PrimitiveSet::Mode _MeshType

experimental/distortionNG/DistortionSet.h

@@ -24 +24 @@
 #include <osg/Switch>
 #include <osg/Shader>
+#include <osg/Geometry>
 
 namespace osgViewer {
@@ -75 +76 @@
         int getDistortionMeshColumns() const    { return _distortionMeshColumns; }
 
+        void setDistortionMesh(osg::Geometry*);
+        const osg::Geometry* getDistortionMesh() const;
+
         void setMeshType(GLenum meshType) { _meshType = meshType; }
     inline GLenum getMeshType() const { return _meshType; }
@@ -110 +114 @@
         osg::Matrixd _projectionOffset;
 
+        // Interconnect-Pointer to allow access between distortion elements (osgViewer) and the distortion manipulator.
+        // These variable are therefor not saved/restored by the serializer but populated on runtime.
         bool _showIntesityMapMapOnly;   // Intensity Blending is done by a frag shader. To control it on runtime, the uniform must be bound to a central variable.
-
-        // Interconnect-Pointer to allow acces between distortion elements (osgViewer) and the distortion manipulator.
-        // These variable are therefor not saved/restored by the serializer but populated on runtime.
         osg::observer_ptr<osg::Camera> _camera; // is used to pass the distortion cam from osgViewers setupDistortion() method to the manipulator.
         osg::ref_ptr<osg::Switch> _distortionInternals; // definition: child #0 = mesh, #1 = highlighter, #2 HUD

experimental/distortionNG/extViewer.h

@@ -42 +42 @@
 
                 void setUpIntensityMapBlending(osgViewer::DistortionSet* distSet, unsigned int screenNum=0);
+
+                /**
+                 * \brief This functions loads the specified blendmap and configures the viewer for blending.
+                 * !This function does not perform any distortion it just configures the viewer for simple viewing with an intensity map.
+                 * 
+                 * @param intensityMap  : Filename of the intensitymap to use for blending
+                 */ 
                 void setUpIntensityMapBlending(std::string intensityMap);
 

experimental/distortionNG/main.cpp

@@ -184 +184 @@
  *                                                                              - slaveCam viewOffset   (wird mit der vom master multipliziert und auf die slave cam angewendet, verwendet für translation und rotation offset)
  *                                                                              
- *                                                                              need to add setter/getter as well as the serializer macros.
+ *                                                      []                      Todo: get set methode für das Mesh implementieren.
  *                                                                              
  *                                                                              Besitz: Da osgViewer distSets ohne Manipulationsmöglichkeit konsumieren können soll, muss der Container vom Viewer verwaltet werden. der manipulator greift darauf zu, das plugin kann container entgegen nehmen oder zurückgeben, hat aber keinen direkten kontakt zur container instanz von osgViewer