Added support for reading --rh resource.vsgt and passing ResourceHints to viewer.compile(..)

Author: robertosfield

examples/app/vsgcameras/vsgcameras.cpp

@@ -104,6 +104,15 @@ int main(int argc, char** argv)
     // set up defaults and read command line arguments to override them
     vsg::CommandLine arguments(&argc, argv);
 
+
+    auto options = vsg::Options::create();
+    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
+    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
+#ifdef vsgXchange_all
+    // add vsgXchange's support for reading and writing 3rd party file formats
+    options->add(vsgXchange::all::create());
+#endif
+
     auto windowTraits = vsg::WindowTraits::create();
     windowTraits->windowTitle = "vsgcameras - Multiple Views with different ways of configuring/tracking Cameras";
     windowTraits->debugLayer = arguments.read({"--debug", "-d"});
@@ -146,15 +155,13 @@ int main(int argc, char** argv)
         reportAverageFrameRate = true;
     }
 
-    if (arguments.errors()) return arguments.writeErrorMessages(std::cerr);
+    vsg::ref_ptr<vsg::ResourceHints> resourceHints;
+    if (auto resourceHintsFilename = arguments.value<vsg::Path>("", "--rh"))
+    {
+        resourceHints = vsg::read_cast<vsg::ResourceHints>(resourceHintsFilename, options);
+    }
 
-    auto options = vsg::Options::create();
-    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
-    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
-#ifdef vsgXchange_all
-    // add vsgXchange's support for reading and writing 3rd party file formats
-    options->add(vsgXchange::all::create());
-#endif
+    if (arguments.errors()) return arguments.writeErrorMessages(std::cerr);
 
     vsg::Path filename = (argc > 1) ? arguments[1] : vsg::Path("models/lz.vsgt");
     auto scenegraph = vsg::read_cast<vsg::Node>(filename, options);
@@ -307,7 +314,7 @@ int main(int argc, char** argv)
 
     if (instrumentation) viewer->assignInstrumentation(instrumentation);
 
-    viewer->compile();
+    viewer->compile(resourceHints);
 
     // rendering main loop
     while (viewer->advanceToNextFrame())

examples/app/vsgmultiviews/vsgmultiviews.cpp

@@ -77,6 +77,14 @@ int main(int argc, char** argv)
     // set up defaults and read command line arguments to override them
     vsg::CommandLine arguments(&argc, argv);
 
+    auto options = vsg::Options::create();
+    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
+    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
+#ifdef vsgXchange_all
+    // add vsgXchange's support for reading and writing 3rd party file formats
+    options->add(vsgXchange::all::create());
+#endif
+
     auto windowTraits = vsg::WindowTraits::create();
     windowTraits->windowTitle = "Multiple Views";
     windowTraits->debugLayer = arguments.read({"--debug", "-d"});
@@ -119,15 +127,13 @@ int main(int argc, char** argv)
         reportAverageFrameRate = true;
     }
 
-    if (arguments.errors()) return arguments.writeErrorMessages(std::cerr);
+    vsg::ref_ptr<vsg::ResourceHints> resourceHints;
+    if (auto resourceHintsFilename = arguments.value<vsg::Path>("", "--rh"))
+    {
+        resourceHints = vsg::read_cast<vsg::ResourceHints>(resourceHintsFilename, options);
+    }
 
-    auto options = vsg::Options::create();
-    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
-    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
-#ifdef vsgXchange_all
-    // add vsgXchange's support for reading and writing 3rd party file formats
-    options->add(vsgXchange::all::create());
-#endif
+    if (arguments.errors()) return arguments.writeErrorMessages(std::cerr);
 
     vsg::ref_ptr<vsg::Node> scenegraph;
     vsg::ref_ptr<vsg::Node> scenegraph2;
@@ -214,7 +220,7 @@ int main(int argc, char** argv)
 
     if (instrumentation) viewer->assignInstrumentation(instrumentation);
 
-    viewer->compile();
+    viewer->compile(resourceHints);
 
     // rendering main loop
     while (viewer->advanceToNextFrame())

examples/app/vsgwindows/vsgwindows.cpp

@@ -33,6 +33,15 @@ int main(int argc, char** argv)
     // set up defaults and read command line arguments to override them
     vsg::CommandLine arguments(&argc, argv);
 
+    auto options = vsg::Options::create();
+    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
+    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
+#ifdef vsgXchange_all
+    // add vsgXchange's support for reading and writing 3rd party file formats
+    options->add(vsgXchange::all::create());
+#endif
+
+    options->readOptions(arguments);
     auto windowTraits = vsg::WindowTraits::create();
     windowTraits->windowTitle = "Multiple Windows - first window";
     windowTraits->debugLayer = arguments.read({"--debug", "-d"});
@@ -85,20 +94,17 @@ int main(int argc, char** argv)
         reportAverageFrameRate = true;
     }
 
+    vsg::ref_ptr<vsg::ResourceHints> resourceHints;
+    if (auto resourceHintsFilename = arguments.value<vsg::Path>("", "--rh"))
+    {
+        resourceHints = vsg::read_cast<vsg::ResourceHints>(resourceHintsFilename, options);
+    }
+
     if (arguments.errors()) return arguments.writeErrorMessages(std::cerr);
 
     bool separateDevices = arguments.read({"--no-shared-window", "-n"});
     bool multiThreading = arguments.read("--mt");
 
-    auto options = vsg::Options::create();
-    options->fileCache = vsg::getEnv("VSG_FILE_CACHE");
-    options->paths = vsg::getEnvPaths("VSG_FILE_PATH");
-#ifdef vsgXchange_all
-    // add vsgXchange's support for reading and writing 3rd party file formats
-    options->add(vsgXchange::all::create());
-#endif
-
-    options->readOptions(arguments);
 
     if (separateDevices && VSG_MAX_DEVICES < 2)
     {
@@ -200,7 +206,7 @@ int main(int argc, char** argv)
 
     if (instrumentation) viewer->assignInstrumentation(instrumentation);
 
-    viewer->compile();
+    viewer->compile(resourceHints);
 
     // rendering main loop
     while (viewer->advanceToNextFrame())