Skip to content
Snippets Groups Projects
Commit f79fa94c authored by Robert Menzel's avatar Robert Menzel
Browse files

deprecation and unsupported markings for the next (ss14) version

parent 7443e3ad
No related branches found
No related tags found
No related merge requests found
Showing
with 77 additions and 1 deletion
...@@ -12,4 +12,6 @@ Included third-party software: ...@@ -12,4 +12,6 @@ Included third-party software:
See LICENSE.TXT for licensing information. See LICENSE.TXT for licensing information.
Additional documentation: http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_ANIMATIONS_ANIMATION_HH #ifndef ACGL_ANIMATIONS_ANIMATION_HH
#define ACGL_ANIMATIONS_ANIMATION_HH #define ACGL_ANIMATIONS_ANIMATION_HH
...@@ -397,3 +401,5 @@ private: ...@@ -397,3 +401,5 @@ private:
#endif // ACGL_ANIMATIONS_ANIMATION_HH #endif // ACGL_ANIMATIONS_ANIMATION_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_ANIMATIONS_EASEFUNCTIONS_HH #ifndef ACGL_ANIMATIONS_EASEFUNCTIONS_HH
#define ACGL_ANIMATIONS_EASEFUNCTIONS_HH #define ACGL_ANIMATIONS_EASEFUNCTIONS_HH
...@@ -168,3 +172,5 @@ public: ...@@ -168,3 +172,5 @@ public:
} }
#endif // ACGL_ANIMATIONS_EASEFUNCTIONS_HH #endif // ACGL_ANIMATIONS_EASEFUNCTIONS_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_ANIMATIONS_INTERPOLATOR_HH #ifndef ACGL_ANIMATIONS_INTERPOLATOR_HH
#define ACGL_ANIMATIONS_INTERPOLATOR_HH #define ACGL_ANIMATIONS_INTERPOLATOR_HH
...@@ -293,3 +297,5 @@ private: ...@@ -293,3 +297,5 @@ private:
} }
#endif // INTERPOLATOR_HH #endif // INTERPOLATOR_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what deprecated means.
#ifdef ACGL_INCLUDE_DEPRECATED
#ifndef ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH #ifndef ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
#define ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH #define ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
...@@ -186,3 +190,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(RenderObject) ...@@ -186,3 +190,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(RenderObject)
#endif #endif
#endif // ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH #endif // ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef deprecated
#ifndef ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH #ifndef ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
#define ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH #define ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
...@@ -115,3 +119,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(ShaderProgramObject) ...@@ -115,3 +119,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(ShaderProgramObject)
} // ACGL } // ACGL
#endif // ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH #endif // ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef deprecated
#ifndef ACGL_OPENGL_OBJECTS_UNIFORM_HH #ifndef ACGL_OPENGL_OBJECTS_UNIFORM_HH
#define ACGL_OPENGL_OBJECTS_UNIFORM_HH #define ACGL_OPENGL_OBJECTS_UNIFORM_HH
...@@ -220,3 +224,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(UniformTexture) ...@@ -220,3 +224,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(UniformTexture)
} // ACGL } // ACGL
#endif // ACGL_OPENGL_OBJECTS_UNIFORM_HH #endif // ACGL_OPENGL_OBJECTS_UNIFORM_HH
#endif
...@@ -94,3 +94,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(Viewport) ...@@ -94,3 +94,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(Viewport)
} // ACGL } // ACGL
#endif // ACGL_OPENGL_OBJECTS_STATE_HH #endif // ACGL_OPENGL_OBJECTS_STATE_HH
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_SCENE_NURBSCONTROLPOINT_HH #ifndef ACGL_SCENE_NURBSCONTROLPOINT_HH
#define ACGL_SCENE_NURBSCONTROLPOINT_HH #define ACGL_SCENE_NURBSCONTROLPOINT_HH
...@@ -152,3 +156,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSControlPoint<DATA_DIMENSI ...@@ -152,3 +156,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSControlPoint<DATA_DIMENSI
} // ACGL } // ACGL
#endif // ACGL_SCENE_NURBSCONTROLPOINT_HH #endif // ACGL_SCENE_NURBSCONTROLPOINT_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_SCENE_NURBSCURVE_HH #ifndef ACGL_SCENE_NURBSCURVE_HH
#define ACGL_SCENE_NURBSCURVE_HH #define ACGL_SCENE_NURBSCURVE_HH
...@@ -294,3 +298,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSCurve<DATA_DIMENSION>& _c ...@@ -294,3 +298,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSCurve<DATA_DIMENSION>& _c
} // ACGL } // ACGL
#endif // ACGL_SCENE_NURBSCURVE_HH #endif // ACGL_SCENE_NURBSCURVE_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#ifndef ACGL_SCENE_NURBSDATAVECTOR_HH #ifndef ACGL_SCENE_NURBSDATAVECTOR_HH
#define ACGL_SCENE_NURBSDATAVECTOR_HH #define ACGL_SCENE_NURBSDATAVECTOR_HH
...@@ -172,3 +176,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSDataVector<DATA_DIMENSION ...@@ -172,3 +176,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSDataVector<DATA_DIMENSION
} // ACGL } // ACGL
#endif // ACGL_SCENE_NURBSDATAVECTOR_HH #endif // ACGL_SCENE_NURBSDATAVECTOR_HH
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef ACGL_INCLUDE_UNSUPPORTED
#include <ACGL/Animations/Animation.hh> #include <ACGL/Animations/Animation.hh>
using namespace ACGL; using namespace ACGL;
...@@ -269,4 +273,4 @@ void AnimationParallel::push_animation(const SharedAnimation& _animation) ...@@ -269,4 +273,4 @@ void AnimationParallel::push_animation(const SharedAnimation& _animation)
mAnimations.push_back(_animation); mAnimations.push_back(_animation);
} }
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef deprecated
#include <ACGL/OpenGL/HiLevelObjects/RenderObject.hh> #include <ACGL/OpenGL/HiLevelObjects/RenderObject.hh>
#if (ACGL_OPENGL_VERSION >= 30) #if (ACGL_OPENGL_VERSION >= 30)
...@@ -93,3 +97,5 @@ void RenderObject::disableViewport() const ...@@ -93,3 +97,5 @@ void RenderObject::disableViewport() const
} }
#endif #endif
#endif
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
// See http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/ACGL_compile_time_settings
// for a comment what unsupported means.
#ifdef deprecated
#include <ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh> #include <ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh>
using namespace ACGL::OpenGL; using namespace ACGL::OpenGL;
...@@ -24,3 +28,5 @@ void ShaderProgramObject::updateUniforms(void) const ...@@ -24,3 +28,5 @@ void ShaderProgramObject::updateUniforms(void) const
//if(mUniformTextureAttachments[i].location != -1) // this test breaks the SWP template //if(mUniformTextureAttachments[i].location != -1) // this test breaks the SWP template
mUniformTextureAttachments[i].uniformTexture->apply(mUniformTextureAttachments[i].location, i); mUniformTextureAttachments[i].uniformTexture->apply(mUniformTextureAttachments[i].location, i);
} }
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment