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
OpenFlipper-Free
OpenFlipper-Free
Commits
fa554a0e
Commit
fa554a0e
authored
May 18, 2016
by
Jan Möbius
Browse files
Merge branch 'fix_define' into 'master'
Fixed glew and renderobject define collision See merge request
!102
parents
eca9790c
4327f6d4
Pipeline
#1925
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ACG/GL/RenderObject.hh
View file @
fa554a0e
...
...
@@ -371,10 +371,10 @@ public:
inline
void
glDrawArrays
(
GLenum
mode
,
GLint
first
,
GLsizei
count
)
{
this
->
glDraw
Arrays
Instanced
(
mode
,
first
,
count
,
0
);
this
->
glDrawInstanced
Arrays
(
mode
,
first
,
count
,
0
);
}
inline
void
glDraw
Arrays
Instanced
(
GLenum
mode
,
GLint
first
,
GLsizei
count
,
GLsizei
primcount
)
inline
void
glDrawInstanced
Arrays
(
GLenum
mode
,
GLint
first
,
GLsizei
count
,
GLsizei
primcount
)
{
indexBuffer
=
0
;
sysmemIndexBuffer
=
0
;
...
...
ObjectTypes/Skeleton/SkeletonNodeT.cc
View file @
fa554a0e
...
...
@@ -908,7 +908,7 @@ void SkeletonNodeT<SkeletonType>::getRenderObjects(IRenderer* _renderer,
ro
.
vertexDecl
=
&
pointInstanceDecl_
;
ro
.
vertexBuffer
=
sphere_
->
getVBO
();
ro
.
glDraw
Arrays
Instanced
(
GL_TRIANGLES
,
0
,
sphere_
->
getNumTriangles
()
*
3
,
numJoints
);
ro
.
glDrawInstanced
Arrays
(
GL_TRIANGLES
,
0
,
sphere_
->
getNumTriangles
()
*
3
,
numJoints
);
_renderer
->
addRenderObject
(
&
ro
);
...
...
@@ -1051,7 +1051,7 @@ void SkeletonNodeT<SkeletonType>::getRenderObjects(IRenderer* _renderer,
ro
.
vertexDecl
=
&
boneInstanceDecl_
;
ro
.
vertexBuffer
=
cone_
->
getVBO
();
ro
.
glDraw
Arrays
Instanced
(
GL_TRIANGLES
,
0
,
cone_
->
getNumTriangles
()
*
3
,
numBones
);
ro
.
glDrawInstanced
Arrays
(
GL_TRIANGLES
,
0
,
cone_
->
getNumTriangles
()
*
3
,
numBones
);
ro
.
shaderDesc
.
vertexTemplateFile
=
"Skeleton/instanced_wvit_vs.glsl"
;
...
...
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