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
ce133354
Commit
ce133354
authored
Aug 24, 2012
by
Robert Menzel
Browse files
reduced warnings
parent
06ea7ae9
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/ACGL/OpenGL/Objects/VertexArrayObject.hh
View file @
ce133354
...
...
@@ -131,7 +131,7 @@ public:
uint32_t
_arrayBufferAttribute
,
GLint
_attributeLocation
=
-
1
)
{
Attribute
newAttribute
=
{
_arrayBuffer
,
_arrayBufferAttribute
};
Attribute
newAttribute
=
{
_arrayBuffer
,
(
int32_t
)
_arrayBufferAttribute
};
attachAttribute
(
newAttribute
,
_attributeLocation
);
}
...
...
src/ACGL/OpenGL/Controller/GeometryDataControlFileATB.cc
View file @
ce133354
...
...
@@ -157,7 +157,7 @@ bool GeometryDataControlFileATB::load(SharedGeometryData& _geometry) const
std
::
memcpy
(
data
,
&
dataVector
[
0
],
dataVector
.
size
()
*
sizeof
(
GLfloat
));
// Name the attribute according to the filename
ArrayBuffer
::
Attribute
attr
=
{
mAttributeName
,
GL_FLOAT
,
attributeDimension
,
0
,
GL_FALSE
,
0
,
GL_FALSE
};
ArrayBuffer
::
Attribute
attr
=
{
mAttributeName
,
GL_FLOAT
,
(
int_t
)
attributeDimension
,
0
,
GL_FALSE
,
0
,
GL_FALSE
};
_geometry
->
mAttributes
.
push_back
(
attr
);
// Tell the _geometry object where it finds the data
...
...
src/ACGL/OpenGL/Controller/GeometryDataControlFileOBJ.cc
View file @
ce133354
...
...
@@ -291,7 +291,7 @@ bool GeometryDataControlFileOBJ::load(SharedGeometryData& geometry) const
if
(
texCoordDimension
>
0
)
{
int
offset
=
(
hasNormals
?
7
:
4
);
offset
*=
sizeof
(
float
);
ArrayBuffer
::
Attribute
atex
=
{
"aTexCoord"
,
GL_FLOAT
,
texCoordDimension
,
offset
,
GL_FALSE
,
0
,
GL_FALSE
};
ArrayBuffer
::
Attribute
atex
=
{
"aTexCoord"
,
GL_FLOAT
,
(
int_t
)
texCoordDimension
,
(
GLuint
)
offset
,
GL_FALSE
,
0
,
GL_FALSE
};
geometry
->
mAttributes
.
push_back
(
atex
);
}
...
...
Write
Preview
Supports
Markdown
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