Skip to content

GitLab

Commit 92fa58c9 authored by Robert Menzel's avatar Robert Menzel
Browse files

reordered files

parent edb91c7f
Hide whitespace changes
Inline Side-by-side
include/ACGL/Utils/FileHelpers.hh → include/ACGL/Base/FileHelpers.hh
View file @ 92fa58c9
......@@ -13,8 +13,10 @@
#include <utime.h>
#include <sys/stat.h>
#include <ACGL/ACGL.hh>
namespace ACGL{
namespace Utils{
namespace Base{
namespace FileHelpers
{
......@@ -61,7 +63,7 @@ namespace FileHelpers
FileModificationTime getFileModificationTime( const std::string &fileName ) ;
}
} // Utils
} // Base
} // ACGL
#endif // FILEHELPERS_H
include/ACGL/Base/FileHelpersiOS.h 0 → 100644
View file @ 92fa58c9
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2011, Computer Graphics Group RWTH Aachen University //
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
/*
* FileHelpersiOS.h
* iOS-Test
*
*/
include/ACGL/Utils/FileOperations.hh → include/ACGL/Base/FileOperations.hh
View file @ 92fa58c9
......@@ -6,13 +6,19 @@
#ifndef ACGL_UTILS_FILEOPERATIONS_HH
#define ACGL_UTILS_FILEOPERATIONS_HH
#include <ACGL/Types.hh>
#include <ACGL/ACGL.hh>
#include <string>
namespace ACGL{
namespace Base{
namespace FileOperations
{
bool rawData(const std::string& _filename, char*& _pData, ACGL::long_t& _size);
};
}
} // Base
} // ACGL
#endif
include/ACGL/Base/Settings.hh
View file @ 92fa58c9
......@@ -6,6 +6,7 @@
#ifndef ACGL_BASE_FRAMEWORKSETTINGS_HH
#define ACGL_BASE_FRAMEWORKSETTINGS_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Base/Singleton.hh>
#include <string>
......
include/ACGL/Base/Singleton.hh
View file @ 92fa58c9
......@@ -6,6 +6,7 @@
#ifndef SINGLETON_HH
#define SINGLETON_HH
#include <ACGL/ACGL.hh>
#include <tr1/memory>
namespace ACGL{
......
include/ACGL/Utils/StringOperations.hh → include/ACGL/Base/StringOperations.hh
View file @ 92fa58c9
......@@ -6,14 +6,14 @@
#ifndef ACGL_UTILS_STRINGOPERATIONS_HH
#define ACGL_UTILS_STRINGOPERATIONS_HH
#include <ACGL/Types.hh>
#include <ACGL/ACGL.hh>
#include <sstream>
#include <vector>
#include <string>
namespace ACGL{
namespace Utils{
namespace Base{
namespace StringOperations
{
......@@ -40,7 +40,7 @@ namespace StringOperations
}
}
} // Utils
} // Base
} // ACGL
#endif // ACGL_UTILS_STRINGOPERATIONS_HH
include/ACGL/Math/Constants.hh
View file @ 92fa58c9
......@@ -6,7 +6,7 @@
#ifndef AE_CONSTANTS_H
#define AE_CONSTANTS_H
#include <ACGL/Types.hh>
#include <ACGL/ACGL.hh>
#include <cmath>
#include <limits>
......
include/ACGL/Math/Functions.hh
View file @ 92fa58c9
......@@ -6,11 +6,13 @@
#ifndef ACGL_MATH_FUNCTIONS_HH
#define ACGL_MATH_FUNCTIONS_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Math/Constants.hh>
#include <ACGL/Types.hh>
#include <cmath>
#include <limits>
#define GLM_SWIZZL
#include <glm/glm.hpp>
namespace ACGL{
......
include/ACGL/Math/Math.hh
View file @ 92fa58c9
......@@ -6,6 +6,8 @@
#ifndef ACGL_MATH_HH
#define ACGL_MATH_HH
#include <ACGL/ACGL.hh>
/*
* For our basic vector math we use the GLM library.
* This library has the advantage that it was designed to mimic the
......
include/ACGL/OpenGL/Controller.hh 0 → 100644
View file @ 92fa58c9
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2011, Computer Graphics Group RWTH Aachen University //
// All rights reserved. //
////////////////////////////////////////////////////////////////////////////////
#ifndef ACGL_CONTROLLER_HH
#define ACGL_CONTROLLER_HH
#include <ACGL/ACGL.hh>
#include <ACGL/OpenGL/Objects.hh>
#include <ACGL/Resource/NameManager.hh>
#include <ACGL/Resource/FileManager.hh>
#include <ACGL/OpenGL/Controller/ShaderControlFile.hh>
#include <ACGL/OpenGL/Controller/ShaderProgramControlAutoFiles.hh>
#include <ACGL/OpenGL/Controller/TextureControl.hh>
#include <ACGL/OpenGL/Controller/TextureControlFileJPG.hh>
#include <ACGL/OpenGL/Controller/FrameBufferControl.hh>
#include <ACGL/OpenGL/Controller/RenderBufferControl.hh>
#include <ACGL/OpenGL/Controller/VertexBufferControl.hh>
#include <ACGL/OpenGL/Controller/VertexBufferControlFileOBJ.hh>
#include <ACGL/OpenGL/Controller/ArrayBufferControl.hh>
#include <ACGL/OpenGL/Controller/ElementArrayBufferControl.hh>
#endif // ACGL_CONTROLLER_HH
include/ACGL/Resource/ArrayBufferControl.hh → include/ACGL/OpenGL/Controller/ArrayBufferControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,17 @@
#ifndef ACGL_RESOURCE_ARRAYBUFFERCONTROL_HH
#define ACGL_RESOURCE_ARRAYBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/ArrayBuffer.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/ArrayBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class ArrayBufferControl : public BasicController<ArrayBuffer>
class ArrayBufferControl : public Resource::BasicController<ArrayBuffer>
{
// ==================================================================================================== \/
// ============================================================================================ STRUCTS \/
......@@ -84,7 +86,7 @@ protected:
AttributeDefineVec mAttributeDefines;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/ElementArrayBufferControl.hh → include/ACGL/OpenGL/Controller/ElementArrayBufferControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,17 @@
#ifndef ACGL_RESOURCE_ELEMENTARRAYBUFFERCONTROL_HH
#define ACGL_RESOURCE_ELEMENTARRAYBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/ElementArrayBuffer.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/ElementArrayBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class ElementArrayBufferControl : public BasicController<ElementArrayBuffer>
class ElementArrayBufferControl : public Resource::BasicController<ElementArrayBuffer>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -74,7 +76,7 @@ protected:
const GLvoid* mpData;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/FrameBufferControl.hh → include/ACGL/OpenGL/Controller/FrameBufferControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,20 @@
#ifndef ACGL_RESOURCE_FRAMEBUFFERCONTROL_HH
#define ACGL_RESOURCE_FRAMEBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/FrameBuffer.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/FrameBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
#include <ACGL/OpenGL/Objects/Texture.hh>
#include <ACGL/OpenGL/Objects/RenderBuffer.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class FrameBufferControl : public BasicController<FrameBuffer>
class FrameBufferControl : public Resource::BasicController<FrameBuffer>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -26,8 +31,8 @@ public:
mColorAttachments(),
mDepthAttachment()
{
mDepthAttachment.name = "";
mDepthAttachment.texture = SharedTexture();
mDepthAttachment.name = "";
mDepthAttachment.texture = SharedTexture();
mDepthAttachment.renderBuffer = SharedRenderBuffer();
}
virtual ~FrameBufferControl() {}
......@@ -36,7 +41,7 @@ public:
// ============================================================================================ METHODS \/
// ==================================================================================================== \/
public:
inline FrameBufferControl& size (GLsizei _width, GLsizei _height) { mWidth = _width; mHeight = _height; return *this; }
inline FrameBufferControl& size (GLsizei _width, GLsizei _height) { mWidth = _width; mHeight = _height; return *this; }
inline FrameBufferControl& depthTexture (const SharedTexture& _pDepthTexture) { mDepthAttachment.texture = _pDepthTexture; return *this; }
inline FrameBufferControl& depthRenderBuffer (const SharedRenderBuffer& _pDepthRenderBuffer) { mDepthAttachment.renderBuffer = _pDepthRenderBuffer; return *this; }
......@@ -69,7 +74,7 @@ protected:
FrameBuffer::Attachment mDepthAttachment;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/RenderBufferControl.hh → include/ACGL/OpenGL/Controller/RenderBufferControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,17 @@
#ifndef ACGL_RESOURCE_RENDERBUFFERCONTROL_HH
#define ACGL_RESOURCE_RENDERBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/RenderBuffer.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/RenderBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class RenderBufferControl : public BasicController<RenderBuffer>
class RenderBufferControl : public Resource::BasicController<RenderBuffer>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -55,7 +57,7 @@ protected:
GLenum mInternalFormat;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/ShaderControlFile.hh → include/ACGL/OpenGL/Controller/ShaderControlFile.hh
View file @ 92fa58c9
......@@ -6,16 +6,18 @@
#ifndef ACGL_RESOURCE_SHADERCONTROLFILE_HH
#define ACGL_RESOURCE_SHADERCONTROLFILE_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/Shader.hh>
#include <ACGL/Base/Settings.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/Shader.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class ShaderControlFile : public FileController<Shader>
class ShaderControlFile : public Resource::FileController<Shader>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -47,7 +49,7 @@ protected:
GLenum mType;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/ShaderProgramControlAutoFiles.hh → include/ACGL/OpenGL/Controller/ShaderProgramControlAutoFiles.hh
View file @ 92fa58c9
......@@ -6,16 +6,19 @@
#ifndef ACGL_RESOURCE_SHADERPROGRAMCONTROLAUTOFILES_HH
#define ACGL_RESOURCE_SHADERPROGRAMCONTROLAUTOFILES_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/ShaderProgram.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/ShaderProgram.hh>
#include <ACGL/OpenGL/GL.hh>
#include <vector>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class ShaderProgramControlAutoFiles : public FileController<ShaderProgram>
class ShaderProgramControlAutoFiles : public Resource::FileController<ShaderProgram>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -34,7 +37,7 @@ public:
virtual bool update(SharedShaderProgram& shaderProgram);
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/TextureControl.hh → include/ACGL/OpenGL/Controller/TextureControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,17 @@
#ifndef ACGL_RESOURCE_TEXTURECONTROL_HH
#define ACGL_RESOURCE_TEXTURECONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/Texture.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/Texture.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class TextureControl : public BasicController<Texture>
class TextureControl : public Resource::BasicController<Texture>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -86,7 +88,7 @@ protected:
GLint mMagFilter;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/TextureControlFileJPG.hh → include/ACGL/OpenGL/Controller/TextureControlFileJPG.hh
View file @ 92fa58c9
......@@ -6,16 +6,18 @@
#ifndef ACGL_RESOURCE_TEXTURECONTROLFILEJPG_HH
#define ACGL_RESOURCE_TEXTURECONTROLFILEJPG_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/Texture.hh>
#include <ACGL/Base/Settings.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/Texture.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class TextureControlFileJPG : public FileController<Texture>
class TextureControlFileJPG : public Resource::FileController<Texture>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -53,7 +55,7 @@ protected:
GLint mMagFilter;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/VertexBufferControl.hh → include/ACGL/OpenGL/Controller/VertexBufferControl.hh
View file @ 92fa58c9
......@@ -6,15 +6,17 @@
#ifndef ACGL_RESOURCE_VERTEXBUFFERCONTROL_HH
#define ACGL_RESOURCE_VERTEXBUFFERCONTROL_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/BasicController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/VertexBuffer.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/VertexBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class VertexBufferControl : public BasicController<VertexBuffer>
class VertexBufferControl : public Resource::BasicController<VertexBuffer>
{
// ==================================================================================================== \/
// ============================================================================================ STRUCTS \/
......@@ -81,7 +83,7 @@ protected:
AttributeDefineVec mAttributeDefines;
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
include/ACGL/Resource/VertexBufferControlFileOBJ.hh → include/ACGL/OpenGL/Controller/VertexBufferControlFileOBJ.hh
View file @ 92fa58c9
......@@ -6,16 +6,18 @@
#ifndef ACGL_RESOURCE_VERTEXBUFFERCONTROLFILEOBJ_HH
#define ACGL_RESOURCE_VERTEXBUFFERCONTROLFILEOBJ_HH
#include <ACGL/ACGL.hh>
#include <ACGL/Resource/FileController.hh>
#include <ACGL/Resource/ResourceTypes.hh>
#include <ACGL/Resource/VertexBuffer.hh>
#include <ACGL/Base/Settings.hh>
#include <ACGL/GL.hh>
#include <ACGL/OpenGL/ResourceTypes.hh>
#include <ACGL/OpenGL/Objects/VertexBuffer.hh>
#include <ACGL/OpenGL/GL.hh>
namespace ACGL{
namespace Resource{
namespace OpenGL{
class VertexBufferControlFileOBJ : public FileController<VertexBuffer>
class VertexBufferControlFileOBJ : public Resource::FileController<VertexBuffer>
{
// ========================================================================================================= \/
// ============================================================================================ CONSTRUCTORS \/
......@@ -37,7 +39,7 @@ public:
virtual bool update(SharedVertexBuffer& vertexBuffer);
};
} // Resource
} // OpenGL
} // ACGL
#endif // ACGL_RESOURCE_TEXTURE_HH
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