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

Timestamp:

05/08/07 17:32:35 (6 years ago)

Author:

robert

Message:

Further work on dome correction

Files:

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

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -321 +321 @@
     yAxis /= height;
     
-    int noSteps = 50;
+    int noSteps = 160;
 
     osg::Vec3Array* vertices = new osg::Vec3Array;
@@ -328 +328 @@
 
     osg::Vec3 bottom = origin;
-    osg::Vec3 dx = xAxis*(width/((float)(noSteps-1)));
+    osg::Vec3 dx = xAxis*(width/((float)(noSteps-2)));
     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1)));
     
@@ -337 +337 @@
     int i,j;
     
-    for(i=0;i<noSteps;++i)
+    int midSteps = noSteps/2;
+    
+    for(i=0;i<midSteps;++i)
     {
         osg::Vec3 cursor = bottom+dy*(float)i;
-        for(j=0;j<noSteps;++j)
+        for(j=0;j<midSteps;++j)
         {
             osg::Vec2 delta(cursor.x() - screenCenter.x(), cursor.y() - screenCenter.y());
-            double theta = atan2(delta.x(), delta.y());
-            if (theta<0.0) theta += 2*osg::PI;
+            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;
@@ -356 +358 @@
             osg::Vec2 texcoord(theta/(2.0*osg::PI), 1.0-gamma/osg::PI);
 
-            osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
+            // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
 
             vertices->push_back(cursor);
@@ -362 +364 @@
             texcoords->push_back(texcoord);
 
+            if (j+1<midSteps) cursor += dx;
+        }
+
+        for(;j<noSteps;++j)
+        {
+            osg::Vec2 delta(cursor.x() - screenCenter.x(), cursor.y() - screenCenter.y());
+            double theta = atan2(delta.x(), -delta.y());
+            double phi = osg::PI_2 * delta.length() / screenRadius;
+            if (phi > osg::PI_2) phi = osg::PI_2;
+
+            double f = distance * sin(phi);
+            double e = distance * cos(phi) + sqrt( sphere_radius*sphere_radius - f*f);
+            double l = e * cos(phi);
+            double h = e * sin(phi);
+            double gamma = atan2(h, l-distance);
+
+            osg::Vec2 texcoord(theta/(2.0*osg::PI), 1.0-gamma/osg::PI);
+
+            // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
+
+            vertices->push_back(cursor);
+            colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
+            texcoords->push_back(texcoord);
+
             cursor += dx;
         }
@@ -367 +393 @@
     }
     
+    for(;i<noSteps;++i)
+    {
+        osg::Vec3 cursor = bottom+dy*(float)i;
+        for(j=0;j<noSteps;++j)
+        {
+            osg::Vec2 delta(cursor.x() - screenCenter.x(), cursor.y() - screenCenter.y());
+            double theta = atan2(delta.x(), -delta.y());
+            if (theta<0.0) theta += 2*osg::PI;
+            double phi = osg::PI_2 * delta.length() / screenRadius;
+            if (phi > osg::PI_2) phi = osg::PI_2;
+
+            double f = distance * sin(phi);
+            double e = distance * cos(phi) + sqrt( sphere_radius*sphere_radius - f*f);
+            double l = e * cos(phi);
+            double h = e * sin(phi);
+            double gamma = atan2(h, l-distance);
+
+            osg::Vec2 texcoord(theta/(2.0*osg::PI), 1.0-gamma/osg::PI);
+
+            // osg::notify(osg::NOTICE)<<"cursor = "<<cursor<< " theta = "<<theta<< "phi="<<phi<<" gamma = "<<gamma<<" texcoord="<<texcoord<<std::endl;
+
+            vertices->push_back(cursor);
+            colors->push_back(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
+            texcoords->push_back(texcoord);
+
+            cursor += dx;
+        }
+
+        // osg::notify(osg::NOTICE)<<std::endl;
+    }
+
     // pass the created vertex array to the points geometry object.
     geometry->setVertexArray(vertices);
@@ -439 +496 @@
             if (image)
             {
-#if 0            
+#if 1            
                 texture = new osg::TextureRectangle(image);
 #else
@@ -462 +519 @@
         osg::StateSet* stateset = geode->getOrCreateStateSet();
         stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
+        texture->setMaxAnisotropy(16.0f);
         stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-#if 0        
+#if 1        
         osg::TexMat* texmat = new osg::TexMat;
         texmat->setScaleByTextureRectangleSize(true);
@@ -485 +543 @@
 
         // add subgraph to render
-        camera->addChild(geode);
+        // camera->addChild(geode);
         
         camera->setName("DistortionCorrectionCamera");
 
-        viewer.addSlave(camera.get(), osg::Matrixd(), osg::Matrixd(), false);
-    }
+        viewer.addSlave(camera.get(), osg::Matrixd(), osg::Matrixd(), true);
+
+        viewer.setSceneData(geode);
+    }
+    
     
     viewer.getCamera()->setNearFarRatio(0.0001f);
@@ -515 +576 @@
     osgViewer::Viewer viewer;
     
+    if (arguments.argc()<=1)
+    {
+        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
+        return 1;
+    }
+
     while (arguments.read("--texture2D")) useTextureRectangle=false;
     while (arguments.read("--shader")) useShader=true;
@@ -525 +592 @@
     }
 
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-    osg::Vec3 pos(0.0f,0.0f,0.0f);
-        
-    osg::StateSet* stateset = geode->getOrCreateStateSet();
-    stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-
-    if (useShader)
-    {
-        //useTextureRectangle = false;
-        
-        static const char *shaderSourceTextureRec = {
-            "uniform vec4 cutoff_color;\n"
-            "uniform samplerRect movie_texture;\n"
-            "void main(void)\n"
-            "{\n"
-            "    vec4 texture_color = textureRect(movie_texture, gl_TexCoord[0]); \n"
-            "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
-            "    gl_FragColor = texture_color;\n"
-            "}\n"
-        };
-
-        static const char *shaderSourceTexture2D = {
-            "uniform vec4 cutoff_color;\n"
-            "uniform sampler2D movie_texture;\n"
-            "void main(void)\n"
-            "{\n"
-            "    vec4 texture_color = texture2D(movie_texture, gl_TexCoord[0]); \n"
-            "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
-            "    gl_FragColor = texture_color;\n"
-            "}\n"
-        };
-
-        osg::Program* program = new osg::Program;
-        
-        program->addShader(new osg::Shader(osg::Shader::FRAGMENT,
-                                           useTextureRectangle ? shaderSourceTextureRec : shaderSourceTexture2D));
-
-        stateset->addUniform(new osg::Uniform("cutoff_color",osg::Vec4(0.1f,0.1f,0.1f,1.0f)));
-        stateset->addUniform(new osg::Uniform("movie_texture",0));
-
-        stateset->setAttribute(program);
-
-    }
 
 
@@ -576 +600 @@
     else
     {
+        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
+        osg::Vec3 pos(0.0f,0.0f,0.0f);
+
+        osg::StateSet* stateset = geode->getOrCreateStateSet();
+        stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
+
+        if (useShader)
+        {
+            //useTextureRectangle = false;
+
+            static const char *shaderSourceTextureRec = {
+                "uniform vec4 cutoff_color;\n"
+                "uniform samplerRect movie_texture;\n"
+                "void main(void)\n"
+                "{\n"
+                "    vec4 texture_color = textureRect(movie_texture, gl_TexCoord[0]); \n"
+                "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
+                "    gl_FragColor = texture_color;\n"
+                "}\n"
+            };
+
+            static const char *shaderSourceTexture2D = {
+                "uniform vec4 cutoff_color;\n"
+                "uniform sampler2D movie_texture;\n"
+                "void main(void)\n"
+                "{\n"
+                "    vec4 texture_color = texture2D(movie_texture, gl_TexCoord[0]); \n"
+                "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
+                "    gl_FragColor = texture_color;\n"
+                "}\n"
+            };
+
+            osg::Program* program = new osg::Program;
+
+            program->addShader(new osg::Shader(osg::Shader::FRAGMENT,
+                                               useTextureRectangle ? shaderSourceTextureRec : shaderSourceTexture2D));
+
+            stateset->addUniform(new osg::Uniform("cutoff_color",osg::Vec4(0.1f,0.1f,0.1f,1.0f)));
+            stateset->addUniform(new osg::Uniform("movie_texture",0));
+
+            stateset->setAttribute(program);
+
+        }
+
         for(int i=1;i<arguments.argc();++i)
         {
@@ -596 +664 @@
             }
         }
-        if (!viewer.getSceneData())
+
+        // set the scene to render
+        viewer.setSceneData(geode.get());
+
+        if (viewer.getSceneData()==0)
         {
             arguments.getApplicationUsage()->write(std::cout);
@@ -606 +678 @@
     // pass the model to the MovieEventHandler so it can pick out ImageStream's to manipulate.
     MovieEventHandler* meh = new MovieEventHandler();
-    geode->setEventCallback(meh);
     meh->set(viewer.getSceneData());
+    viewer.addEventHandler(meh);
 
     // report any errors if they have occured when parsing the program aguments.
@@ -615 +687 @@
         return 1;
     }
-    
-    if (arguments.argc()<=1)
-    {
-        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
-        return 1;
-    }
-
-
-    // set the scene to render
-    viewer.setSceneData(geode.get());
+
+
 
     // create the windows and run the threads.