Changeset 6927 for OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

Timestamp:

06/10/07 11:51:29 (6 years ago)

Author:

robert

Message:

Improved the set up of static build, added freetype plugin to plugins that support static usage

Files:

• OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp

@@ -223 +223 @@
 
 
-#if 0
-
-    ModelHandler* modelHandler = new ModelHandler;
-    for(int i=1; i<arguments.argc();++i)
-    {
-        modelHandler->add(arguments[i]);
-    }
-    
-    viewer.addEventHandler(modelHandler);
-
-#else
-
-    // load the scene.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
-
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg");
-
-    if (!loadedModel) 
-    {
-        std::cout << argv[0] <<": No data loaded." << std::endl;
-        return 1;
-    }
-
-    viewer.setSceneData(loadedModel.get());
-#endif
-
+    if (arguments.read("-m"))
+    {
+        ModelHandler* modelHandler = new ModelHandler;
+        for(int i=1; i<arguments.argc();++i)
+        {
+            modelHandler->add(arguments[i]);
+        }
+
+        viewer.addEventHandler(modelHandler);
+    }
+    else
+    {
+        // load the scene.
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+
+        if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg");
+
+        if (!loadedModel) 
+        {
+            std::cout << argv[0] <<": No data loaded." << std::endl;
+            return 1;
+        }
+
+        viewer.setSceneData(loadedModel.get());
+    }
+    
     viewer.realize();