Changeset 7

Timestamp:

10/04/07 16:38:15

Author:

robert

Message:

Added support for reading from configuration file without automatic view
configuration.

Files:

• trunk/Makefile (modified) (6 diffs)
• trunk/src/present3D.cpp (modified) (5 diffs)

trunk/Makefile

@@ -1 +1 @@
-# CMAKE generated file: DO NOT EDIT!
-5
+4
-
-# Default target executed when no arguments are given to make.
@@ -26 +26 @@
-
-# The CMake executable.
-local/
+
-
-# The command to remove a file.
-local/
+
-
-# The program to use to edit the cache.
-local/
+
-
-# The top-level source directory on which CMake was run.
@@ -49 +49 @@
-edit_cache:
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-local/
+
-
-# Special rule for the target edit_cache
@@ -57 +57 @@
-install: preinstall
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-local/
+
-
-# Special rule for the target install
-install/fast: preinstall/fast
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-local/
+
-
-# Special rule for the target install/local
-install/local: preinstall
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-local/
+
-
-# Special rule for the target install/local
-install/local/fast: install/local
-
-# Special rule for the target install/strip
-install/strip: preinstall
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-        /usr/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-
-# Special rule for the target list_install_components
@@ -90 +82 @@
-rebuild_cache:
-        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-local/
+
-
-# Special rule for the target rebuild_cache
@@ -151 +143 @@
-        @echo "... install"
-        @echo "... install/local"
-        @echo "... install/strip"
-        @echo "... list_install_components"
-        @echo "... rebuild_cache"

trunk/src/present3D.cpp

@@ -56 +56 @@
-void setViewer(osgViewer::Viewer& viewer, float width, float height, float distance)
-{
-    unsigned int numCameras = viewer.getNumSlaves();
-    if (numCameras==2)
-    {
-        // hardwire dual screen horizontal split screen up.
-    
-        osg::DisplaySettings* ds = osg::DisplaySettings::instance();
-        if (ds->getStereoMode()==osg::DisplaySettings::HORIZONTAL_SPLIT && ds->getStereo())
-        {
-            osg::Matrix identity;
-        
-            osg::ref_ptr<osg::DisplaySettings> ds_left = new osg::DisplaySettings(*ds);
-            ds_left->setStereoMode(osg::DisplaySettings::LEFT_EYE);
-            
-            osg::ref_ptr<osg::DisplaySettings> ds_right = new osg::DisplaySettings(*ds);
-            ds_right->setStereoMode(osg::DisplaySettings::RIGHT_EYE);
-            
-            unsigned int leftCameraNum = (ds->getSplitStereoHorizontalEyeMapping()==osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT) ? 0 : 1;
-            unsigned int rightCameraNum = (ds->getSplitStereoHorizontalEyeMapping()==osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT) ? 1 : 0;
-
-            viewer.getSlave(leftCameraNum)._projectionOffset.makeIdentity();
-            viewer.getSlave(leftCameraNum)._viewOffset.makeIdentity();
-            // left to do.
-            //osgUtil::SceneView* sv_left = viewer.getSceneHandlerList()[leftCameraNum]->getSceneView();
-            //sv_left->setDisplaySettings(ds_left);
-                
-            viewer.getSlave(rightCameraNum)._projectionOffset.makeIdentity();
-            viewer.getSlave(rightCameraNum)._viewOffset.makeIdentity();
-            // left to do.
-            //osgUtil::SceneView* sv_right = viewer.getSceneHandlerList()[rightCameraNum]->getSceneView();
-            //sv_right->setDisplaySettings(ds_right);                
-        }
-    }
-
-    double vfov = osg::RadiansToDegrees(atan2(height/2.0f,distance)*2.0);
-    double hfov = osg::RadiansToDegrees(atan2(width/2.0f,distance)*2.0);
@@ -95 +62 @@
-    viewer.getCamera()->setCullMask(0xffffffff);
-    viewer.getCamera()->setCullMaskLeft(0x00000001);
-
-
+
-}
-
@@ -231 +197 @@
-#endif    
-    
+    bool doSetViewer = true;
+    std::string configurationFile;
+
+    // check env vars for configuration file
+    const char* str = getenv("PRESENT3D_CONFIG_FILE");
+    if (!str) str = getenv("OSG_CONFIG_FILE");
+    if (str) configurationFile = str;
+
+    // check command line parameters for configuration file.
+    while (arguments.read("-c",configurationFile)) {}
+
-    // construct the viewer.
-    osgViewer::Viewer viewer(arguments);
+    
+    if (!configurationFile.empty())
+    {
+        viewer.readConfiguration(configurationFile);
+        doSetViewer = false;
+    }
+    
-
-    // set up the camera manipulators.
@@ -274 +258 @@
-
-
-    bool doSetViewer = true;
-    while (arguments.read("--set-viewer")) { doSetViewer = true; }
-    
@@ -375 +358 @@
-    ApplicationType applicationType = VIEWER;
-
-char* 
+
-    if (str)
-    {