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
ed97990b
Commit
ed97990b
authored
Aug 10, 2011
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrected include guards, added comments
parent
b77d4d33
Changes
41
Hide whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
247 additions
and
128 deletions
+247
-128
include/ACGL/ACGL.hh
include/ACGL/ACGL.hh
+11
-3
include/ACGL/Base/CompileTimeSettings.hh
include/ACGL/Base/CompileTimeSettings.hh
+4
-4
include/ACGL/Base/FileHelpers.hh
include/ACGL/Base/FileHelpers.hh
+2
-2
include/ACGL/Base/FileOperations.hh
include/ACGL/Base/FileOperations.hh
+3
-3
include/ACGL/Base/Settings.hh
include/ACGL/Base/Settings.hh
+5
-0
include/ACGL/Base/Singleton.hh
include/ACGL/Base/Singleton.hh
+7
-2
include/ACGL/Base/StringOperations.hh
include/ACGL/Base/StringOperations.hh
+8
-3
include/ACGL/Math/Constants.hh
include/ACGL/Math/Constants.hh
+12
-6
include/ACGL/Math/Functions.hh
include/ACGL/Math/Functions.hh
+11
-1
include/ACGL/Math/Math.hh
include/ACGL/Math/Math.hh
+4
-1
include/ACGL/OpenGL/Controller.hh
include/ACGL/OpenGL/Controller.hh
+8
-3
include/ACGL/OpenGL/Controller/ArrayBufferControl.hh
include/ACGL/OpenGL/Controller/ArrayBufferControl.hh
+3
-3
include/ACGL/OpenGL/Controller/ElementArrayBufferControl.hh
include/ACGL/OpenGL/Controller/ElementArrayBufferControl.hh
+3
-3
include/ACGL/OpenGL/Controller/FrameBufferControl.hh
include/ACGL/OpenGL/Controller/FrameBufferControl.hh
+3
-3
include/ACGL/OpenGL/Controller/RenderBufferControl.hh
include/ACGL/OpenGL/Controller/RenderBufferControl.hh
+3
-3
include/ACGL/OpenGL/Controller/ShaderControlFile.hh
include/ACGL/OpenGL/Controller/ShaderControlFile.hh
+3
-3
include/ACGL/OpenGL/Controller/ShaderProgramControlAutoFiles.hh
...e/ACGL/OpenGL/Controller/ShaderProgramControlAutoFiles.hh
+3
-3
include/ACGL/OpenGL/Controller/TextureControl.hh
include/ACGL/OpenGL/Controller/TextureControl.hh
+3
-3
include/ACGL/OpenGL/Controller/TextureControlFileJPG.hh
include/ACGL/OpenGL/Controller/TextureControlFileJPG.hh
+3
-3
include/ACGL/OpenGL/Controller/VertexBufferControl.hh
include/ACGL/OpenGL/Controller/VertexBufferControl.hh
+3
-3
include/ACGL/OpenGL/Controller/VertexBufferControlFileOBJ.hh
include/ACGL/OpenGL/Controller/VertexBufferControlFileOBJ.hh
+3
-3
include/ACGL/OpenGL/GL.hh
include/ACGL/OpenGL/GL.hh
+3
-3
include/ACGL/OpenGL/Managers.hh
include/ACGL/OpenGL/Managers.hh
+9
-3
include/ACGL/OpenGL/Objects.hh
include/ACGL/OpenGL/Objects.hh
+7
-3
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
+3
-3
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
+3
-3
include/ACGL/OpenGL/Objects/FrameBuffer.hh
include/ACGL/OpenGL/Objects/FrameBuffer.hh
+3
-3
include/ACGL/OpenGL/Objects/RenderBuffer.hh
include/ACGL/OpenGL/Objects/RenderBuffer.hh
+3
-3
include/ACGL/OpenGL/Objects/Shader.hh
include/ACGL/OpenGL/Objects/Shader.hh
+3
-3
include/ACGL/OpenGL/Objects/ShaderProgram.hh
include/ACGL/OpenGL/Objects/ShaderProgram.hh
+3
-3
include/ACGL/OpenGL/Objects/Texture.hh
include/ACGL/OpenGL/Objects/Texture.hh
+3
-3
include/ACGL/OpenGL/Objects/Uniform.hh
include/ACGL/OpenGL/Objects/Uniform.hh
+3
-3
include/ACGL/OpenGL/Objects/VertexBuffer.hh
include/ACGL/OpenGL/Objects/VertexBuffer.hh
+3
-3
include/ACGL/OpenGL/Tools.hh
include/ACGL/OpenGL/Tools.hh
+8
-3
include/ACGL/Resource/BasicController.hh
include/ACGL/Resource/BasicController.hh
+7
-0
include/ACGL/Scene/Camera.hh
include/ACGL/Scene/Camera.hh
+7
-3
include/ACGL/Scene/CoordinateSystem.hh
include/ACGL/Scene/CoordinateSystem.hh
+8
-3
include/ACGL/Scene/MatrixStack.hh
include/ACGL/Scene/MatrixStack.hh
+11
-3
include/ACGL/Types.hh
include/ACGL/Types.hh
+1
-1
include/ACGL/Utils/Log.hh
include/ACGL/Utils/Log.hh
+40
-12
include/ACGL/Utils/PerformanceTimer.hh
include/ACGL/Utils/PerformanceTimer.hh
+14
-9
No files found.
include/ACGL/ACGL.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_HH
#define ACGL_HH
#ifndef
ACGL_
ACGL_HH
#define
ACGL_
ACGL_HH
/*
* Include this in all ACGL (header)-files. It will include stuff that is used in
...
...
@@ -12,6 +12,8 @@
* the used datatypes
* macros and defines used at compile-time
* logging
*
* Also the librarys init function is defined here.
*/
#include <ACGL/Base/CompileTimeSettings.hh>
...
...
@@ -21,9 +23,15 @@
namespace
ACGL
{
/*
* This should get called as soon as a valid OpenGL context exists,
* it will init glew (if used).
* Call this before calling any OpenGL functions or OpenGL related
* ACGL stuff.
*/
void
init
(
void
);
};
#endif // ACGL_HH
#endif //
ACGL_
ACGL_HH
include/ACGL/Base/CompileTimeSettings.hh
View file @
ed97990b
...
...
@@ -3,11 +3,11 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef COMPILETIMESETTINGS_HH
#define COMPILETIMESETTINGS_HH
#ifndef
ACGL_BASE_
COMPILETIMESETTINGS_HH
#define
ACGL_BASE_
COMPILETIMESETTINGS_HH
/*
* OpenGL error checking
* OpenGL error checking
defines
*
* By default, only critical errors will get checked in release build
* and critical&common in debug build.
...
...
@@ -71,5 +71,5 @@
#endif // COMPILETIMESETTINGS_HH
#endif //
ACGL_BASE_
COMPILETIMESETTINGS_HH
include/ACGL/Base/FileHelpers.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
UTILS
_FILEHELPERS_HH
#define ACGL_
UTILS
_FILEHELPERS_HH
#ifndef ACGL_
BASE
_FILEHELPERS_HH
#define ACGL_
BASE
_FILEHELPERS_HH
#include <string>
#include <vector>
...
...
include/ACGL/Base/FileOperations.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
UTILS
_FILEOPERATIONS_HH
#define ACGL_
UTILS
_FILEOPERATIONS_HH
#ifndef ACGL_
BASE
_FILEOPERATIONS_HH
#define ACGL_
BASE
_FILEOPERATIONS_HH
#include <ACGL/ACGL.hh>
...
...
@@ -21,4 +21,4 @@ namespace FileOperations
}
// Base
}
// ACGL
#endif
#endif
// ACGL_BASE_FILEOPERATIONS_HH
include/ACGL/Base/Settings.hh
View file @
ed97990b
...
...
@@ -6,6 +6,11 @@
#ifndef ACGL_BASE_FRAMEWORKSETTINGS_HH
#define ACGL_BASE_FRAMEWORKSETTINGS_HH
/*
* This class manages a few runtime settings for the application which can change the
* behavior of the ACGL library.
*/
#include <ACGL/ACGL.hh>
#include <ACGL/Base/Singleton.hh>
#include <string>
...
...
include/ACGL/Base/Singleton.hh
View file @
ed97990b
...
...
@@ -3,8 +3,13 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef SINGLETON_HH
#define SINGLETON_HH
#ifndef ACGL_BASE_SINGLETON_HH
#define ACGL_BASE_SINGLETON_HH
/*
* A very simple Singleton as a template.
* Not thread save etc.
*/
#include <ACGL/ACGL.hh>
#include <tr1/memory>
...
...
include/ACGL/Base/StringOperations.hh
View file @
ed97990b
...
...
@@ -3,8 +3,13 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_UTILS_STRINGOPERATIONS_HH
#define ACGL_UTILS_STRINGOPERATIONS_HH
#ifndef ACGL_BASE_STRINGOPERATIONS_HH
#define ACGL_BASE_STRINGOPERATIONS_HH
/*
* Provides a set of primitive functions which operate on std::strings which are
* used at multiple points within the library.
*/
#include <ACGL/ACGL.hh>
...
...
@@ -43,4 +48,4 @@ namespace StringOperations
}
// Base
}
// ACGL
#endif // ACGL_
UTILS
_STRINGOPERATIONS_HH
#endif // ACGL_
BASE
_STRINGOPERATIONS_HH
include/ACGL/Math/Constants.hh
View file @
ed97990b
...
...
@@ -3,8 +3,14 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef AE_CONSTANTS_H
#define AE_CONSTANTS_H
#ifndef ACGL_MATH_CONSTANTS_HH
#define ACGL_MATH_CONSTANTS_HH
/*
* Some mathmatical constants, for example readable degree to rad conversion.
*
* DON'T INCLUDE THIS DIRECTLY! Include <ACGL/Math.hh> instead!
*/
#include <ACGL/ACGL.hh>
...
...
@@ -16,10 +22,10 @@ namespace Math{
namespace
Constants
{
//some important constants
const
float
INF_FLOAT
=
std
::
numeric_limits
<
float
>::
infinity
();
const
float
INF_FLOAT
=
std
::
numeric_limits
<
float
>::
infinity
();
const
double
INF_DOUBLE
=
std
::
numeric_limits
<
double
>::
infinity
();
const
int_t
INF_INT
=
std
::
numeric_limits
<
int_t
>::
infinity
();
const
short_t
INF_SHORT
=
std
::
numeric_limits
<
short_t
>::
infinity
();
const
int_t
INF_INT
=
std
::
numeric_limits
<
int_t
>::
infinity
();
const
short_t
INF_SHORT
=
std
::
numeric_limits
<
short_t
>::
infinity
();
template
<
typename
T
>
inline
T
INF
(
void
)
{
return
T
();
}
template
<
>
inline
float
INF
<
float
>
(
void
)
{
return
INF_FLOAT
;
}
...
...
@@ -67,4 +73,4 @@ template<> inline double RED_TO_DEG<double>(void) { return RAD_TO_DEG_DOUBLE; }
}
// Math
}
// ACGL
#endif // A
E
CONSTANTS_H
#endif // A
CGL_MATH_
CONSTANTS_H
H
include/ACGL/Math/Functions.hh
View file @
ed97990b
...
...
@@ -6,12 +6,22 @@
#ifndef ACGL_MATH_FUNCTIONS_HH
#define ACGL_MATH_FUNCTIONS_HH
/*
* Some basic math functions.
*
* DON'T INCLUDE THIS DIRECTLY! Include <ACGL/Math.hh> instead!
*/
#include <ACGL/ACGL.hh>
#include <ACGL/Math/Constants.hh>
#include <cmath>
#include <limits>
/*
* Swizzling has to be defined before the glm.hpp gets first included, no not forget
* this, you should never include glm yourself, but include always our ACGL/Math.hh!
*/
#define GLM_SWIZZL
#include <glm/glm.hpp>
...
...
@@ -120,4 +130,4 @@ inline glm::mat3 normalMatrix(const glm::mat4& matrix)
}
// Math
}
// ACGL
#endif
#endif
// ACGL_MATH_FUNCTIONS_HH
include/ACGL/Math/Math.hh
View file @
ed97990b
...
...
@@ -13,6 +13,9 @@
* This library has the advantage that it was designed to mimic the
* syntax of GLSL for datatypes (vectors, matrices etc.) as well as functions.
* It also supports swizzling similar to GLSL.
*
* Swizzling has to be defined before the glm.hpp gets first included, no not forget
* this, you should never include glm yourself, but include always our ACGL/Math.hh!
*/
#define GLM_SWIZZL
#include <glm/glm.hpp>
...
...
@@ -21,4 +24,4 @@
#include <ACGL/Math/Constants.hh>
#include <ACGL/Math/Functions.hh>
#endif
#endif
// ACGL_MATH_HH
include/ACGL/OpenGL/Controller.hh
View file @
ed97990b
...
...
@@ -3,8 +3,13 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_CONTROLLER_HH
#define ACGL_CONTROLLER_HH
#ifndef ACGL_OPENGL_CONTROLLER_HH
#define ACGL_OPENGL_CONTROLLER_HH
/*
* A shortcut to include all controller of OpenGL objects.
* Will also include the objects themself!
*/
#include <ACGL/ACGL.hh>
...
...
@@ -24,4 +29,4 @@
#include <ACGL/OpenGL/Controller/ArrayBufferControl.hh>
#include <ACGL/OpenGL/Controller/ElementArrayBufferControl.hh>
#endif // ACGL_CONTROLLER_HH
#endif // ACGL_
OPENGL_
CONTROLLER_HH
include/ACGL/OpenGL/Controller/ArrayBufferControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_ARRAYBUFFERCONTROL_HH
#define ACGL_
RESOURCE
_ARRAYBUFFERCONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_ARRAYBUFFERCONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_ARRAYBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -88,4 +88,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_ARRAYBUFFERCONTROL
_HH
include/ACGL/OpenGL/Controller/ElementArrayBufferControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_ELEMENTARRAYBUFFERCONTROL_HH
#define ACGL_
RESOURCE
_ELEMENTARRAYBUFFERCONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_ELEMENTARRAYBUFFERCONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_ELEMENTARRAYBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -78,4 +78,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_ELEMENTARRAYBUFFERCONTROL
_HH
include/ACGL/OpenGL/Controller/FrameBufferControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_FRAMEBUFFERCONTROL_HH
#define ACGL_
RESOURCE
_FRAMEBUFFERCONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_FRAMEBUFFERCONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_FRAMEBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -76,4 +76,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_FRAMEBUFFERCONTROL
_HH
include/ACGL/OpenGL/Controller/RenderBufferControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_RENDERBUFFERCONTROL_HH
#define ACGL_
RESOURCE
_RENDERBUFFERCONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_RENDERBUFFERCONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_RENDERBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -59,4 +59,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_RENDERBUFFERCONTROL
_HH
include/ACGL/OpenGL/Controller/ShaderControlFile.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_SHADERCONTROLFILE_HH
#define ACGL_
RESOURCE
_SHADERCONTROLFILE_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_SHADERCONTROLFILE_HH
#define ACGL_
OPENGL_CONTROLLER
_SHADERCONTROLFILE_HH
#include <ACGL/ACGL.hh>
...
...
@@ -51,4 +51,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTUR
E_HH
#endif // ACGL_
OPENGL_CONTROLLER_SHADERCONTROLFIL
E_HH
include/ACGL/OpenGL/Controller/ShaderProgramControlAutoFiles.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_SHADERPROGRAMCONTROLAUTOFILES_HH
#define ACGL_
RESOURCE
_SHADERPROGRAMCONTROLAUTOFILES_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_SHADERPROGRAMCONTROLAUTOFILES_HH
#define ACGL_
OPENGL_CONTROLLER
_SHADERPROGRAMCONTROLAUTOFILES_HH
#include <ACGL/ACGL.hh>
...
...
@@ -39,4 +39,4 @@ public:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_SHADERPROGRAMCONTROLAUTOFILES
_HH
include/ACGL/OpenGL/Controller/TextureControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_TEXTURECONTROL_HH
#define ACGL_
RESOURCE
_TEXTURECONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_TEXTURECONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_TEXTURECONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -90,4 +90,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_TEXTURE_HH
#endif // ACGL_
OPENGL_CONTROLLER
_TEXTURE
CONTROL
_HH
include/ACGL/OpenGL/Controller/TextureControlFileJPG.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_TEXTURECONTROLFILEJPG_HH
#define ACGL_
RESOURCE
_TEXTURECONTROLFILEJPG_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_TEXTURECONTROLFILEJPG_HH
#define ACGL_
OPENGL_CONTROLLER
_TEXTURECONTROLFILEJPG_HH
#include <ACGL/ACGL.hh>
...
...
@@ -57,4 +57,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_TEXTURECONTROLFILEJPG
_HH
include/ACGL/OpenGL/Controller/VertexBufferControl.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_VERTEXBUFFERCONTROL_HH
#define ACGL_
RESOURCE
_VERTEXBUFFERCONTROL_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_VERTEXBUFFERCONTROL_HH
#define ACGL_
OPENGL_CONTROLLER
_VERTEXBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
...
...
@@ -85,4 +85,4 @@ protected:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_VERTEXBUFFERCONTROL
_HH
include/ACGL/OpenGL/Controller/VertexBufferControlFileOBJ.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_VERTEXBUFFERCONTROLFILEOBJ_HH
#define ACGL_
RESOURCE
_VERTEXBUFFERCONTROLFILEOBJ_HH
#ifndef ACGL_
OPENGL_CONTROLLER
_VERTEXBUFFERCONTROLFILEOBJ_HH
#define ACGL_
OPENGL_CONTROLLER
_VERTEXBUFFERCONTROLFILEOBJ_HH
#include <ACGL/ACGL.hh>
...
...
@@ -41,4 +41,4 @@ public:
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_TEXTURE
_HH
#endif // ACGL_
OPENGL_CONTROLLER_VERTEXBUFFERCONTROLFILEOBJ
_HH
include/ACGL/OpenGL/GL.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_GL_HH
#define ACGL_GL_HH
#ifndef ACGL_
OPENGL_
GL_HH
#define ACGL_
OPENGL_
GL_HH
/*
* This simple OpenGL wrapper is used to include OpenGL and GLEW
...
...
@@ -89,4 +89,4 @@
#include <QtOpenGL/qgl.h>
#endif // USE_QT
#endif // ACGL_GL_HH
#endif // ACGL_
OPENGL_
GL_HH
include/ACGL/OpenGL/Managers.hh
View file @
ed97990b
...
...
@@ -3,8 +3,13 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_MANAGER_HH
#define ACGL_MANAGER_HH
#ifndef ACGL_OPENGL_MANAGER_HH
#define ACGL_OPENGL_MANAGER_HH
/*
* A shortcut to include all manager of OpenGL objects.
* Will also include the Objects & Controllers!
*/
#include <ACGL/ACGL.hh>
...
...
@@ -39,10 +44,11 @@ typedef Resource::NameManager<ElementArrayBuffer> ElementArrayBufferNameManager;
}
// OpenGL
}
// ACGL
//note: when we start having managers for non-OpenGL objects we should move this ;-)
#define ACGL_FOR_EACH_RESOURCE(MANAGER,RESOURCE,ELEMENT) \
for(ACGL::Resource::MANAGER<RESOURCE>::ResourceContainer::const_iterator ELEMENT = ACGL::Resource::MANAGER<RESOURCE>::the()->begin(); \
ELEMENT != MANAGER<RESOURCE>::the()->end(); \
++ELEMENT)
#endif // ACGL_MANAGER_HH
#endif // ACGL_
OPENGL_
MANAGER_HH
include/ACGL/OpenGL/Objects.hh
View file @
ed97990b
...
...
@@ -3,8 +3,12 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_OBJECTS_HH
#define ACGL_OBJECTS_HH
#ifndef ACGL_OPENGL_OBJECTS_HH
#define ACGL_OPENGL_OBJECTS_HH
/*
* A shortcut to include all OpenGL objects.
*/
#include <ACGL/ACGL.hh>
...
...
@@ -18,4 +22,4 @@
#include <ACGL/OpenGL/Objects/ElementArrayBuffer.hh>
#endif // ACGL_OBJECTS_HH
#endif // ACGL_
OPENGL_
OBJECTS_HH
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_ARRAYBUFFER_HH
#define ACGL_
RESOURCE
_ARRAYBUFFER_HH
#ifndef ACGL_
OPENGL_OBJECTS
_ARRAYBUFFER_HH
#define ACGL_
OPENGL_OBJECTS
_ARRAYBUFFER_HH
#include <ACGL/ACGL.hh>
...
...
@@ -185,4 +185,4 @@ typedef std::tr1::shared_ptr<ArrayBuffer> SharedArrayBuffer;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_ARRAYBUFFER_HH
#endif // ACGL_
OPENGL_OBJECTS
_ARRAYBUFFER_HH
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_ELEMENTBUFFERDATA_HH
#define ACGL_
RESOURCE
_ELEMENTBUFFERDATA_HH
#ifndef ACGL_
OPENGL_OBJECTS
_ELEMENTBUFFERDATA_HH
#define ACGL_
OPENGL_OBJECTS
_ELEMENTBUFFERDATA_HH
#include <ACGL/ACGL.hh>
...
...
@@ -126,4 +126,4 @@ typedef std::tr1::shared_ptr<ElementArrayBuffer> SharedElementArrayBuffer;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_ELEMENTBUFFERDATA_HH
#endif // ACGL_
OPENGL_OBJECTS
_ELEMENTBUFFERDATA_HH
include/ACGL/OpenGL/Objects/FrameBuffer.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_FRAMEBUFFER_HH
#define ACGL_
RESOURCE
_FRAMEBUFFER_HH
#ifndef ACGL_
OPENGL_OBJECTS
_FRAMEBUFFER_HH
#define ACGL_
OPENGL_OBJECTS
_FRAMEBUFFER_HH
/*
* This FrameBuffer class encapsulates an OpenGL frame buffer object (FBO).
...
...
@@ -251,4 +251,4 @@ typedef std::tr1::shared_ptr<FrameBuffer> SharedFrameBuffer;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_FRAMEBUFFER_HH
#endif // ACGL_
OPENGL_OBJECTS
_FRAMEBUFFER_HH
include/ACGL/OpenGL/Objects/RenderBuffer.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_RENDERBUFFER_HH
#define ACGL_
RESOURCE
_RENDERBUFFER_HH
#ifndef ACGL_
OPENGL_OBJECTS
_RENDERBUFFER_HH
#define ACGL_
OPENGL_OBJECTS
_RENDERBUFFER_HH
#include <ACGL/ACGL.hh>
...
...
@@ -72,4 +72,4 @@ typedef std::tr1::shared_ptr<RenderBuffer> SharedRenderBuffer;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE_FRAME
BUFFER_HH
#endif // ACGL_
OPENGL_OBJECTS_RENDER
BUFFER_HH
include/ACGL/OpenGL/Objects/Shader.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_SHADER_HH
#define ACGL_
RESOURCE
_SHADER_HH
#ifndef ACGL_
OPENGL_OBJECTS
_SHADER_HH
#define ACGL_
OPENGL_OBJECTS
_SHADER_HH
#include <vector>
#include <string>
...
...
@@ -92,4 +92,4 @@ typedef std::tr1::shared_ptr<Shader> SharedShader;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_SHADER_HH
#endif // ACGL_
OPENGL_OBJECTS
_SHADER_HH
include/ACGL/OpenGL/Objects/ShaderProgram.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_SHADERPROGRAM_HH
#define ACGL_
RESOURCE
_SHADERPROGRAM_HH
#ifndef ACGL_
OPENGL_OBJECTS
_SHADERPROGRAM_HH
#define ACGL_
OPENGL_OBJECTS
_SHADERPROGRAM_HH
#include <ACGL/ACGL.hh>
...
...
@@ -121,4 +121,4 @@ typedef std::tr1::shared_ptr<ShaderProgram> SharedShaderProgram;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_SHADERPROGRAM_HH
#endif // ACGL_
OPENGL_OBJECTS
_SHADERPROGRAM_HH
include/ACGL/OpenGL/Objects/Texture.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_TEXTURE_HH
#define ACGL_
RESOURCE
_TEXTURE_HH
#ifndef ACGL_
OPENGL_OBJECTS
_TEXTURE_HH
#define ACGL_
OPENGL_OBJECTS
_TEXTURE_HH
#include <ACGL/ACGL.hh>
...
...
@@ -252,4 +252,4 @@ typedef std::tr1::shared_ptr<Texture> SharedTexture;
}
// OpenGL
}
// ACGL
#endif // ACGL_
RESOURCE
_TEXTURE_HH
#endif // ACGL_
OPENGL_OBJECTS
_TEXTURE_HH
include/ACGL/OpenGL/Objects/Uniform.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_UNIFORM_HH
#define ACGL_
RESOURCE
_UNIFORM_HH
#ifndef ACGL_
OPENGL_OBJECTS
_UNIFORM_HH
#define ACGL_
OPENGL_OBJECTS
_UNIFORM_HH
#include <ACGL/ACGL.hh>
...
...
@@ -93,4 +93,4 @@ public:
} // ACGL
*/
#endif // ACGL_
RESOURCE_SHADERPROGRA
M_HH
#endif // ACGL_
OPENGL_OBJECTS_UNIFOR
M_HH
include/ACGL/OpenGL/Objects/VertexBuffer.hh
View file @
ed97990b
...
...
@@ -3,8 +3,8 @@
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_
RESOURCE
_VERTEXBUFFER_HH
#define ACGL_
RESOURCE
_VERTEXBUFFER_HH
#ifndef ACGL_
OPENGL_OBJECTS
_VERTEXBUFFER_HH
#define ACGL_
OPENGL_OBJECTS
_VERTEXBUFFER_HH