X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fio%2FTokenStreamReader.hpp;h=ccdad90a376c66f321d08b3d92ead3bb8bd404b9;hb=a19fdf3d9f0d7ecbf6eeeec817856d85049a8336;hp=e2945c40cc2b60880261d7b525f8d852844ae753;hpb=34e833025f0616ab4b86b808d0ce1cc49cecce5d;p=blobs.git diff --git a/src/io/TokenStreamReader.hpp b/src/io/TokenStreamReader.hpp index e2945c4..ccdad90 100644 --- a/src/io/TokenStreamReader.hpp +++ b/src/io/TokenStreamReader.hpp @@ -3,7 +3,7 @@ #include "Token.hpp" #include "Tokenizer.hpp" -#include "../graphics/glm.hpp" +#include "../math/glm.hpp" #include #include @@ -25,6 +25,7 @@ public: void ReadBoolean(bool &); void ReadIdentifier(std::string &); + void ReadNumber(double &); void ReadNumber(float &); void ReadNumber(int &); void ReadNumber(unsigned long &); @@ -34,11 +35,16 @@ public: void ReadVec(glm::vec3 &); void ReadVec(glm::vec4 &); + void ReadVec(glm::dvec2 &); + void ReadVec(glm::dvec3 &); + void ReadVec(glm::dvec4 &); + void ReadVec(glm::ivec2 &); void ReadVec(glm::ivec3 &); void ReadVec(glm::ivec4 &); void ReadQuat(glm::quat &); + void ReadQuat(glm::dquat &); // the Get* functions advance to the next token // the As* functions try to cast the current token @@ -46,6 +52,8 @@ public: bool GetBool(); bool AsBool() const; + double GetDouble(); + double AsDouble() const; float GetFloat(); float AsFloat() const; int GetInt();