diff --git a/src/modules/graphic/osggraph/Loader/ReaderWriterACC.cpp b/src/modules/graphic/osggraph/Loader/ReaderWriterACC.cpp index 469048b37..04bfed939 100644 --- a/src/modules/graphic/osggraph/Loader/ReaderWriterACC.cpp +++ b/src/modules/graphic/osggraph/Loader/ReaderWriterACC.cpp @@ -328,7 +328,18 @@ osg::Node* ReaderWriterACC::readObject(std::istream& stream, FileData& fileData, } else if (token == "shad") { - + } + else if (token == "subdiv") + { + } + else if (token == "folded") + { + } + else if (token == "hidden") + { + } + else if (token == "locked") + { } else if (token == "texrep") { diff --git a/src/modules/graphic/ssggraph/grloadac.cpp b/src/modules/graphic/ssggraph/grloadac.cpp index ea60f3fc9..be7313fe2 100644 --- a/src/modules/graphic/ssggraph/grloadac.cpp +++ b/src/modules/graphic/ssggraph/grloadac.cpp @@ -381,6 +381,10 @@ static Tag object_tags [] = { "kids" , do_kids }, { "crease" , do_ignore }, { "shader" , do_ignore }, + { "folded" , do_ignore }, + { "subdiv" , do_ignore }, + { "hidden" , do_ignore }, + { "locked" , do_ignore }, { 0, 0 } } ; diff --git a/src/tools/accc/ac3dload.cpp b/src/tools/accc/ac3dload.cpp index ec5de2650..a06b3fe42 100644 --- a/src/tools/accc/ac3dload.cpp +++ b/src/tools/accc/ac3dload.cpp @@ -61,6 +61,9 @@ #define REFS "refs" #define CREASE "crease" #define SUBDIV "subdiv" +#define FOLDED "folded" +#define HIDDEN "hidden" +#define LOCKED "locked" ob_t::ob_t() : kids(0), @@ -254,6 +257,9 @@ int doMat(char *Line, std::list &objects, std::vector &materials); int doRefs(char *Line, std::list &objects, std::vector &materials); int doCrease(char *Line, std::list &objects, std::vector &materials); int doSubdiv(char *Line, std::list &objects, std::vector &materials); +int doFolded(char *Line, std::list &objects, std::vector &materials); +int doHidden(char *Line, std::list &objects, std::vector &materials); +int doLocked(char *Line, std::list &objects, std::vector &materials); void computeSaveAC3D(const std::string & OutputFilename, std::list &objects, const std::vector &materials); void computeSaveOBJ(const std::string & OutputFilename, std::list &objects, const std::vector &materials); @@ -277,7 +283,10 @@ verbaction_t verbTab[] = { MAT, doMat }, { REFS, doRefs }, { CREASE, doCrease }, -{ SUBDIV, doSubdiv, }, +{ SUBDIV, doSubdiv }, +{ FOLDED, doFolded }, +{ HIDDEN, doHidden }, +{ LOCKED, doLocked }, { "END", NULL } }; /** Copies a single surface from the "vertexarray" attributes of srcob to the ones of destob. @@ -1103,6 +1112,24 @@ int doSubdiv(char *Line, std::list &objects, std::vector &materials return (0); } +int doFolded(char *Line, std::list &objects, std::vector &materials) +{ + dataFound = false; + return (0); +} + +int doHidden(char *Line, std::list &objects, std::vector &materials) +{ + dataFound = false; + return (0); +} + +int doLocked(char *Line, std::list &objects, std::vector &materials) +{ + dataFound = false; + return (0); +} + int doTexture(char *Line, std::list &objects, std::vector &materials) { char name[256] = { 0 };