From 6a82bb28fcc32673b40e1eb217fb35a3fb842fac Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 29 Aug 2004 15:09:26 +0000
Subject: [PATCH] Added handling of $ comment line, and 'g' empty group name

---
 src/osgPlugins/obj/obj.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/obj/obj.cpp b/src/osgPlugins/obj/obj.cpp
index 4f198cc1f..f55cda888 100644
--- a/src/osgPlugins/obj/obj.cpp
+++ b/src/osgPlugins/obj/obj.cpp
@@ -104,7 +104,7 @@ bool Model::readMTL(std::istream& fin)
     while (fin)
     {
         readline(fin,line,LINE_SIZE);
-        if (line[0]=='#')
+        if (line[0]=='#' || line[0]=='$')
         {
             // comment line
             // osg::notify(osg::NOTICE) <<"Comment: "<<line<<std::endl;
@@ -264,7 +264,7 @@ bool Model::readOBJ(std::istream& fin)
     while (fin)
     {
         readline(fin,line,LINE_SIZE);
-        if (line[0]=='#')
+        if (line[0]=='#' || line[0]=='$')
         {
             // comment line
             // osg::notify(osg::NOTICE) <<"Comment: "<<line<<std::endl;
@@ -397,6 +397,15 @@ bool Model::readOBJ(std::istream& fin)
                     currentElementList = 0; // reset the element list to force a recompute of which ElementList to use
                 }
             }
+            else if (strcmp(line,"o")==0)
+            {
+                std::string objectName(""); // empty name
+                if (currentElementState.objectName != objectName)
+                {
+                    currentElementState.objectName = objectName;
+                    currentElementList = 0; // reset the element list to force a recompute of which ElementList to use
+                }
+            }
             else if (strncmp(line,"g ",2)==0)
             {
                 std::string groupName(line+2);
@@ -406,6 +415,15 @@ bool Model::readOBJ(std::istream& fin)
                     currentElementList = 0; // reset the element list to force a recompute of which ElementList to use
                 }
             }
+            else if (strcmp(line,"g")==0)
+            {
+                std::string groupName(""); // empty name
+                if (currentElementState.groupName != groupName)
+                {
+                    currentElementState.groupName = groupName;
+                    currentElementList = 0; // reset the element list to force a recompute of which ElementList to use
+                }
+            }
             else if (strncmp(line,"s ",2)==0)
             {
                 int smoothingGroup=0;