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

Fixes for parsing FBX text encoding.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-30 12:53:02 -08:00
parent 910b97de21
commit 181670f5d7
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/renderer/FBXReader.cpp
View file

@ -170,6 +170,7 @@ public:
const QByteArray& getDatum() const { return _datum; } const QByteArray& getDatum() const { return _datum; }
void pushBackToken(int token) { _pushedBackToken = token; } void pushBackToken(int token) { _pushedBackToken = token; }
void ungetChar(char ch) { _device->ungetChar(ch); }
private: private:
@ -221,7 +222,7 @@ int Tokenizer::nextToken() {
_datum.append(ch); _datum.append(ch);
while (_device->getChar(&ch)) { while (_device->getChar(&ch)) {
if (QChar(ch).isSpace() || ch == ';' || ch == ':' || ch == '{' || ch == '}' || ch == ',' || ch == '\"') { if (QChar(ch).isSpace() || ch == ';' || ch == ':' || ch == '{' || ch == '}' || ch == ',' || ch == '\"') {
_device->ungetChar(ch); // read until we encounter a special character, then replace it ungetChar(ch); // read until we encounter a special character, then replace it
break; break;
} }
_datum.append(ch); _datum.append(ch);
@ -257,9 +258,17 @@ FBXNode parseTextFBXNode(Tokenizer& tokenizer) {
expectingDatum = true; expectingDatum = true;
} else if (token == Tokenizer::DATUM_TOKEN && expectingDatum) { } else if (token == Tokenizer::DATUM_TOKEN && expectingDatum) {
node.properties.append(tokenizer.getDatum()); QByteArray datum = tokenizer.getDatum();
expectingDatum = false; if ((token = tokenizer.nextToken()) == ':') {
tokenizer.ungetChar(':');
tokenizer.pushBackToken(Tokenizer::DATUM_TOKEN);
return node;
} else {
tokenizer.pushBackToken(token);
node.properties.append(datum);
expectingDatum = false;
}
} else { } else {
tokenizer.pushBackToken(token); tokenizer.pushBackToken(token);
return node; return node;
@ -377,6 +386,9 @@ glm::mat4 createMat4(const QVector<double>& doubleVector) {
} }
QVector<int> getIntVector(const QVariantList& properties, int index) { QVector<int> getIntVector(const QVariantList& properties, int index) {
if (index >= properties.size()) {
return QVector<int>();
}
QVector<int> vector = properties.at(index).value<QVector<int> >(); QVector<int> vector = properties.at(index).value<QVector<int> >();
if (!vector.isEmpty()) { if (!vector.isEmpty()) {
return vector; return vector;
@ -388,6 +400,9 @@ QVector<int> getIntVector(const QVariantList& properties, int index) {
} }
QVector<double> getDoubleVector(const QVariantList& properties, int index) { QVector<double> getDoubleVector(const QVariantList& properties, int index) {
if (index >= properties.size()) {
return QVector<double>();
}
QVector<double> vector = properties.at(index).value<QVector<double> >(); QVector<double> vector = properties.at(index).value<QVector<double> >();
if (!vector.isEmpty()) { if (!vector.isEmpty()) {
return vector; return vector;