manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed nanoply build

This commit is contained in:
Luigi Malomo 2019-11-21 17:09:05 +01:00
parent 303c4d14b5
commit 9c1fbc085c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/sample/common.pri
View File

@ -6,3 +6,8 @@ TEMPLATE = app
CONFIG -= app_bundle CONFIG -= app_bundle
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
unix {
CONFIG(release, debug|release) {
DEFINES *= NDEBUG
}
}

4
wrap/nanoply/nanoply_demo/main.cpp
View File

@ -91,7 +91,7 @@ public:
float norm[] = { 0.57735, 0.57735, 0.57735, -0.57735, 0.57735, -0.57735, -0.57735, -0.57735, 0.57735, 0.57735, -0.57735, -0.57735 }; float norm[] = { 0.57735, 0.57735, 0.57735, -0.57735, 0.57735, -0.57735, -0.57735, -0.57735, 0.57735, 0.57735, -0.57735, -0.57735 };
unsigned char color[] = { 68, 68, 68, 255, 177, 68, 177, 255, 177, 177, 68, 255, 68, 177, 177 }; unsigned char color[] = { 68, 68, 68, 255, 177, 68, 177, 255, 177, 177, 68, 255, 68, 177, 177 };
float density[] = { 3.5, 2.0, 4.0, 3.0 }; float density[] = { 3.5, 2.0, 4.0, 3.0 };
float materialId[] = { 1, 0, -1, 1 }; int materialId[] = { 1, 0, -1, 1 };
float materialValue[] = { 0.2, 0.3, 0.2, 0.5, 0.5, 0.6, 20.0, 0.1, 0.1, 0.1, 0.7, 0.5, 0.4, 1.0 }; float materialValue[] = { 0.2, 0.3, 0.2, 0.5, 0.5, 0.6, 20.0, 0.1, 0.1, 0.1, 0.7, 0.5, 0.4, 1.0 };
coordVec.push_back(Point3f(pos, 3)); coordVec.push_back(Point3f(&pos[3], 3)); coordVec.push_back(Point3f(&pos[6], 3)); coordVec.push_back(Point3f(&pos[9], 3)); coordVec.push_back(Point3f(pos, 3)); coordVec.push_back(Point3f(&pos[3], 3)); coordVec.push_back(Point3f(&pos[6], 3)); coordVec.push_back(Point3f(&pos[9], 3));
normalVec.push_back(Point3f(norm, 3)); normalVec.push_back(Point3f(&norm[3], 3)); normalVec.push_back(Point3f(&norm[6], 3)); normalVec.push_back(Point3f(&norm[9], 3)); normalVec.push_back(Point3f(norm, 3)); normalVec.push_back(Point3f(&norm[3], 3)); normalVec.push_back(Point3f(&norm[6], 3)); normalVec.push_back(Point3f(&norm[9], 3));
@ -138,7 +138,7 @@ bool Load(const char* filename, MyMesh& mesh)
mesh.infoVec.resize(vertCnt); mesh.infoVec.resize(vertCnt);
int faceCnt = info.GetFaceCount(); int faceCnt = info.GetFaceCount();
mesh.faceIndex.resize(faceCnt); mesh.faceIndex.resize(faceCnt);
int materialCnt = info.GetElementCount(std::string("material")); size_t materialCnt = info.GetElementCount(std::string("material"));
mesh.material.resize(2); mesh.material.resize(2);
//Create the vertex properties descriptor (what ply property and where to save its data) //Create the vertex properties descriptor (what ply property and where to save its data)