Move NIFStream functions into a cpp file where they belong

components/CMakeLists.txt

@@ -19,7 +19,7 @@ add_component_dir (bsa
     )
 
 add_component_dir (nif
-    controlled effect niftypes record controller extra node record_ptr data niffile property nifkey data node base
+    controlled effect niftypes record controller extra node record_ptr data niffile property nifkey data node base nifstream
     )
 
 add_component_dir (nifcache

components/nif/nifstream.cpp

@@ -0,0 +1,137 @@
+#include "nifstream.hpp"
+//For error reporting
+#include "niffile.hpp"
+
+namespace Nif
+{
+
+//Private functions
+uint8_t NIFStream::read_byte()
+{
+    uint8_t byte;
+    if(inp->read(&byte, 1) != 1) return 0;
+    return byte;
+}
+uint16_t NIFStream::read_le16()
+{
+    uint8_t buffer[2];
+    if(inp->read(buffer, 2) != 2) return 0;
+    return buffer[0] | (buffer[1]<<8);
+}
+uint32_t NIFStream::read_le32()
+{
+    uint8_t buffer[4];
+    if(inp->read(buffer, 4) != 4) return 0;
+    return buffer[0] | (buffer[1]<<8) | (buffer[2]<<16) | (buffer[3]<<24);
+}
+float NIFStream::read_le32f()
+{
+    union {
+        uint32_t i;
+        float f;
+    } u = { read_le32() };
+    return u.f;
+}
+
+//Public functions
+Ogre::Vector2 NIFStream::getVector2()
+{
+    float a[2];
+    for(size_t i = 0;i < 2;i++)
+        a[i] = getFloat();
+    return Ogre::Vector2(a);
+}
+Ogre::Vector3 NIFStream::getVector3()
+{
+    float a[3];
+    for(size_t i = 0;i < 3;i++)
+        a[i] = getFloat();
+    return Ogre::Vector3(a);
+}
+Ogre::Vector4 NIFStream::getVector4()
+{
+    float a[4];
+    for(size_t i = 0;i < 4;i++)
+        a[i] = getFloat();
+    return Ogre::Vector4(a);
+}
+Ogre::Matrix3 NIFStream::getMatrix3()
+{
+    Ogre::Real a[3][3];
+    for(size_t i = 0;i < 3;i++)
+    {
+        for(size_t j = 0;j < 3;j++)
+            a[i][j] = Ogre::Real(getFloat());
+    }
+    return Ogre::Matrix3(a);
+}
+Ogre::Quaternion NIFStream::getQuaternion()
+{
+    float a[4];
+    for(size_t i = 0;i < 4;i++)
+        a[i] = getFloat();
+    return Ogre::Quaternion(a);
+}
+Transformation NIFStream::getTrafo()
+{
+    Transformation t;
+    t.pos = getVector3();
+    t.rotationScale = getMatrix3();
+    t.scale = getFloat();
+    return t;
+}
+
+std::string NIFStream::getString(size_t length)
+{
+    std::vector<char> str (length+1, 0);
+
+    if(inp->read(&str[0], length) != length)
+        throw std::runtime_error (":  String length in NIF file "+ file->getFilename() +" does not match!  Expected length:  "
+            + Ogre::StringConverter::toString(length));
+
+    return &str[0];
+}
+std::string NIFStream::getString()
+{
+    size_t size = read_le32();
+    return getString(size);
+}
+
+void NIFStream::getShorts(std::vector<short> &vec, size_t size)
+{
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getShort();
+}
+void NIFStream::getFloats(std::vector<float> &vec, size_t size)
+{
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getFloat();
+}
+void NIFStream::getVector2s(std::vector<Ogre::Vector2> &vec, size_t size)
+{
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector2();
+}
+void NIFStream::getVector3s(std::vector<Ogre::Vector3> &vec, size_t size)
+{
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector3();
+}
+void NIFStream::getVector4s(std::vector<Ogre::Vector4> &vec, size_t size)
+{
+    vec.resize(size);
+    for(size_t i = 0;i < vec.size();i++)
+        vec[i] = getVector4();
+}
+void NIFStream::getQuaternions(std::vector<Ogre::Quaternion> &quat, size_t size)
+{
+    quat.resize(size);
+    for(size_t i = 0;i < quat.size();i++)
+        quat[i] = getQuaternion();
+}
+
+}

components/nif/nifstream.hpp

@@ -26,32 +26,10 @@ class NIFStream {
     /// Input stream
     Ogre::DataStreamPtr inp;
 
-    uint8_t read_byte()
+    uint8_t read_byte();
-    {
+    uint16_t read_le16();
-        uint8_t byte;
+    uint32_t read_le32();
-        if(inp->read(&byte, 1) != 1) return 0;
+    float read_le32f();
-        return byte;
-    }
-    uint16_t read_le16()
-    {
-        uint8_t buffer[2];
-        if(inp->read(buffer, 2) != 2) return 0;
-        return buffer[0] | (buffer[1]<<8);
-    }
-    uint32_t read_le32()
-    {
-        uint8_t buffer[4];
-        if(inp->read(buffer, 4) != 4) return 0;
-        return buffer[0] | (buffer[1]<<8) | (buffer[2]<<16) | (buffer[3]<<24);
-    }
-    float read_le32f()
-    {
-        union {
-            uint32_t i;
-            float f;
-        } u = { read_le32() };
-        return u.f;
-    }
 
 public:
 
@@ -91,105 +69,25 @@ public:
     int getInt() { return read_le32(); }
     int getUInt() { return read_le32(); }
     float getFloat() { return read_le32f(); }
-    Ogre::Vector2 getVector2()
-    {
-        float a[2];
-        for(size_t i = 0;i < 2;i++)
-            a[i] = getFloat();
-        return Ogre::Vector2(a);
-    }
-    Ogre::Vector3 getVector3()
-    {
-        float a[3];
-        for(size_t i = 0;i < 3;i++)
-            a[i] = getFloat();
-        return Ogre::Vector3(a);
-    }
-    Ogre::Vector4 getVector4()
-    {
-        float a[4];
-        for(size_t i = 0;i < 4;i++)
-            a[i] = getFloat();
-        return Ogre::Vector4(a);
-    }
-    Ogre::Matrix3 getMatrix3()
-    {
-        Ogre::Real a[3][3];
-        for(size_t i = 0;i < 3;i++)
-        {
-            for(size_t j = 0;j < 3;j++)
-                a[i][j] = Ogre::Real(getFloat());
-        }
-        return Ogre::Matrix3(a);
-    }
-    Ogre::Quaternion getQuaternion()
-    {
-        float a[4];
-        for(size_t i = 0;i < 4;i++)
-            a[i] = getFloat();
-        return Ogre::Quaternion(a);
-    }
-    Transformation getTrafo()
-    {
-        Transformation t;
-        t.pos = getVector3();
-        t.rotationScale = getMatrix3();
-        t.scale = getFloat();
-        return t;
-    }
 
-    std::string getString(size_t length)
+    Ogre::Vector2 getVector2();
-    {
+    Ogre::Vector3 getVector3();
-        std::vector<char> str (length+1, 0);
+    Ogre::Vector4 getVector4();
+    Ogre::Matrix3 getMatrix3();
+    Ogre::Quaternion getQuaternion();
+    Transformation getTrafo();
 
-        if(inp->read(&str[0], length) != length)
+    ///Read in a string of the given length
-            throw std::runtime_error (":  String length in NIF file "+ file->getFilename() +" does not match!  Expected length:  "
+    std::string getString(size_t length);
-                + Ogre::StringConverter::toString(length));
+    ///Read in a string of the length specified in the file
+    std::string getString();
 
-        return &str[0];
+    void getShorts(std::vector<short> &vec, size_t size);
-    }
+    void getFloats(std::vector<float> &vec, size_t size);
-    std::string getString()
+    void getVector2s(std::vector<Ogre::Vector2> &vec, size_t size);
-    {
+    void getVector3s(std::vector<Ogre::Vector3> &vec, size_t size);
-        size_t size = read_le32();
+    void getVector4s(std::vector<Ogre::Vector4> &vec, size_t size);
-        return getString(size);
+    void getQuaternions(std::vector<Ogre::Quaternion> &quat, size_t size);
-    }
-
-    void getShorts(std::vector<short> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getShort();
-    }
-    void getFloats(std::vector<float> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getFloat();
-    }
-    void getVector2s(std::vector<Ogre::Vector2> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector2();
-    }
-    void getVector3s(std::vector<Ogre::Vector3> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector3();
-    }
-    void getVector4s(std::vector<Ogre::Vector4> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector4();
-    }
-    void getQuaternions(std::vector<Ogre::Quaternion> &quat, size_t size)
-    {
-        quat.resize(size);
-        for(size_t i = 0;i < quat.size();i++)
-            quat[i] = getQuaternion();
-    }
 };
 
 }