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
b8a5afc5
Commit
b8a5afc5
authored
Apr 25, 2013
by
Robert Menzel
Browse files
Merge branch 'experimental' of
file:///data/git-repository/acgl/libraries/acgl
into experimental
parents
ed81dd08
c04520c4
Changes
2
Show whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b8a5afc5
...
...
@@ -67,7 +67,7 @@ ADD_DEFINITIONS(${ACGL_DEFINES})
################################################################################
# Qt
IF
(
DEFINED
ACGL_COMPILE_WITH_QT
)
IF
(
ACGL_COMPILE_WITH_QT
)
#MESSAGE("QT")
SET
(
QT_USE_QTOPENGL TRUE
)
FIND_PACKAGE
(
Qt4 REQUIRED
)
...
...
src/ACGL/OpenGL/Data/GeometryDataLoadStoreVAP.cc
View file @
b8a5afc5
...
...
@@ -113,6 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c
int
texCoordDimension
=
-
1
;
int
normalDimension
=
3
;
int
metaDataDimension
=
4
;
(
void
)
sizeof
(
metaDataDimension
);
std
::
vector
<
glm
::
vec4
>
positionData
;
std
::
vector
<
glm
::
vec3
>
texCoordData
;
...
...
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