Skip to content
GitLab
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
e696ab13
Commit
e696ab13
authored
Aug 19, 2011
by
Andreas Neu
Browse files
Merge branch 'master' of /data/git-repository/acgl/libraries/acgl
parents
cf1ec7d9
7fad840b
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Managers.hh
View file @
e696ab13
...
...
@@ -37,11 +37,20 @@ typedef Resource::FileManager<ShaderProgram> ShaderProgramFileManager;
typedef
Resource
::
NameManager
<
ShaderProgramObject
>
ShaderProgramObjectNameManager
;
typedef
Resource
::
NameManager
<
Shared
State
>
StateNameManager
;
typedef
Resource
::
NameManager
<
State
>
StateNameManager
;
typedef
Resource
::
NameManager
<
Texture
>
TextureNameManager
;
typedef
Resource
::
FileManager
<
Texture
>
TextureFileManager
;
typedef
Resource
::
NameManager
<
Uniform1f
>
Uniform1fNameManager
;
typedef
Resource
::
NameManager
<
Uniform2f
>
Uniform2fNameManager
;
typedef
Resource
::
NameManager
<
Uniform3f
>
Uniform3fNameManager
;
typedef
Resource
::
NameManager
<
Uniform4f
>
Uniform4fNameManager
;
typedef
Resource
::
NameManager
<
UniformMatrix2f
>
UniformMatrix2fNameManager
;
typedef
Resource
::
NameManager
<
UniformMatrix3f
>
UniformMatrix3fNameManager
;
typedef
Resource
::
NameManager
<
UniformMatrix4f
>
UniformMatrix4fNameManager
;
typedef
Resource
::
NameManager
<
UniformTexture
>
UniformTextureNameManager
;
typedef
Resource
::
NameManager
<
VertexBufferObject
>
VertexBufferObjectNameManager
;
typedef
Resource
::
FileManager
<
VertexBufferObject
>
VertexBufferObjectFileManager
;
...
...
include/ACGL/OpenGL/Objects/State.hh
View file @
e696ab13
...
...
@@ -102,7 +102,7 @@ public:
// ============================================================================================ METHODS \/
// ==================================================================================================== \/
public:
void
updateMappings
(
void
);
void
updateMappings
(
void
);
void
useViewport
(
void
)
const
;
void
useShaderProgramObject
(
void
)
const
;
...
...
include/ACGL/OpenGL/Objects/Viewport.hh
View file @
e696ab13
...
...
@@ -27,10 +27,10 @@ class Viewport
// ============================================================================================ CONSTRUCTORS \/
// ========================================================================================================= \/
public:
Viewport
(
GLint
_offsetX
,
GLint
_offsetY
,
GLsizei
_width
,
GLsizei
_height
)
Viewport
(
GLint
_offsetX
=
0
,
GLint
_offsetY
=
0
,
GLsizei
_width
=
0
,
GLsizei
_height
=
0
)
:
mOffsetX
(
_offsetX
),
mOffsetY
(
_offsetY
),
mWidth
(
_width
),
...
...
@@ -57,6 +57,18 @@ public:
glViewport
(
mOffsetX
,
mOffsetY
,
mWidth
,
mHeight
);
}
inline
void
setOffset
(
GLint
_offsetX
,
GLint
_offsetY
)
{
mOffsetX
=
_offsetX
;
mOffsetY
=
_offsetY
;
}
inline
void
setSize
(
GLsizei
_width
,
GLsizei
_height
)
{
mWidth
=
_width
;
mHeight
=
_height
;
}
// =================================================================================================== \/
// ============================================================================================ FIELDS \/
// =================================================================================================== \/
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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