Changeset 7492

Timestamp:

09/27/07 12:22:09

Author:

robert

Message:

Added support for selecting internal texture format via the internalFormat <numbits> entry in the .osg file

Files:

• OpenSceneGraph/trunk/src/osgPlugins/osgViewer/View.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/osgViewer/View.cpp

@@ -104 +104 @@
-        fr.matchSequence("setUpViewForPanoramicSphericalDisplay {"))
-    {
-
-
-
+
+
+
+
-        std::string filename;
-        osg::ref_ptr<osg::Image> intensityMap;
@@ -121 +122 @@
-            if (fr.read("intensityFile",filename)) local_itrAdvanced = true;
-            if (fr.matchSequence("intensityMap {")) intensityMap = readIntensityImage(fr,local_itrAdvanced);
+            if (fr.read("intensityFormat",intensityFormat)) local_itrAdvanced = true;
-            
-            if (!local_itrAdvanced) ++fr;
@@ -134 +136 @@
-            intensityMap = osgDB::readImageFile(filename);
-        }
+
+        if (intensityMap.valid())
+        {
+            if (intensityFormat==16) intensityMap->setInternalTextureFormat(GL_LUMINANCE16F_ARB);
+            else if (intensityFormat==32) intensityMap->setInternalTextureFormat(GL_LUMINANCE32F_ARB);
+            // else intensityMap->setInternalTextureFormat(image->getPixelFormat());
+        }
+
-
-        if (matchedFirst) view.setUpViewFor3DSphericalDisplay(radius, collar, screenNum, intensityMap.get());