Commit b8a5afc5 authored by Robert Menzel's avatar Robert Menzel
Browse files

Merge branch 'experimental' of file:///data/git-repository/acgl/libraries/acgl into experimental

parents ed81dd08 c04520c4
...@@ -67,7 +67,7 @@ ADD_DEFINITIONS(${ACGL_DEFINES}) ...@@ -67,7 +67,7 @@ ADD_DEFINITIONS(${ACGL_DEFINES})
################################################################################ ################################################################################
# Qt # Qt
IF(DEFINED ACGL_COMPILE_WITH_QT) IF(ACGL_COMPILE_WITH_QT)
#MESSAGE("QT") #MESSAGE("QT")
SET(QT_USE_QTOPENGL TRUE) SET(QT_USE_QTOPENGL TRUE)
FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Qt4 REQUIRED)
......
...@@ -113,6 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c ...@@ -113,6 +113,7 @@ SharedGeometryData loadGeometryDataFromVAP(const std::string& _filename, bool _c
int texCoordDimension = -1; int texCoordDimension = -1;
int normalDimension = 3; int normalDimension = 3;
int metaDataDimension = 4; int metaDataDimension = 4;
(void)sizeof(metaDataDimension);
std::vector<glm::vec4> positionData; std::vector<glm::vec4> positionData;
std::vector<glm::vec3> texCoordData; std::vector<glm::vec3> texCoordData;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment