From a80ab0003c424e3c85ef36424a58e14f08f9b4c1 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 2 Nov 2015 20:46:29 -0800 Subject: [PATCH] Removed vec literal values --- libraries/animation/src/AnimExpression.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/animation/src/AnimExpression.h b/libraries/animation/src/AnimExpression.h index 7ba099ce2e..145350547b 100644 --- a/libraries/animation/src/AnimExpression.h +++ b/libraries/animation/src/AnimExpression.h @@ -12,7 +12,6 @@ #define hifi_AnimExpression #include -#include #include #include @@ -53,11 +52,7 @@ protected: QString strVal; int intVal; 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 consumeIdentifier(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 consumeNot(const QString& str, QString::const_iterator& iter) const; + bool parseExpression(const QString& str); + QString _expression; };