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
cf1ec7d9
Commit
cf1ec7d9
authored
Aug 19, 2011
by
Andreas Neu
Browse files
-Added the case that no FrameBufferObject is used by a State.
parent
13a23dc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Controller/StateControl.hh
View file @
cf1ec7d9
...
...
@@ -21,14 +21,24 @@ class StateControl : public Resource::BasicCreateController<State>
// ============================================================================================ CONSTRUCTORS \/
// ========================================================================================================= \/
public:
StateControl
(
const
ConstSharedShaderProgramObject
&
_shaderProgramObject
,
const
ConstSharedVertexBufferObject
&
_vertexBufferObject
,
const
ConstSharedViewport
&
_viewport
)
:
mpVertexBufferObject
(
_vertexBufferObject
),
mpShaderProgramObject
(
_shaderProgramObject
),
mpFrameBufferObject
(),
mpViewport
(
_viewport
)
{}
StateControl
(
const
ConstSharedVertexBufferObject
&
_vertexBufferObject
,
const
ConstSharedFrameBufferObject
&
_frameBufferObject
,
const
ConstSharedShaderProgramObject
&
_shaderProgramObject
,
const
ConstSharedFrameBufferObject
&
_frameBufferObject
,
const
ConstSharedViewport
&
_viewport
)
:
mpVertexBufferObject
(
_vertexBufferObject
),
mpFrameBufferObject
(
_frameBufferObject
),
mpShaderProgramObject
(
_shaderProgramObject
),
mpFrameBufferObject
(
_frameBufferObject
),
mpViewport
(
_viewport
)
{}
virtual
~
StateControl
(
void
)
{}
...
...
@@ -58,8 +68,8 @@ public:
// =================================================================================================== \/
protected:
ConstSharedVertexBufferObject
mpVertexBufferObject
;
ConstSharedFrameBufferObject
mpFrameBufferObject
;
ConstSharedShaderProgramObject
mpShaderProgramObject
;
ConstSharedFrameBufferObject
mpFrameBufferObject
;
ConstSharedViewport
mpViewport
;
};
...
...
include/ACGL/OpenGL/Objects/State.hh
View file @
cf1ec7d9
...
...
@@ -55,12 +55,26 @@ private:
// ========================================================================================================= \/
public:
State
(
ConstSharedVertexBufferObject
_vertexBufferObject
,
ConstSharedFrameBufferObject
_frameBufferObject
,
ConstSharedShaderProgramObject
_shaderProgram
,
ConstSharedFrameBufferObject
_frameBufferObject
,
ConstSharedViewport
_viewport
)
:
mpVertexBufferObject
(
_vertexBufferObject
),
mpShaderProgramObject
(
_shaderProgram
),
mpFrameBufferObject
(
_frameBufferObject
),
mpViewport
(
_viewport
),
mAttributeMappings
(),
mFragmentDataMappings
(),
mpBuffers
(
NULL
)
{
updateMappings
();
}
State
(
ConstSharedVertexBufferObject
_vertexBufferObject
,
ConstSharedShaderProgramObject
_shaderProgram
,
ConstSharedViewport
_viewport
)
:
mpVertexBufferObject
(
_vertexBufferObject
),
mpShaderProgramObject
(
_shaderProgram
),
mpFrameBufferObject
(),
mpViewport
(
_viewport
),
mAttributeMappings
(),
mFragmentDataMappings
(),
...
...
@@ -122,8 +136,8 @@ public:
// =================================================================================================== \/
protected:
ConstSharedVertexBufferObject
mpVertexBufferObject
;
ConstSharedFrameBufferObject
mpFrameBufferObject
;
ConstSharedShaderProgramObject
mpShaderProgramObject
;
ConstSharedFrameBufferObject
mpFrameBufferObject
;
ConstSharedViewport
mpViewport
;
AttributeMappingVec
mAttributeMappings
;
...
...
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