Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
4cf80dd6
Commit
4cf80dd6
authored
Feb 05, 2012
by
Robert Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated smartpointer macro
parent
eb8a5c10
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
50 additions
and
46 deletions
+50
-46
include/ACGL/Animations/Animation.hh
include/ACGL/Animations/Animation.hh
+7
-7
include/ACGL/Animations/EaseFunctions.hh
include/ACGL/Animations/EaseFunctions.hh
+1
-1
include/ACGL/Animations/Interpolator.hh
include/ACGL/Animations/Interpolator.hh
+1
-1
include/ACGL/Base/Macros.hh
include/ACGL/Base/Macros.hh
+5
-2
include/ACGL/OpenGL/Controller/TextureDataControlFile.hh
include/ACGL/OpenGL/Controller/TextureDataControlFile.hh
+1
-1
include/ACGL/OpenGL/Controller/TextureDataControlFileJPG.hh
include/ACGL/OpenGL/Controller/TextureDataControlFileJPG.hh
+1
-1
include/ACGL/OpenGL/Controller/TextureDataControlFilePNG.hh
include/ACGL/OpenGL/Controller/TextureDataControlFilePNG.hh
+1
-1
include/ACGL/OpenGL/Data/TextureData.hh
include/ACGL/OpenGL/Data/TextureData.hh
+1
-1
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
+1
-1
include/ACGL/OpenGL/Objects/Buffer.hh
include/ACGL/OpenGL/Objects/Buffer.hh
+1
-1
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
+1
-1
include/ACGL/OpenGL/Objects/FrameBufferObject.hh
include/ACGL/OpenGL/Objects/FrameBufferObject.hh
+1
-1
include/ACGL/OpenGL/Objects/LocationMappings.hh
include/ACGL/OpenGL/Objects/LocationMappings.hh
+1
-1
include/ACGL/OpenGL/Objects/Query.hh
include/ACGL/OpenGL/Objects/Query.hh
+4
-4
include/ACGL/OpenGL/Objects/RenderBuffer.hh
include/ACGL/OpenGL/Objects/RenderBuffer.hh
+1
-1
include/ACGL/OpenGL/Objects/RenderObject.hh
include/ACGL/OpenGL/Objects/RenderObject.hh
+1
-1
include/ACGL/OpenGL/Objects/Sampler.hh
include/ACGL/OpenGL/Objects/Sampler.hh
+3
-2
include/ACGL/OpenGL/Objects/Shader.hh
include/ACGL/OpenGL/Objects/Shader.hh
+1
-1
include/ACGL/OpenGL/Objects/ShaderProgram.hh
include/ACGL/OpenGL/Objects/ShaderProgram.hh
+1
-1
include/ACGL/OpenGL/Objects/ShaderProgramObject.hh
include/ACGL/OpenGL/Objects/ShaderProgramObject.hh
+1
-1
include/ACGL/OpenGL/Objects/Texture.hh
include/ACGL/OpenGL/Objects/Texture.hh
+1
-1
include/ACGL/OpenGL/Objects/Uniform.hh
include/ACGL/OpenGL/Objects/Uniform.hh
+10
-10
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
+1
-1
include/ACGL/OpenGL/Objects/VertexBufferObject.hh
include/ACGL/OpenGL/Objects/VertexBufferObject.hh
+1
-1
include/ACGL/OpenGL/Objects/Viewport.hh
include/ACGL/OpenGL/Objects/Viewport.hh
+1
-1
include/ACGL/Resource/FileManager.hh
include/ACGL/Resource/FileManager.hh
+1
-1
No files found.
include/ACGL/Animations/Animation.hh
View file @
4cf80dd6
...
...
@@ -45,7 +45,7 @@ private:
};
ACGL_S
HARED_TYPEDEF
(
Animation
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Animation
)
typedef
std
::
list
<
SharedAnimation
>
AnimationList
;
typedef
std
::
queue
<
SharedAnimation
>
AnimationQueue
;
...
...
@@ -164,7 +164,7 @@ private:
long
mDuration
;
};
ACGL_S
HARED_TYPEDEF
(
AnimationWait
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationWait
)
// AnimationSequential *************************************************************************************
...
...
@@ -187,7 +187,7 @@ private:
AnimationList
mAnimations
;
};
ACGL_S
HARED_TYPEDEF
(
AnimationSequential
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationSequential
)
// AnimationParallel *************************************************************************************
...
...
@@ -210,7 +210,7 @@ private:
uint_t
mRunningAnimations
;
};
ACGL_S
HARED_TYPEDEF
(
AnimationParallel
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationParallel
)
// AnimationVariable *************************************************************************************
...
...
@@ -306,13 +306,13 @@ private:
};
typedef
AnimationVariable
<
float
,
LinearInterpolatorFloat
>
AnimationFloatLinear
;
ACGL_S
HARED_TYPEDEF
(
AnimationFloatLinear
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationFloatLinear
)
typedef
AnimationVariable
<
glm
::
vec2
,
LinearInterpolatorVec2
>
AnimationVec2Linear
;
ACGL_S
HARED_TYPEDEF
(
AnimationVec2Linear
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationVec2Linear
)
typedef
AnimationVariable
<
glm
::
vec3
,
LinearInterpolatorVec3
>
AnimationVec3Linear
;
ACGL_S
HARED_TYPEDEF
(
AnimationVec3Linear
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AnimationVec3Linear
)
template
<
class
T
,
class
SpeedInterpolator
>
class
AnimationSpeed
:
public
Animation
{
...
...
include/ACGL/Animations/EaseFunctions.hh
View file @
4cf80dd6
...
...
@@ -24,7 +24,7 @@ public:
virtual
float
value
(
const
float
_progress
)
=
0
;
};
ACGL_S
HARED_TYPEDEF
(
EaseFunction
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
EaseFunction
)
/*
float Linear(float progress, ease_function_parameter& parameter);
...
...
include/ACGL/Animations/Interpolator.hh
View file @
4cf80dd6
...
...
@@ -26,7 +26,7 @@ public:
virtual
void
blend
(
const
void
*
value
,
const
float
progress
)
=
0
;
};
ACGL_S
HARED_TYPEDEF
(
BlendInterpolator
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
BlendInterpolator
)
struct
interpolator_blend_t
{
...
...
include/ACGL/Base/Macros.hh
View file @
4cf80dd6
...
...
@@ -12,11 +12,14 @@ private:\
Class(const Class& ){ }\
void operator=(Class& ){ }
#define ACGL_SHARED_TYPEDEF(Class) \
// creates typedefs for a given class for each smartpointer type
#define ACGL_SMARTPOINTER_TYPEDEFS(Class) \
typedef ptr::shared_ptr<Class> Shared ## Class; \
typedef ptr::shared_ptr<const Class> ConstShared ## Class; \
typedef ptr::weak_ptr<Class> Weak ## Class; \
typedef ptr::weak_ptr<const Class> ConstWeak ## Class;
typedef ptr::weak_ptr<const Class> ConstWeak ## Class; \
typedef ptr::unique_ptr<Class> Unique ## Class; \
typedef ptr::unique_ptr<const Class> ConstUnique ## Class;
#endif // MACROS_HH
include/ACGL/OpenGL/Controller/TextureDataControlFile.hh
View file @
4cf80dd6
...
...
@@ -40,7 +40,7 @@ public:
virtual
bool
update
(
SharedTextureData
&
_texture
);
};
ACGL_S
HARED_TYPEDEF
(
TextureDataControlFile
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
TextureDataControlFile
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Controller/TextureDataControlFileJPG.hh
View file @
4cf80dd6
...
...
@@ -51,7 +51,7 @@ private:
static
int_t
sTypeID
;
};
ACGL_S
HARED_TYPEDEF
(
TextureDataControlFileJPG
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
TextureDataControlFileJPG
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Controller/TextureDataControlFilePNG.hh
View file @
4cf80dd6
...
...
@@ -51,7 +51,7 @@ private:
static
int_t
sTypeID
;
};
ACGL_S
HARED_TYPEDEF
(
TextureDataControlFilePNG
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
TextureDataControlFilePNG
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Data/TextureData.hh
View file @
4cf80dd6
...
...
@@ -67,7 +67,7 @@ private:
GLenum
type
;
};
ACGL_S
HARED_TYPEDEF
(
TextureData
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
TextureData
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
View file @
4cf80dd6
...
...
@@ -170,7 +170,7 @@ protected:
AttributeVec
mAttributes
;
};
ACGL_S
HARED_TYPEDEF
(
ArrayBuffer
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
ArrayBuffer
)
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/Buffer.hh
View file @
4cf80dd6
...
...
@@ -299,7 +299,7 @@ protected:
GLenum
mTarget
;
};
ACGL_S
HARED_TYPEDEF
(
Buffer
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Buffer
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
View file @
4cf80dd6
...
...
@@ -77,7 +77,7 @@ protected:
GLenum
mType
;
};
ACGL_S
HARED_TYPEDEF
(
ElementArrayBuffer
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
ElementArrayBuffer
)
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/FrameBufferObject.hh
View file @
4cf80dd6
...
...
@@ -200,7 +200,7 @@ protected:
Attachment
mDepthAttachment
;
// depth and stencil are combined
};
ACGL_S
HARED_TYPEDEF
(
FrameBufferObject
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
FrameBufferObject
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/LocationMappings.hh
View file @
4cf80dd6
...
...
@@ -81,7 +81,7 @@ protected:
LocationMap
mMappings
;
};
ACGL_S
HARED_TYPEDEF
(
LocationMappings
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
LocationMappings
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/Query.hh
View file @
4cf80dd6
...
...
@@ -85,7 +85,7 @@ protected:
GLuint
mObjectName
;
GLenum
mTarget
;
};
ACGL_S
HARED_TYPEDEF
(
AsynchronousQuery
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
AsynchronousQuery
)
/*
* Occlusion queries count the fragments that pass the z-test.
...
...
@@ -118,7 +118,7 @@ public:
return
getResult
();
}
};
ACGL_S
HARED_TYPEDEF
(
OcclusionQuery
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
OcclusionQuery
)
#if (ACGL_OPENGL_VERSION >= 33)
...
...
@@ -148,7 +148,7 @@ public:
return
getResult64
();
}
};
ACGL_S
HARED_TYPEDEF
(
TimerQuery
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
TimerQuery
)
#endif // OpenGL >= 3.3
#if (ACGL_OPENGL_VERSION >= 31)
...
...
@@ -176,7 +176,7 @@ public:
mTarget
=
_queryType
;
}
};
ACGL_S
HARED_TYPEDEF
(
PrimitiveQuery
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
PrimitiveQuery
)
#endif // OpenGL >= 3.1
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/RenderBuffer.hh
View file @
4cf80dd6
...
...
@@ -110,7 +110,7 @@ protected:
GLsizei
mHeight
;
};
ACGL_S
HARED_TYPEDEF
(
RenderBuffer
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
RenderBuffer
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/RenderObject.hh
View file @
4cf80dd6
...
...
@@ -112,7 +112,7 @@ protected:
ConstSharedViewport
mpViewport
;
};
ACGL_S
HARED_TYPEDEF
(
RenderObject
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
RenderObject
)
}
}
...
...
include/ACGL/OpenGL/Objects/Sampler.hh
View file @
4cf80dd6
...
...
@@ -51,7 +51,8 @@ public:
// ===================================================================================================== \/
// ============================================================================================ WRAPPERS \/
// ===================================================================================================== \/
inline
void
bind
(
GLuint
_textureUnit
)
const
//! _textureUnit is in the range 0..n (not GL_TEXTURE0..GL_TEXTUREn)
inline
void
bind
(
GLuint
_textureUnit
)
const
{
glBindSampler
(
_textureUnit
,
mObjectName
);
// yes, no adding of GL_TEXTURE0 !
openGLRareError
();
...
...
@@ -65,7 +66,7 @@ private:
GLuint
mObjectName
;
};
ACGL_S
HARED_TYPEDEF
(
Sampler
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Sampler
)
#endif // OpenGL >= 3.3
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/Shader.hh
View file @
4cf80dd6
...
...
@@ -73,7 +73,7 @@ protected:
GLenum
mType
;
};
ACGL_S
HARED_TYPEDEF
(
Shader
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Shader
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ShaderProgram.hh
View file @
4cf80dd6
...
...
@@ -314,7 +314,7 @@ protected:
ConstSharedShaderVec
mShaders
;
};
ACGL_S
HARED_TYPEDEF
(
ShaderProgram
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
ShaderProgram
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ShaderProgramObject.hh
View file @
4cf80dd6
...
...
@@ -114,7 +114,7 @@ protected:
UniformTextureAttachmentVec
mUniformTextureAttachments
;
};
ACGL_S
HARED_TYPEDEF
(
ShaderProgramObject
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
ShaderProgramObject
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/Texture.hh
View file @
4cf80dd6
...
...
@@ -443,7 +443,7 @@ private:
GLenum
mWrapR
;
};
ACGL_S
HARED_TYPEDEF
(
Texture
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Texture
)
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/Uniform.hh
View file @
4cf80dd6
...
...
@@ -37,7 +37,7 @@ public:
virtual
void
apply
(
GLint
)
const
=
0
;
};
ACGL_S
HARED_TYPEDEF
(
Uniform
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform
)
// ================================================================================================= \/
// ===================================================================================== C-SIDE DATA \/
...
...
@@ -88,7 +88,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniform1i
(
_location
,
mValue
);
}
};
ACGL_S
HARED_TYPEDEF
(
Uniform1i
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform1i
)
//=========================
...
...
@@ -100,7 +100,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniform1f
(
_location
,
mValue
);
}
};
ACGL_S
HARED_TYPEDEF
(
Uniform1f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform1f
)
//=========================
...
...
@@ -112,7 +112,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniform2fv
(
_location
,
1
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
Uniform2f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform2f
)
//=========================
...
...
@@ -124,7 +124,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniform3fv
(
_location
,
1
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
Uniform3f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform3f
)
//=========================
...
...
@@ -136,7 +136,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniform4fv
(
_location
,
1
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
Uniform4f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Uniform4f
)
//=========================
...
...
@@ -148,7 +148,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniformMatrix2fv
(
_location
,
1
,
GL_FALSE
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
UniformMatrix2f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
UniformMatrix2f
)
//=========================
...
...
@@ -160,7 +160,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniformMatrix3fv
(
_location
,
1
,
GL_FALSE
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
UniformMatrix3f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
UniformMatrix3f
)
//=========================
...
...
@@ -172,7 +172,7 @@ public:
void
apply
(
GLint
_location
)
const
{
glUniformMatrix4fv
(
_location
,
1
,
GL_FALSE
,
glm
::
value_ptr
(
mValue
));
}
};
ACGL_S
HARED_TYPEDEF
(
UniformMatrix4f
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
UniformMatrix4f
)
//=========================
...
...
@@ -184,7 +184,7 @@ public:
void
apply
(
GLint
_location
,
GLenum
_unit
)
const
{
glUniform1i
(
_location
,
_unit
);
mValue
->
bind
(
_unit
);
}
};
ACGL_S
HARED_TYPEDEF
(
UniformTexture
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
UniformTexture
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
View file @
4cf80dd6
...
...
@@ -398,7 +398,7 @@ private:
GLint
mPreviousVAOName
;
// the VAO that was bound before the last enable() call
};
ACGL_S
HARED_TYPEDEF
(
VertexArrayObject
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
VertexArrayObject
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/VertexBufferObject.hh
View file @
4cf80dd6
...
...
@@ -163,7 +163,7 @@ protected:
AttributeVec
mAttributes
;
};
ACGL_S
HARED_TYPEDEF
(
VertexBufferObject
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
VertexBufferObject
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/Viewport.hh
View file @
4cf80dd6
...
...
@@ -78,7 +78,7 @@ protected:
GLsizei
mHeight
;
};
ACGL_S
HARED_TYPEDEF
(
Viewport
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
Viewport
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/Resource/FileManager.hh
View file @
4cf80dd6
...
...
@@ -24,7 +24,7 @@ class FileManager : public Base::Singleton< FileManager<RESOURCE> >
public:
typedef
ptr
::
shared_ptr
<
FileController
<
RESOURCE
>
>
SharedController
;
ACGL_S
HARED_TYPEDEF
(
RESOURCE
)
ACGL_S
MARTPOINTER_TYPEDEFS
(
RESOURCE
)
struct
Resource
{
SharedController
controller
;
...
...
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