Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ACGL
acgl
Commits
f79fa94c
Commit
f79fa94c
authored
Jan 28, 2014
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deprecation and unsupported markings for the next (ss14) version
parent
7443e3ad
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
77 additions
and
1 deletion
+77
-1
README.TXT
README.TXT
+2
-0
include/ACGL/Animations/Animation.hh
include/ACGL/Animations/Animation.hh
+6
-0
include/ACGL/Animations/EaseFunctions.hh
include/ACGL/Animations/EaseFunctions.hh
+6
-0
include/ACGL/Animations/Interpolator.hh
include/ACGL/Animations/Interpolator.hh
+6
-0
include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
+7
-0
include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
+7
-0
include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
+7
-0
include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
+1
-0
include/ACGL/Scene/NURBSControlPoint.hh
include/ACGL/Scene/NURBSControlPoint.hh
+6
-0
include/ACGL/Scene/NURBSCurve.hh
include/ACGL/Scene/NURBSCurve.hh
+6
-0
include/ACGL/Scene/NURBSDataVector.hh
include/ACGL/Scene/NURBSDataVector.hh
+6
-0
src/ACGL/Animations/Animation.cc
src/ACGL/Animations/Animation.cc
+5
-1
src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
+6
-0
src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
+6
-0
No files found.
README.TXT
View file @
f79fa94c
...
...
@@ -12,4 +12,6 @@ Included third-party software:
See LICENSE.TXT for licensing information.
Additional documentation: http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki
include/ACGL/Animations/Animation.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_ANIMATIONS_ANIMATION_HH
...
...
@@ -397,3 +401,5 @@ private:
#endif // ACGL_ANIMATIONS_ANIMATION_HH
#endif
include/ACGL/Animations/EaseFunctions.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_ANIMATIONS_EASEFUNCTIONS_HH
...
...
@@ -168,3 +172,5 @@ public:
}
#endif // ACGL_ANIMATIONS_EASEFUNCTIONS_HH
#endif
include/ACGL/Animations/Interpolator.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_ANIMATIONS_INTERPOLATOR_HH
...
...
@@ -293,3 +297,5 @@ private:
}
#endif // INTERPOLATOR_HH
#endif
include/ACGL/OpenGL/HiLevelObjects/RenderObject.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
...
...
@@ -186,3 +190,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(RenderObject)
#endif
#endif // ACGL_OPENGL_OBJECTS_RENDEROBJECT_HH
#endif
include/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
...
...
@@ -115,3 +119,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(ShaderProgramObject)
}
// ACGL
#endif // ACGL_OPENGL_OBJECTS_SHADERPROGRAMOBJECT_HH
#endif
include/ACGL/OpenGL/HiLevelObjects/Uniform.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_OPENGL_OBJECTS_UNIFORM_HH
...
...
@@ -220,3 +224,6 @@ ACGL_SMARTPOINTER_TYPEDEFS(UniformTexture)
}
// ACGL
#endif // ACGL_OPENGL_OBJECTS_UNIFORM_HH
#endif
include/ACGL/OpenGL/HiLevelObjects/Viewport.hh
View file @
f79fa94c
...
...
@@ -94,3 +94,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(Viewport)
}
// ACGL
#endif // ACGL_OPENGL_OBJECTS_STATE_HH
include/ACGL/Scene/NURBSControlPoint.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_SCENE_NURBSCONTROLPOINT_HH
...
...
@@ -152,3 +156,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSControlPoint<DATA_DIMENSI
}
// ACGL
#endif // ACGL_SCENE_NURBSCONTROLPOINT_HH
#endif
include/ACGL/Scene/NURBSCurve.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_SCENE_NURBSCURVE_HH
...
...
@@ -294,3 +298,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSCurve<DATA_DIMENSION>& _c
}
// ACGL
#endif // ACGL_SCENE_NURBSCURVE_HH
#endif
include/ACGL/Scene/NURBSDataVector.hh
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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
#define ACGL_SCENE_NURBSDATAVECTOR_HH
...
...
@@ -172,3 +176,5 @@ std::ostream& operator<<(std::ostream& _os, const NURBSDataVector<DATA_DIMENSION
}
// ACGL
#endif // ACGL_SCENE_NURBSDATAVECTOR_HH
#endif
src/ACGL/Animations/Animation.cc
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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>
using
namespace
ACGL
;
...
...
@@ -269,4 +273,4 @@ void AnimationParallel::push_animation(const SharedAnimation& _animation)
mAnimations
.
push_back
(
_animation
);
}
#endif
src/ACGL/OpenGL/HiLevelObjects/RenderObject.cc
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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>
#if (ACGL_OPENGL_VERSION >= 30)
...
...
@@ -93,3 +97,5 @@ void RenderObject::disableViewport() const
}
#endif
#endif
src/ACGL/OpenGL/HiLevelObjects/ShaderProgramObject.cc
View file @
f79fa94c
...
...
@@ -4,6 +4,10 @@
* 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>
using
namespace
ACGL
::
OpenGL
;
...
...
@@ -24,3 +28,5 @@ void ShaderProgramObject::updateUniforms(void) const
//if(mUniformTextureAttachments[i].location != -1) // this test breaks the SWP template
mUniformTextureAttachments
[
i
].
uniformTexture
->
apply
(
mUniformTextureAttachments
[
i
].
location
,
i
);
}
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment