Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 11:59:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stupid tabs.

Browse source
This commit is contained in:
trent 2017-07-20 11:40:42 -04:00
parent 786535a001
commit ff3e9263ef
2 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
libraries/fbx/src/OBJReader.cpp
View file

@ -124,31 +124,31 @@ glm::vec3 OBJTokenizer::getVec3() {
return v; return v;
} }
bool OBJTokenizer::getVec3Vec3(glm::vec3& vertex, glm::vec3& vertexColor) { bool OBJTokenizer::getVec3Vec3(glm::vec3& vertex, glm::vec3& vertexColor) {
// Used for vertices which may also have a vertex color (RGB [0,1]) to follow. // Used for vertices which may also have a vertex color (RGB [0,1]) to follow.
// NOTE: Returns true if there is a vertex color. // NOTE: Returns true if there is a vertex color.
auto x = getFloat(); // N.B.: getFloat() has side-effect auto x = getFloat(); // N.B.: getFloat() has side-effect
auto y = getFloat(); // And order of arguments is different on Windows/Linux. auto y = getFloat(); // And order of arguments is different on Windows/Linux.
auto z = getFloat(); auto z = getFloat();
vertex = glm::vec3(x, y, z); vertex = glm::vec3(x, y, z);
auto r = 1.0f, g = 1.0f, b = 1.0f; auto r = 1.0f, g = 1.0f, b = 1.0f;
bool hasVertexColor = false; bool hasVertexColor = false;
if (isNextTokenFloat()) { if (isNextTokenFloat()) {
// If there's another float it's one of two things: a W component or an R component. The standard OBJ spec doesn't output a W component, // If there's another float it's one of two things: a W component or an R component. The standard OBJ spec doesn't output a W component,
// so we're making the assumption that if a float follows (unless it's only a single value) that it's a vertex color. // so we're making the assumption that if a float follows (unless it's only a single value) that it's a vertex color.
r = getFloat(); r = getFloat();
if(isNextTokenFloat()) { if(isNextTokenFloat()) {
// Safe to assume the following values are the green/blue components. // Safe to assume the following values are the green/blue components.
g = getFloat(); g = getFloat();
b = getFloat(); b = getFloat();
hasVertexColor = true; hasVertexColor = true;
} }
vertexColor = glm::vec3(r, g, b); vertexColor = glm::vec3(r, g, b);
} }
return hasVertexColor; return hasVertexColor;
} }
glm::vec2 OBJTokenizer::getVec2() { glm::vec2 OBJTokenizer::getVec2() {
float uCoord = getFloat(); float uCoord = getFloat();
@ -410,14 +410,14 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
#endif #endif
} }
} else if (token == "v") { } else if (token == "v") {
glm::vec3 vertex, vertexColor; glm::vec3 vertex, vertexColor;
bool hasVertexColor = tokenizer.getVec3Vec3(vertex, vertexColor); bool hasVertexColor = tokenizer.getVec3Vec3(vertex, vertexColor);
vertices.append(vertex); vertices.append(vertex);
if(hasVertexColor) { if(hasVertexColor) {
vertexColors.append(vertexColor); vertexColors.append(vertexColor);
} }
} else if (token == "vn") { } else if (token == "vn") {
normals.append(tokenizer.getVec3()); normals.append(tokenizer.getVec3());
} else if (token == "vt") { } else if (token == "vt") {
@ -575,14 +575,14 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
glm::vec3 v1 = checked_at(vertices, face.vertexIndices[1]); glm::vec3 v1 = checked_at(vertices, face.vertexIndices[1]);
glm::vec3 v2 = checked_at(vertices, face.vertexIndices[2]); glm::vec3 v2 = checked_at(vertices, face.vertexIndices[2]);
glm::vec3 vc0, vc1, vc2; glm::vec3 vc0, vc1, vc2;
bool hasVertexColors = ( vertexColors.size( ) > 0 ); bool hasVertexColors = ( vertexColors.size( ) > 0 );
if(hasVertexColors) { if(hasVertexColors) {
// If there are any vertex colors, it's safe to assume all meshes had them exported. // If there are any vertex colors, it's safe to assume all meshes had them exported.
vc0 = checked_at(vertexColors, face.vertexIndices[0]); vc0 = checked_at(vertexColors, face.vertexIndices[0]);
vc1 = checked_at(vertexColors, face.vertexIndices[1]); vc1 = checked_at(vertexColors, face.vertexIndices[1]);
vc2 = checked_at(vertexColors, face.vertexIndices[2]); vc2 = checked_at(vertexColors, face.vertexIndices[2]);
} }
// Scale the vertices if the OBJ file scale is specified as non-one. // Scale the vertices if the OBJ file scale is specified as non-one.
if (scaleGuess != 1.0f) { if (scaleGuess != 1.0f) {
@ -599,12 +599,12 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
meshPart.triangleIndices.append(mesh.vertices.count()); meshPart.triangleIndices.append(mesh.vertices.count());
mesh.vertices << v2; mesh.vertices << v2;
if( hasVertexColors ) { if( hasVertexColors ) {
// Add vertex colors. // Add vertex colors.
mesh.colors << vc0; mesh.colors << vc0;
mesh.colors << vc1; mesh.colors << vc1;
mesh.colors << vc2; mesh.colors << vc2;
} }
glm::vec3 n0, n1, n2; glm::vec3 n0, n1, n2;
if (face.normalIndices.count()) { if (face.normalIndices.count()) {
@ -740,8 +740,8 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
qCDebug(modelformat) << " offset =" << fbxgeo.offset; qCDebug(modelformat) << " offset =" << fbxgeo.offset;
qCDebug(modelformat) << " meshes.count() =" << fbxgeo.meshes.count(); qCDebug(modelformat) << " meshes.count() =" << fbxgeo.meshes.count();
foreach (FBXMesh mesh, fbxgeo.meshes) { foreach (FBXMesh mesh, fbxgeo.meshes) {
qCDebug(modelformat) << " vertices.count() =" << mesh.vertices.count(); qCDebug(modelformat) << " vertices.count() =" << mesh.vertices.count();
qCDebug(modelformat) << " colors.count() =" << mesh.colors.count(); qCDebug(modelformat) << " colors.count() =" << mesh.colors.count();
qCDebug(modelformat) << " normals.count() =" << mesh.normals.count(); qCDebug(modelformat) << " normals.count() =" << mesh.normals.count();
/*if (mesh.normals.count() == mesh.vertices.count()) { /*if (mesh.normals.count() == mesh.vertices.count()) {
for (int i = 0; i < mesh.normals.count(); i++) { for (int i = 0; i < mesh.normals.count(); i++) {

8
libraries/fbx/src/OBJReader.h
View file

@ -19,8 +19,8 @@ public:
void pushBackToken(int token) { _pushedBackToken = token; } void pushBackToken(int token) { _pushedBackToken = token; }
void ungetChar(char ch) { _device->ungetChar(ch); } void ungetChar(char ch) { _device->ungetChar(ch); }
const QString getComment() const { return _comment; } const QString getComment() const { return _comment; }
glm::vec3 getVec3(); glm::vec3 getVec3();
bool getVec3Vec3(glm::vec3& vertex, glm::vec3& vertexColor); bool getVec3Vec3(glm::vec3& vertex, glm::vec3& vertexColor);
glm::vec2 getVec2(); glm::vec2 getVec2();
float getFloat() { return std::stof((nextToken() != OBJTokenizer::DATUM_TOKEN) ? nullptr : getDatum().data()); } float getFloat() { return std::stof((nextToken() != OBJTokenizer::DATUM_TOKEN) ? nullptr : getDatum().data()); }
@ -66,8 +66,8 @@ class OBJReader: public QObject { // QObject so we can make network requests.
Q_OBJECT Q_OBJECT
public: public:
typedef QVector<OBJFace> FaceGroup; typedef QVector<OBJFace> FaceGroup;
QVector<glm::vec3> vertices; QVector<glm::vec3> vertices;
QVector<glm::vec3> vertexColors; QVector<glm::vec3> vertexColors;
QVector<glm::vec2> textureUVs; QVector<glm::vec2> textureUVs;
QVector<glm::vec3> normals; QVector<glm::vec3> normals;
QVector<FaceGroup> faceGroups; QVector<FaceGroup> faceGroups;