Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:44:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed vec literal values

Browse source
This commit is contained in:
Anthony J. Thibault 2015-11-02 20:46:29 -08:00
parent 32c40d37c0
commit a80ab0003c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/animation/src/AnimExpression.h
View file

@ -12,7 +12,6 @@
#define hifi_AnimExpression #define hifi_AnimExpression
#include <QString> #include <QString>
#include <QVector>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
@ -53,11 +52,7 @@ protected:
QString strVal; QString strVal;
int intVal; int intVal;
float floatVal; float floatVal;
glm::vec3 vec3Val;
glm::vec4 vec4Val;
glm::quat quatVal;
}; };
bool parseExpression(const QString& str);
Token consumeToken(const QString& str, QString::const_iterator& iter) const; Token consumeToken(const QString& str, QString::const_iterator& iter) const;
Token consumeIdentifier(const QString& str, QString::const_iterator& iter) const; Token consumeIdentifier(const QString& str, QString::const_iterator& iter) const;
Token consumeNumber(const QString& str, QString::const_iterator& iter) const; Token consumeNumber(const QString& str, QString::const_iterator& iter) const;
@ -67,6 +62,8 @@ protected:
Token consumeLessThan(const QString& str, QString::const_iterator& iter) const; Token consumeLessThan(const QString& str, QString::const_iterator& iter) const;
Token consumeNot(const QString& str, QString::const_iterator& iter) const; Token consumeNot(const QString& str, QString::const_iterator& iter) const;
bool parseExpression(const QString& str);
QString _expression; QString _expression;
}; };