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
4cf80dd6
Commit
4cf80dd6
authored
Feb 05, 2012
by
Robert Menzel
Browse files
updated smartpointer macro
parent
eb8a5c10
Changes
26
Hide whitespace changes
Inline
Side-by-side
include/ACGL/Animations/Animation.hh
View file @
4cf80dd6
...
...
@@ -45,7 +45,7 @@ private:
};
ACGL_S
H
AR
ED
_TYPEDEF
(
Animation
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
Animation
)
typedef
std
::
list
<
SharedAnimation
>
AnimationList
;
typedef
std
::
queue
<
SharedAnimation
>
AnimationQueue
;
...
...
@@ -164,7 +164,7 @@ private:
long
mDuration
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationWait
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AnimationWait
)
// AnimationSequential *************************************************************************************
...
...
@@ -187,7 +187,7 @@ private:
AnimationList
mAnimations
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationSequential
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AnimationSequential
)
// AnimationParallel *************************************************************************************
...
...
@@ -210,7 +210,7 @@ private:
uint_t
mRunningAnimations
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationParallel
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AnimationParallel
)
// AnimationVariable *************************************************************************************
...
...
@@ -306,13 +306,13 @@ private:
};
typedef
AnimationVariable
<
float
,
LinearInterpolatorFloat
>
AnimationFloatLinear
;
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationFloatLinear
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AnimationFloatLinear
)
typedef
AnimationVariable
<
glm
::
vec2
,
LinearInterpolatorVec2
>
AnimationVec2Linear
;
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationVec2Linear
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AnimationVec2Linear
)
typedef
AnimationVariable
<
glm
::
vec3
,
LinearInterpolatorVec3
>
AnimationVec3Linear
;
ACGL_S
H
AR
ED
_TYPEDEF
(
AnimationVec3Linear
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
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
H
AR
ED
_TYPEDEF
(
EaseFunction
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
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
H
AR
ED
_TYPEDEF
(
BlendInterpolator
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
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
H
AR
ED
_TYPEDEF
(
TextureDataControlFile
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
TextureDataControlFile
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Controller/TextureDataControlFileJPG.hh
View file @
4cf80dd6
...
...
@@ -51,7 +51,7 @@ private:
static
int_t
sTypeID
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
TextureDataControlFileJPG
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
TextureDataControlFileJPG
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Controller/TextureDataControlFilePNG.hh
View file @
4cf80dd6
...
...
@@ -51,7 +51,7 @@ private:
static
int_t
sTypeID
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
TextureDataControlFilePNG
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
TextureDataControlFilePNG
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Data/TextureData.hh
View file @
4cf80dd6
...
...
@@ -67,7 +67,7 @@ private:
GLenum
type
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
TextureData
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
TextureData
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ArrayBuffer.hh
View file @
4cf80dd6
...
...
@@ -170,7 +170,7 @@ protected:
AttributeVec
mAttributes
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
ArrayBuffer
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
ArrayBuffer
)
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/Buffer.hh
View file @
4cf80dd6
...
...
@@ -299,7 +299,7 @@ protected:
GLenum
mTarget
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
Buffer
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
Buffer
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ElementArrayBuffer.hh
View file @
4cf80dd6
...
...
@@ -77,7 +77,7 @@ protected:
GLenum
mType
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
ElementArrayBuffer
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
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
H
AR
ED
_TYPEDEF
(
FrameBufferObject
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
FrameBufferObject
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/LocationMappings.hh
View file @
4cf80dd6
...
...
@@ -81,7 +81,7 @@ protected:
LocationMap
mMappings
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
LocationMappings
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
LocationMappings
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/Query.hh
View file @
4cf80dd6
...
...
@@ -85,7 +85,7 @@ protected:
GLuint
mObjectName
;
GLenum
mTarget
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
AsynchronousQuery
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
AsynchronousQuery
)
/*
* Occlusion queries count the fragments that pass the z-test.
...
...
@@ -118,7 +118,7 @@ public:
return
getResult
();
}
};
ACGL_S
H
AR
ED
_TYPEDEF
(
OcclusionQuery
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
OcclusionQuery
)
#if (ACGL_OPENGL_VERSION >= 33)
...
...
@@ -148,7 +148,7 @@ public:
return
getResult64
();
}
};
ACGL_S
H
AR
ED
_TYPEDEF
(
TimerQuery
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
TimerQuery
)
#endif // OpenGL >= 3.3
#if (ACGL_OPENGL_VERSION >= 31)
...
...
@@ -176,7 +176,7 @@ public:
mTarget
=
_queryType
;
}
};
ACGL_S
H
AR
ED
_TYPEDEF
(
PrimitiveQuery
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
PrimitiveQuery
)
#endif // OpenGL >= 3.1
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/RenderBuffer.hh
View file @
4cf80dd6
...
...
@@ -110,7 +110,7 @@ protected:
GLsizei
mHeight
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
RenderBuffer
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
RenderBuffer
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/RenderObject.hh
View file @
4cf80dd6
...
...
@@ -112,7 +112,7 @@ protected:
ConstSharedViewport
mpViewport
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
RenderObject
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
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
H
AR
ED
_TYPEDEF
(
Sampler
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
Sampler
)
#endif // OpenGL >= 3.3
}
// OpenGL
...
...
include/ACGL/OpenGL/Objects/Shader.hh
View file @
4cf80dd6
...
...
@@ -73,7 +73,7 @@ protected:
GLenum
mType
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
Shader
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
Shader
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ShaderProgram.hh
View file @
4cf80dd6
...
...
@@ -314,7 +314,7 @@ protected:
ConstSharedShaderVec
mShaders
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
ShaderProgram
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
ShaderProgram
)
}
// OpenGL
}
// ACGL
...
...
include/ACGL/OpenGL/Objects/ShaderProgramObject.hh
View file @
4cf80dd6
...
...
@@ -114,7 +114,7 @@ protected:
UniformTextureAttachmentVec
mUniformTextureAttachments
;
};
ACGL_S
H
AR
ED
_TYPEDEF
(
ShaderProgramObject
)
ACGL_S
M
AR
TPOINTER
_TYPEDEF
S
(
ShaderProgramObject
)
}
// OpenGL
}
// ACGL
...
...
Prev
1
2
Next
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