VertexArrayObjectControlFile can load arbitrary meshes but will get marked deprecated soon

include/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.hh

@@ -22,16 +22,16 @@ namespace OpenGL{
 
 class GeometryDataControlFileATB;
 
-class GeometryDataControlFileOBJ : public ACGL::OpenGL::GeometryDataControlFile
+class GeometryDataControlFileMesh : public ACGL::OpenGL::GeometryDataControlFile
 {
     friend void initStaticFileTypes(void);
     friend class GeometryDataControlFileATB;
 public:
-    GeometryDataControlFileOBJ(const std::string& _filename) : GeometryDataControlFile(_filename,Base::Settings::the()->getFullGeometryPath()) {}
-    virtual ~GeometryDataControlFileOBJ(void) {}
+    GeometryDataControlFileMesh(const std::string& _filename) : GeometryDataControlFile(_filename,Base::Settings::the()->getFullGeometryPath()) {}
+    virtual ~GeometryDataControlFileMesh(void) {}
 
     // the entry point that gets registered in registerType()
-    static SharedGeometryDataControlFile creator(const std::string& _filename) { return SharedGeometryDataControlFile(new GeometryDataControlFileOBJ(_filename)); }
+    static SharedGeometryDataControlFile creator(const std::string& _filename) { return SharedGeometryDataControlFile(new GeometryDataControlFileMesh(_filename)); }
 private:
     virtual bool load(SharedGeometryData& geometry) const;
 
@@ -39,13 +39,14 @@ private:
     // register the file extension 'obj' for this loader
     static ACGL::int_t registerType(void)
     {
-        sTypeID = GeometryDataControlFileFactory::the()->registerType("obj", &GeometryDataControlFileOBJ::creator);
+        sTypeID = GeometryDataControlFileFactory::the()->registerType("obj", &GeometryDataControlFileMesh::creator);
+        sTypeID = GeometryDataControlFileFactory::the()->registerType("vap", &GeometryDataControlFileMesh::creator);
         return sTypeID;
     }
 };
 
 
-ACGL_SMARTPOINTER_TYPEDEFS(GeometryDataControlFileOBJ)
+ACGL_SMARTPOINTER_TYPEDEFS(GeometryDataControlFileMesh)
 
 } // OpenGL
 } // ACGL

src/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.cc

@@ -21,9 +21,9 @@ using namespace ACGL::OpenGL;
 using namespace ACGL::Utils;
 using namespace ACGL::Base;
 
-bool GeometryDataControlFileOBJ::load(SharedGeometryData& geometry) const
+bool GeometryDataControlFileMesh::load(SharedGeometryData& geometry) const
 {
-    geometry = loadGeometryDataFromOBJ(getFullFilePath());
+    geometry = loadGeometryData(getFullFilePath());
     if (geometry)
         return true;
     else

src/ACGL/OpenGL/InitStaticFileTypes.cc

@@ -30,7 +30,7 @@ void ACGL::OpenGL::initStaticFileTypes(void)
     //
     // Geometry, Meshes, Vertex data
     //
-    GeometryDataControlFileOBJ::registerType();
+    GeometryDataControlFileMesh::registerType();
     GeometryDataControlFileATB::registerType();
 }