Commit c70e1f03 authored by Robert Menzel's avatar Robert Menzel

more classes marked as deprecated

parent 21448366
......@@ -8,7 +8,7 @@
#define ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROL_HH
/* *************** DEPRECATED ********************* */
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
......@@ -97,5 +97,5 @@ protected:
} // OpenGL
} // ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROL_HH
......@@ -6,7 +6,7 @@
#ifndef ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROLFILE_HH
#define ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROLFILE_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
#include <ACGL/OpenGL/Objects/ArrayBuffer.hh>
......@@ -69,5 +69,5 @@ protected:
} // OpenGL
} // ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROLFILE_HH
......@@ -12,7 +12,7 @@
#include <ACGL/Resource/BasicCreateController.hh>
#include <ACGL/OpenGL/Objects/ElementArrayBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
namespace ACGL{
namespace OpenGL{
......@@ -73,5 +73,5 @@ protected:
} // OpenGL
} // ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_ELEMENTARRAYBUFFERCONTROL_HH
......@@ -6,7 +6,7 @@
#ifndef ACGL_OPENGL_CONTROLLER_GEOMETRYDATACONTROLFILEATB_HH
#define ACGL_OPENGL_CONTROLLER_GEOMETRYDATACONTROLFILEATB_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
/**
* A minimal ATB loader.
*
......@@ -67,5 +67,5 @@ ACGL_SMARTPOINTER_TYPEDEFS(GeometryDataControlFileATB)
} // OpenGL
} // ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_GEOMETRYDATACONTROLFILEATB_HH
......@@ -6,7 +6,7 @@
#ifndef ACGL_OPENGL_CONTROLLER_SHADERPROGRAMOBJECTCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_SHADERPROGRAMOBJECTCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
......@@ -92,5 +92,5 @@ protected:
} // OpenGL
} // ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_SHADERPROGRAMOBJECTCONTROL_HH
......@@ -6,7 +6,7 @@
#ifndef ACGL_OPENGL_CONTROLLER_VERTEXARRAYOBJECTCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_VERTEXARRAYOBJECTCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
......@@ -84,5 +84,5 @@ protected:
} // ACGL
#endif // #ifdef ACGL_SUPPORT_VAO
#endif
#endif // ACGL_OPENGL_CONTROLLER_VERTEXARRAYOBJECTCONTROL_HH
......@@ -14,7 +14,9 @@
namespace ACGL{
namespace OpenGL{
//! loads an array buffer from the given file
//! Loads an array buffer from the given file (e.g. a *.opj file).
//! Often not an ArrayBuffer but a complete VAO is needed, in that case,
//! see VertexArrayObjectLoadStore.hh !
SharedArrayBuffer loadArrayBuffer(const std::string& _filename);
}
......
......@@ -62,6 +62,7 @@ bool init(void)
// gets runtime limits to be used internally:
OpenGL::initRuntimeDependentLimits();
//
// Register file types for loading. This has to be done if the library is
// linked statically, because otherwise, the static registration of the
......@@ -69,6 +70,7 @@ bool init(void)
//
OpenGL::initStaticFileTypes();
return true;
}
......
......@@ -5,7 +5,7 @@
**********************************************************************/
/* *************** DEPRECATED ********************* */
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/OpenGL/Controller/ArrayBufferControl.hh>
using namespace ACGL::OpenGL;
......@@ -38,3 +38,4 @@ SharedArrayBuffer ArrayBufferControl::create(void)
}
return arrayBuffer;
}
#endif
......@@ -9,7 +9,7 @@
using namespace ACGL;
using namespace ACGL::OpenGL;
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
ArrayBufferControlFile::ArrayBufferControlFile(const std::string& _filename)
: Resource::FileController<ArrayBuffer>(_filename, Base::Settings::the()->getFullGeometryPath()),
mDataController(GeometryDataControlFileFactory::the()->create(_filename))
......@@ -75,3 +75,4 @@ bool ArrayBufferControlFile::update(SharedArrayBuffer& _ab)
updateFileModificationTime();
return true;
}
#endif
......@@ -9,7 +9,7 @@
#include <sstream>
#include <cstring>
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
using namespace ACGL;
using namespace ACGL::OpenGL;
using namespace ACGL::Utils;
......@@ -171,3 +171,4 @@ bool GeometryDataControlFileATB::load(SharedGeometryData& _geometry) const
error() << "Failed to open file: " << getFullFilePath() << std::endl;
return false;
}
#endif
......@@ -29,3 +29,4 @@ bool GeometryDataControlFileMesh::load(SharedGeometryData& geometry) const
else
return false;
}
......@@ -5,7 +5,7 @@
**********************************************************************/
#include <ACGL/OpenGL/Controller/ShaderProgramObjectControl.hh>
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
using namespace ACGL::OpenGL;
SharedShaderProgramObject ShaderProgramObjectControl::create(void)
......@@ -20,3 +20,4 @@ SharedShaderProgramObject ShaderProgramObjectControl::create(void)
return shaderProgramObject;
}
#endif
......@@ -15,9 +15,10 @@
using namespace ACGL::OpenGL;
void ACGL::OpenGL::initStaticFileTypes(void)
{
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
//
// Textures
//
......@@ -26,11 +27,10 @@ void ACGL::OpenGL::initStaticFileTypes(void)
TextureDataControlFilePNG::registerType();
#endif
TextureDataControlFilePNM::registerType();
#endif
//
// Geometry, Meshes, Vertex data
//
GeometryDataControlFileMesh::registerType();
GeometryDataControlFileATB::registerType();
#endif
GeometryDataControlFileMesh::registerType();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment