Changeset 6935 for OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

Timestamp:

06/12/07 10:29:32 (6 years ago)

Author:

robert

Message:

Added screen number, and flip support into dome correction codes.

Files:

• OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -293 +293 @@
     if (arguments.read("--collar", collar_radius)) {}
 
+    double rotationDegrees = 180.0;
+    if (arguments.read("--rotation", rotationDegrees)) {}
+
     osg::Vec3d center(0.0,0.0,0.0);
     osg::Vec3d eye(0.0,0.0,0.0);
@@ -331 +334 @@
     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1)));
     
+    osg::Vec3 top = origin + yAxis*height;
+
     osg::Vec3d screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
     float screenRadius = heightVector.length() * 0.5f;
 
+    double rotation = osg::DegreesToRadians(rotationDegrees);
+
     osg::Vec3 cursor = bottom;
     int i,j;
     
     int midSteps = noSteps/2;
+    
+    bool flip = false;
+    if (arguments.read("--flip")) { flip = true; }
     
     for(i=0;i<midSteps;++i)
@@ -347 +357 @@
             double theta = atan2(delta.x(), -delta.y());
             theta += 2*osg::PI;
+
             double phi = osg::PI_2 * delta.length() / screenRadius;
             if (phi > osg::PI_2) phi = osg::PI_2;
@@ -360 +371 @@
             // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
 
-            vertices->push_back(cursor);
+            if (flip)
+                vertices->push_back(osg::Vec3(cursor.x(), top.y()-(cursor.y()-origin.y()),cursor.z()));
+            else
+                vertices->push_back(cursor);
+            
             colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
             texcoords->push_back(texcoord);
@@ -384 +399 @@
             // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
 
-            vertices->push_back(cursor);
+            if (flip)
+                vertices->push_back(osg::Vec3(cursor.x(), top.y()-(cursor.y()-origin.y()),cursor.z()));
+            else
+                vertices->push_back(cursor);
+
             colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
             texcoords->push_back(texcoord);
@@ -414 +433 @@
             // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
 
-            vertices->push_back(cursor);
+            if (flip)
+                vertices->push_back(osg::Vec3(cursor.x(), top.y()-(cursor.y()-origin.y()),cursor.z()));
+            else
+                vertices->push_back(cursor);
+
             colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
             texcoords->push_back(texcoord);
@@ -459 +482 @@
     }
 
+    unsigned int screenNum = 0;
+    while (arguments.read("--screen",screenNum)) {}
+
+
     unsigned int width, height;
-    wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(0), width, height);
+    wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(screenNum), width, height);
 
     while (arguments.read("--width",width)) {}
@@ -466 +493 @@
 
     osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
+    traits->screenNum = screenNum;
     traits->x = 0;
     traits->y = 0;