Revert main.

Author: kwokcb

source/MaterialXGraphEditor/Main.cpp

@@ -18,40 +18,40 @@
 namespace
 {
 
-    static void errorCallback(int error, const char* description)
+static void errorCallback(int error, const char* description)
+{
+    fprintf(stderr, "Glfw Error %d: %s\n", error, description);
+}
+
+const std::string options =
+    " Options: \n"
+    "    --material [FILENAME]          Specify the filename of the MTLX document to be displayed in the graph editor\n"
+    "    --mesh [FILENAME]              Specify the filename of the OBJ or glTF mesh to be displayed in the graph editor\n"
+    "    --path [FILEPATH]              Specify an additional data search path location (e.g. '/projects/MaterialX').  This absolute path will be queried when locating data libraries, XInclude references, and referenced images.\n"
+    "    --library [FILEPATH]           Specify an additional data library folder (e.g. 'vendorlib', 'studiolib').  This relative path will be appended to each location in the data search path when loading data libraries.\n"
+    "    --uiScale [FACTOR]             Manually specify a UI scaling factor\n"
+    "    --font [FILENAME]              Specify the name of the custom font file to use.  If not specified the default font will be used.\n"
+    "    --fontSize [SIZE]              Specify font size to use for the custom font.  If not specified a default of 18 will be used.\n"
+    "    --captureFilename [FILENAME]   Specify the filename to which the first rendered frame should be written\n"
+    "    --help                         Display the complete list of command-line options\n";
+
+template <class T> void parseToken(std::string token, std::string type, T& res)
+{
+    if (token.empty())
     {
-        fprintf(stderr, "Glfw Error %d: %s\n", error, description);
+        return;
     }
 
-    const std::string options =
-        " Options: \n"
-        "    --material [FILENAME]          Specify the filename of the MTLX document to be displayed in the graph editor\n"
-        "    --mesh [FILENAME]              Specify the filename of the OBJ or glTF mesh to be displayed in the graph editor\n"
-        "    --path [FILEPATH]              Specify an additional data search path location (e.g. '/projects/MaterialX').  This absolute path will be queried when locating data libraries, XInclude references, and referenced images.\n"
-        "    --library [FILEPATH]           Specify an additional data library folder (e.g. 'vendorlib', 'studiolib').  This relative path will be appended to each location in the data search path when loading data libraries.\n"
-        "    --uiScale [FACTOR]             Manually specify a UI scaling factor\n"
-        "    --font [FILENAME]              Specify the name of the custom font file to use.  If not specified the default font will be used.\n"
-        "    --fontSize [SIZE]              Specify font size to use for the custom font.  If not specified a default of 18 will be used.\n"
-        "    --captureFilename [FILENAME]   Specify the filename to which the first rendered frame should be written\n"
-        "    --help                         Display the complete list of command-line options\n";
-
-    template <class T> void parseToken(std::string token, std::string type, T& res)
+    mx::ValuePtr value = mx::Value::createValueFromStrings(token, type);
+    if (!value)
     {
-        if (token.empty())
-        {
-            return;
-        }
-
-        mx::ValuePtr value = mx::Value::createValueFromStrings(token, type);
-        if (!value)
-        {
-            std::cout << "Unable to parse token " << token << " as type " << type << std::endl;
-            return;
-        }
-
-        res = value->asA<T>();
+        std::cout << "Unable to parse token " << token << " as type " << type << std::endl;
+        return;
     }
 
+    res = value->asA<T>();
+}
+
 } // anonymous namespace
 
 int main(int argc, char* const argv[])
@@ -203,11 +203,11 @@ int main(int argc, char* const argv[])
 
     // Create graph editor.
     Graph* graph = new Graph(materialFilename,
-        meshFilename,
-        searchPath,
-        libraryFolders,
-        viewWidth,
-        viewHeight);
+                             meshFilename,
+                             searchPath,
+                             libraryFolders,
+                             viewWidth,
+                             viewHeight);
     if (!captureFilename.empty())
     {
         graph->getRenderer()->requestFrameCapture(captureFilename);
@@ -262,7 +262,7 @@ int main(int argc, char* const argv[])
         double xpos = 0.0;
         double ypos = 0.0;
         glfwGetCursorPos(window, &xpos, &ypos);
-        graph->drawGraph(ImVec2((float)xpos, (float)ypos));
+        graph->drawGraph(ImVec2((float) xpos, (float) ypos));
         ImGui::Render();
         ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
         glfwSwapBuffers(window);