Fixed StaticModel rotation

CMakeLists.txt

@@ -111,18 +111,19 @@ if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
 
     # Target for running cppcheck
     set (CHECK_STD "--std=c++11" "--std=posix")
-    set (CHECK_FLAGS "--quiet" "--force")
+    set (CHECK_FLAGS "--quiet" "--force" "-I${PROJECT_SOURCE_DIR}/include")
+    set (CHECK_FLAGS ${CHECK_FLAGS} "-i${PROJECT_SOURCE_DIR}/src/deps")
     set (CHECK_NORMAL "--enable=information,warning,performance,portability")
     set (CHECK_FULL "--enable=all")
     set (CHECK_CONFIG "--check-config")
     add_custom_target (cppcheck echo "Running cppcheck..."
-        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_NORMAL} ${PROJECT_SOURCE_DIR}
+        COMMAND cppcheck ${CHECK_FLAGS} ${CHECK_STD} ${CHECK_NORMAL} ${PROJECT_SOURCE_DIR}
     )
     add_custom_target (cppcheckFull echo "Running full cppcheck..."
-        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_STD} ${CHECK_FULL} ${PROJECT_SOURCE_DIR}
+        COMMAND cppcheck ${CHECK_FLAGS} ${CHECK_STD} ${CHECK_FULL} ${PROJECT_SOURCE_DIR}
     )
     add_custom_target (cppcheckConfig echo "Checking cppcheck config..."
-        COMMAND cppcheck ${CHECK_FLAGS} "-I${PROJECT_SOURCE_DIR}/include" ${CHECK_CONFIG} ${PROJECT_SOURCE_DIR}
+        COMMAND cppcheck ${CHECK_FLAGS} ${CHECK_CONFIG} ${PROJECT_SOURCE_DIR}
     )
 
     #################################################################

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141220 ]
+    * Fixed Room StaticModel rotation
+
     [ 20141217 ]
     * Introduced texel-offset in getUV() in an attempt to fix the texture-bleeding
     * Mesh is now called RoomMesh

README.md

@@ -39,16 +39,16 @@ A more or less recent [Doxygen documentation](http://xythobuz.github.io/OpenRaid
 Basically, OpenRaider depends on the following:
 
 * C++11 compiler
-* cmake
-* OpenGL
-* GLM
+* cmake (>= 2.8.8)
+* OpenGL (3.3 Core Profile compatible)
+* GLM (>= 0.9.6)
 * zlib
-* SDL2
-* SDL2-TTF (optional, needed if you want to use TTF fonts)
+* SDL2 or GLFW
+* SDL2-TTF (optional, doesn’t work with GLFW, needed if you want to use TTF fonts)
 * OpenAL & ALUT (optional, needed for sound output)
 * libpng (optional)
 
-On Mac OS X 10.9 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
+On Mac OS X 10.9 / 10.10 with [XCode](https://developer.apple.com/xcode/) and [MacPorts](http://www.macports.org) installed, the following should be enough to get all dependencies that are available as port:
 
     sudo port install cmake zlib glm libsdl2 libsdl2_ttf
 

include/Room.h

@@ -23,8 +23,10 @@ enum RoomFlags {
 
 class Room {
   public:
-    Room(glm::vec3 _pos, BoundingBox* _bbox, RoomMesh* _mesh, unsigned int f)
-        : pos(_pos), bbox(_bbox), mesh(_mesh), flags(f) { }
+    Room(glm::vec3 _pos, BoundingBox* _bbox, RoomMesh* _mesh, unsigned int f,
+         int a, int x, int z)
+       : pos(_pos), bbox(_bbox), mesh(_mesh), flags(f), alternateRoom(a),
+         numXSectors(x), numZSectors(z) { }
 
     void prepare() { mesh->prepare(); }
     void display(glm::mat4 view, glm::mat4 projection);
@@ -39,18 +41,11 @@ class Room {
     BoundingBox& getBoundingBox() { return *bbox; }
     RoomMesh& getMesh() { return *mesh; }
 
-    void setNumXSectors(unsigned int n) { numXSectors = n; }
     unsigned int getNumXSectors() { return numXSectors; }
-
-    void setNumZSectors(unsigned int n) { numZSectors = n; }
     unsigned int getNumZSectors() { return numZSectors; }
 
     unsigned int getFlags() { return flags; }
 
-    unsigned long sizeAdjacentRooms();
-    long getAdjacentRoom(unsigned long index);
-    void addAdjacentRoom(long r);
-
     unsigned long sizePortals();
     Portal& getPortal(unsigned long index);
     void addPortal(Portal* p);
@@ -77,10 +72,10 @@ class Room {
     std::unique_ptr<RoomMesh> mesh;
 
     unsigned int flags;
-    unsigned int numXSectors;
-    unsigned int numZSectors;
+    int numXSectors;
+    int numZSectors;
+    int alternateRoom;
 
-    std::vector<long> adjacentRooms;
     std::vector<std::unique_ptr<Sprite>> sprites;
     std::vector<std::unique_ptr<StaticModel>> models;
     std::vector<std::unique_ptr<Portal>> portals;

include/SkeletalModel.h

@@ -59,13 +59,11 @@ class AnimationFrame {
 
 class SkeletalModel {
   public:
-    SkeletalModel(int i);
+    SkeletalModel(int i) : id(i) { }
     ~SkeletalModel();
     void display(unsigned long aframe, unsigned long bframe);
 
-    int getId();
-    void setPigTail(bool b);
-    void setPonyPos(float x, float y, float z, float angle);
+    int getId() { return id; }
 
     unsigned long size();
     AnimationFrame& get(unsigned long i);
@@ -73,15 +71,6 @@ class SkeletalModel {
 
   private:
     int id;
-    bool tr4Overlay;
-    bool pigtails;
-    long ponytailId;
-    float ponytail[3];
-    long ponytailMeshId;
-    unsigned int ponytailNumMeshes;
-    float ponytailAngle;
-    float ponyOff;
-    float ponyOff2;
     std::vector<AnimationFrame*> animation;
 };
 

include/commands/CommandGame.h

@@ -24,19 +24,5 @@ class CommandViewmodel : public Command {
     virtual int execute(std::istream& args);
 };
 
-class CommandPigtail : public Command {
-  public:
-    virtual std::string name();
-    virtual std::string brief();
-    virtual int execute(std::istream& args);
-};
-
-class CommandPonypos : public Command {
-  public:
-    virtual std::string name();
-    virtual std::string brief();
-    virtual int execute(std::istream& args);
-};
-
 #endif
 

src/Menu.cpp

@@ -100,14 +100,14 @@ void Menu::displayDialog() {
             w1 = wMax;
         unsigned int h1 = Font::heightText(1.0f, w1, dialogButton1) + 10;
 
-        unsigned int wOverlay = wMax, hOverlay, w2 = 0, h2 = 0;
+        unsigned int wOverlay = wMax, hOverlay, w2 = 0;
 
         if (dialogButton2.length() > 0) {
             // Show text and two buttons
             w2 = Font::widthText(1.0f, dialogButton2) + 20;
             if (w2 > wMax)
                 w2 = wMax;
-            h2 = Font::heightText(1.0f, w2, dialogButton2) + 10;
+            unsigned int h2 = Font::heightText(1.0f, w2, dialogButton2) + 10;
 
             if (w0 > (w1 + w2)) {
                 if (w0 < wMax) {

src/Render.cpp

@@ -95,6 +95,7 @@ void Render::display() {
 }
 
 void Render::screenShot(const char* filenameBase) {
+    /*
     int sz = getWindow().getWidth() * getWindow().getHeight();
     unsigned char* image = new unsigned char[sz * 3];
     static int count = 0;
@@ -115,10 +116,11 @@ void Render::screenShot(const char* filenameBase) {
         }
     }
 
-    //glReadPixels(0, 0, getWindow().getWidth(), getWindow().getHeight(), GL_BGR_EXT, GL_UNSIGNED_BYTE,
-    //             image);
-    //tgaSave(filename.str().c_str(), image, getWindow().getWidth(), getWindow().getHeight(), 0);
+    glReadPixels(0, 0, getWindow().getWidth(), getWindow().getHeight(), GL_BGR_EXT, GL_UNSIGNED_BYTE,
+                 image);
+    tgaSave(filename.str().c_str(), image, getWindow().getWidth(), getWindow().getHeight(), 0);
     delete [] image;
+    */
 }
 
 void Render::drawTexture(float x, float y, float w, float h, glm::vec4 color,

src/Room.cpp

@@ -87,19 +87,6 @@ int Room::getAdjoiningRoom(float x, float y, float z,
 
 // --------------------------------------
 
-unsigned long Room::sizeAdjacentRooms() {
-    return adjacentRooms.size();
-}
-
-long Room::getAdjacentRoom(unsigned long index) {
-    assert(index < adjacentRooms.size());
-    return adjacentRooms.at(index);
-}
-
-void Room::addAdjacentRoom(long r) {
-    adjacentRooms.emplace_back(r);
-}
-
 unsigned long Room::sizePortals() {
     return portals.size();
 }

src/RoomMesh.cpp

@@ -75,21 +75,23 @@ void RoomMesh::prepare() {
 void RoomMesh::display(glm::mat4 model, glm::mat4 view, glm::mat4 projection) {
     glm::mat4 MVP = projection * view * model;
 
-    unsigned int indexStart = 0;
-    unsigned int indexPos = 1;
-    unsigned int texture = textures.at(indices.at(0));
-
-    while ((indexStart != indexPos) && (indexPos < indices.size())) {
-        while ((indexPos < indices.size()) && (textures.at(indices.at(indexPos)) == texture))
-            indexPos++;
-
-        std::vector<unsigned short> ind(indices.begin() + indexStart, indices.begin() + indexPos);
-        Window::drawGL(vertices, uvs, ind, MVP, texture);
-
-        if (indexPos < indices.size()) {
-            indexStart = indexPos;
-            indexPos += 1;
-            texture = textures.at(indices.at(indexStart));
+    if (indices.size() > 0) {
+        unsigned int indexStart = 0;
+        unsigned int indexPos = 1;
+        unsigned int texture = textures.at(indices.at(0));
+
+        while ((indexStart != indexPos) && (indexPos < indices.size())) {
+            while ((indexPos < indices.size()) && (textures.at(indices.at(indexPos)) == texture))
+                indexPos++;
+
+            std::vector<unsigned short> ind(indices.begin() + indexStart, indices.begin() + indexPos);
+            Window::drawGL(vertices, uvs, ind, MVP, texture);
+
+            if (indexPos < indices.size()) {
+                indexStart = indexPos;
+                indexPos += 1;
+                texture = textures.at(indices.at(indexStart));
+            }
         }
     }
 }

src/SkeletalModel.cpp

@@ -102,10 +102,6 @@ void AnimationFrame::add(BoneFrame* f) {
 
 // ----------------------------------------------------------------------------
 
-SkeletalModel::SkeletalModel(int i) {
-    id = i;
-}
-
 SkeletalModel::~SkeletalModel() {
     for (unsigned long i = 0; i < animation.size(); i++)
         delete animation[i];
@@ -152,28 +148,6 @@ void SkeletalModel::display(unsigned long aframe, unsigned long bframe) {
     */
 }
 
-int SkeletalModel::getId() {
-    return id;
-}
-
-void SkeletalModel::setPigTail(bool b) {
-    pigtails = b;
-    if (b) {
-        ponyOff -= 20;
-        ponytail[1] -= 32;
-    } else {
-        ponyOff += 20;
-        ponytail[1] += 32;
-    }
-}
-
-void SkeletalModel::setPonyPos(float x, float y, float z, float angle) {
-    ponytail[0] = x;
-    ponytail[1] = y;
-    ponytail[2] = z;
-    ponytailAngle = angle;
-}
-
 unsigned long SkeletalModel::size() {
     return animation.size();
 }

src/commands/Command.cpp

@@ -39,8 +39,6 @@ void Command::fillCommandList() {
     commands.push_back(std::shared_ptr<Command>(new CommandMode()));
     commands.push_back(std::shared_ptr<Command>(new CommandPos()));
     commands.push_back(std::shared_ptr<Command>(new CommandViewmodel()));
-    commands.push_back(std::shared_ptr<Command>(new CommandPigtail()));
-    commands.push_back(std::shared_ptr<Command>(new CommandPonypos()));
     commands.push_back(std::shared_ptr<Command>(new CommandQuit()));
 }
 

src/commands/CommandGame.cpp

@@ -61,58 +61,3 @@ int CommandViewmodel::execute(std::istream& args) {
     }
 }
 
-// --------------------------------------
-
-std::string CommandPigtail::name() {
-    return "pigtail";
-}
-
-std::string CommandPigtail::brief() {
-    return "BOOL";
-}
-
-int CommandPigtail::execute(std::istream& args) {
-    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
-        getLog() << "Use pigtail command interactively!" << Log::endl;
-        return -1;
-    }
-
-    bool b;
-    args >> b;
-    if (!args) {
-        getLog() << "Pass BOOL to pigtail command!" << Log::endl;
-        return -2;
-    }
-
-    getGame().getLara().getModel().setPigTail(b);
-    getLog() << "Pigtail is now " << (b ? "on" : "off") << Log::endl;
-    return 0;
-}
-
-// --------------------------------------
-
-std::string CommandPonypos::name() {
-    return "ponypos";
-}
-
-std::string CommandPonypos::brief() {
-    return "FLOAT FLOAT FLOAT FLOAT - x y z angle";
-}
-
-int CommandPonypos::execute(std::istream& args) {
-    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
-        getLog() << "Use ponypos command interactively!" << Log::endl;
-        return -1;
-    }
-
-    float a, b, c, d;
-    args >> a >> b >> c >> d;
-    if (!args) {
-        getLog() << "Pass four FLOATs to ponypos command!" << Log::endl;
-        return -2;
-    }
-
-    getGame().getLara().getModel().setPonyPos(a, b, c, d);
-    return 0;
-}
-

src/loader/LoaderTR2.cpp

@@ -272,8 +272,6 @@ void LoaderTR2::loadRooms() {
             // TODO store sprites somewhere
         }
 
-        //room->addAdjacentRoom(i); // Always set room itself as first
-
         uint16_t numPortals = file.readU16();
         for (unsigned int p = 0; p < numPortals; p++) {
             // Which room this portal leads to
@@ -306,8 +304,6 @@ void LoaderTR2::loadRooms() {
 
         uint16_t numZSectors = file.readU16();
         uint16_t numXSectors = file.readU16();
-        //room->setNumXSectors(numXSectors);
-        //room->setNumZSectors(numZSectors);
         for (unsigned int s = 0; s < (numZSectors * numXSectors); s++) {
             // Sectors are 1024*1024 world coordinates. Floor and Ceiling are
             // signed numbers of 256 units of height.
@@ -365,7 +361,6 @@ void LoaderTR2::loadRooms() {
             // High two bits (0xC000) indicate steps of
             // 90 degrees (eg. (rotation >> 14) * 90)
             uint16_t rotation = file.readU16();
-            assert((rotation & 0x3FFF) == 0);
 
             // Constant lighting, 0xFFFF means use mesh lighting
             uint16_t intensity1 = file.readU16();
@@ -375,11 +370,11 @@ void LoaderTR2::loadRooms() {
             uint16_t objectID = file.readU16();
 
             staticModels.push_back(new StaticModel(glm::vec3(x, y, z),
-                                                   (rotation >> 14) * 90.0f,
+                                                   glm::radians((rotation >> 14) * 90.0f),
                                                    objectID));
         }
 
-        int16_t alternateRoom = file.read16(); // TODO
+        int16_t alternateRoom = file.read16();
 
         uint16_t flags = file.readU16();
         unsigned int roomFlags = 0;
@@ -389,7 +384,8 @@ void LoaderTR2::loadRooms() {
 
         BoundingBox* boundingbox = new BoundingBox(bbox[0], bbox[1]);
         RoomMesh* mesh = new RoomMesh(vertices, rectangles, triangles);
-        Room* room = new Room(pos, boundingbox, mesh, roomFlags);
+        Room* room = new Room(pos, boundingbox, mesh, roomFlags, alternateRoom,
+                              numXSectors, numZSectors);
 
         for (auto m : staticModels)
             room->addModel(m);
@@ -1095,7 +1091,6 @@ void LoaderTR2::loadExternalSoundFile(std::string f) {
         for (int i = 0; i < (riffSize + 8); i++)
             buff[i] = sfx.readU8();
 
-        unsigned long src;
         int ret = Sound::loadBuffer(buff, riffSize + 8);
         assert(ret >= 0);