Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ACGL
acgl
Commits
7415723c
Commit
7415723c
authored
Feb 17, 2013
by
Robert Menzel
Browse files
added more guards for deprecated controllers
parent
033d6150
Changes
7
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Controller/LocationMappingsControl.hh
View file @
7415723c
...
...
@@ -7,6 +7,8 @@
#ifndef ACGL_OPENGL_CONTROLLER_LOCATIONMAPPINGSCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_LOCATIONMAPPINGSCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
...
...
@@ -50,4 +52,6 @@ protected:
}
// OpenGL
}
// ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_RENDERBUFFERCONTROL_HH
include/ACGL/OpenGL/Controller/RenderBufferControl.hh
View file @
7415723c
...
...
@@ -7,6 +7,8 @@
#ifndef ACGL_OPENGL_CONTROLLER_RENDERBUFFERCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_RENDERBUFFERCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
...
...
@@ -63,4 +65,6 @@ protected:
}
// OpenGL
}
// ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_RENDERBUFFERCONTROL_HH
include/ACGL/OpenGL/Controller/RenderObjectControl.hh
View file @
7415723c
...
...
@@ -7,6 +7,8 @@
#ifndef ACGL_OPENGL_CONTROLLER_RENDEROBJECTCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_RENDEROBJECTCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/OpenGL/GL.hh>
#if (ACGL_OPENGL_VERSION >= 30)
...
...
@@ -67,4 +69,6 @@ protected:
#endif // GL >= 3.0
#endif
#endif // ACGL_OPENGL_CONTROLLER_TEXTURECONTROL_HH
include/ACGL/OpenGL/Controller/UniformControl.hh
View file @
7415723c
...
...
@@ -7,6 +7,8 @@
#ifndef ACGL_OPENGL_CONTROLLER_UNIFORMCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_UNIFORMCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
...
...
@@ -72,4 +74,6 @@ typedef UniformControl<UniformTexture> UniformTextureControl;
}
// OpenGL
}
// ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_ARRAYBUFFERCONTROL_HH
include/ACGL/OpenGL/Controller/ViewportControl.hh
View file @
7415723c
...
...
@@ -7,6 +7,8 @@
#ifndef ACGL_OPENGL_CONTROLLER_VIEWPORTCONTROL_HH
#define ACGL_OPENGL_CONTROLLER_VIEWPORTCONTROL_HH
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicCreateController.hh>
...
...
@@ -70,4 +72,6 @@ protected:
}
// OpenGL
}
// ACGL
#endif
#endif // ACGL_OPENGL_CONTROLLER_TEXTURECONTROL_HH
src/ACGL/OpenGL/Controller/FrameBufferObjectControl.cc
View file @
7415723c
...
...
@@ -3,7 +3,7 @@
* All rights reserved. *
* Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/OpenGL/Controller/FrameBufferObjectControl.hh>
using
namespace
ACGL
::
OpenGL
;
...
...
@@ -40,3 +40,4 @@ SharedFrameBufferObject FrameBufferObjectControl::create(void)
return
fbo
;
}
#endif
src/ACGL/OpenGL/Controller/RenderObjectControl.cc
View file @
7415723c
...
...
@@ -3,7 +3,7 @@
* All rights reserved. *
* Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/
#ifdef ACGL_INCLUDE_DEPRECATED_FUNCTIONALITY
#include <ACGL/OpenGL/Controller/RenderObjectControl.hh>
#if (ACGL_OPENGL_VERSION >= 30)
...
...
@@ -21,3 +21,4 @@ SharedRenderObject RenderObjectControl::create()
}
#endif
#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