Fixed StaticMesh Y offset

ChangeLog.md

@@ -8,6 +8,7 @@
     * Now using stb_image for all image loading (except pcx format)
     * Now storing screenshots in PNG format
     * Updated imgui
+    * Fixed StaticMesh Y-offset (position Y needed to be flipped)
 
     [ 20141228 ]
     * Room Bounding Boxes are now visualized in Wireframe mode (again).

include/RunTime.h

@@ -36,7 +36,7 @@ class RunTime {
     static void setRunning(bool run) { gameIsRunning = run; }
 
     static bool getShowFPS() { return showFPS; }
-    static void setShowFPS(bool fps) { showFPS = fps; }
+    static void setShowFPS(bool f) { showFPS = f; }
 
     static unsigned long getFPS() { return fps; }
     static const std::vector<float>& getHistoryFPS() { return history; }

src/Camera.cpp

@@ -94,8 +94,8 @@ void Camera::handleMouseMotion(int x, int y) {
         dirty = true;
     }
 
-    static int lastDir = 0;
     if (y != 0) {
+        static int lastDir = 0;
         float a = glm::dot(upUnit, quaternion * upUnit);
         if (((lastDir >= 0) && (y < 0)) || ((lastDir <= 0) && (y > 0)) || (a > 0.5f)) {
             quaternion = glm::quat(quaternion * -rightUnit * (rotationDeltaY * y)) * quaternion;

src/Render.cpp

@@ -196,12 +196,12 @@ void Render::drawTexture(float x, float y, float w, float h, glm::vec4 color,
     Window::drawTextGL(vertices, uvs, color, texture);
 }
 
-void Render::displayUI() {
-    static const int modeStringCount = 5;
-    static const char* modeStrings[modeStringCount] = {
-        "Disable", "Splash", "Texture", "Wireframe", "Solid"
-    };
+static const int modeStringCount = 5;
+static const char* modeStrings[modeStringCount] = {
+    "Disable", "Splash", "Texture", "Wireframe", "Solid"
+};
 
+void Render::displayUI() {
     if (ImGui::CollapsingHeader("Render Settings")) {
         int item = 0;
         if (mode == RenderMode::LoadScreen)

src/RoomData.cpp

@@ -65,7 +65,7 @@ void StaticModel::display(glm::mat4 view, glm::mat4 projection) {
         assert(cache >= 0);
     }
 
-    glm::mat4 translate = glm::translate(glm::mat4(1.0f), pos);
+    glm::mat4 translate = glm::translate(glm::mat4(1.0f), glm::vec3(pos.x, -pos.y, pos.z));
     glm::mat4 rotate = glm::rotate(glm::mat4(1.0f), angle, glm::vec3(0.0f, 1.0f, 0.0f));
     glm::mat4 model = translate * rotate;
     getWorld().getStaticMesh(cache).display(model, view, projection);

src/main.cpp

@@ -10,12 +10,6 @@
 
 #include "global.h"
 #include "Exception.h"
-#include "commander/commander.h"
-#include "commands/Command.h"
-#include "utils/time.h"
-
-#ifndef UNIT_TEST
-
 #include "Game.h"
 #include "Log.h"
 #include "MenuFolder.h"
@@ -24,9 +18,12 @@
 #include "TextureManager.h"
 #include "UI.h"
 #include "World.h"
+#include "commander/commander.h"
+#include "commands/Command.h"
 #include "system/Font.h"
 #include "system/Sound.h"
 #include "system/Window.h"
+#include "utils/time.h"
 
 static std::string configFileToUse;
 
@@ -176,8 +173,6 @@ void renderFrame() {
     RunTime::updateFPS();
 }
 
-#endif // UNIT_TEST
-
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS)
 #ifndef NDEBUG
 

src/system/Window.cpp

@@ -19,11 +19,13 @@
 #endif
 
 int Window::initialize() {
-    int res = -1;
+    int res;
 #ifdef USING_SDL
     res = WindowSDL::initialize();
 #elif defined(USING_GLFW)
     res = WindowGLFW::initialize();
+#else
+    res = -1;
 #endif
 
     initializeGL();
@@ -84,11 +86,13 @@ void Window::setFullscreen(bool f) {
 }
 
 bool Window::getFullscreen() {
-    bool ret = false;
+    bool ret;
 #ifdef USING_SDL
     ret = WindowSDL::getFullscreen();
 #elif defined(USING_GLFW)
     ret = WindowGLFW::getFullscreen();
+#else
+    ret = false;
 #endif
 
     return ret;
@@ -103,11 +107,13 @@ void Window::setMousegrab(bool g) {
 }
 
 bool Window::getMousegrab() {
-    bool ret = false;
+    bool ret;
 #ifdef USING_SDL
     ret = WindowSDL::getMousegrab();
 #elif defined(USING_GLFW)
     ret = WindowGLFW::getMousegrab();
+#else
+    ret = false;
 #endif
 
     return ret;
@@ -122,11 +128,13 @@ void Window::setTextInput(bool t) {
 }
 
 bool Window::getTextInput() {
-    bool ret = false;
+    bool ret;
 #ifdef USING_SDL
     ret = WindowSDL::getTextInput();
 #elif defined(USING_GLFW)
     ret = WindowGLFW::getTextInput();
+#else
+    ret = false;
 #endif
 
     return ret;

test/CMakeLists.txt

@@ -8,27 +8,17 @@ add_custom_target (check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
 
 add_executable (tester_binary EXCLUDE_FROM_ALL
     "binary.cpp" "../src/utils/binary.cpp"
-    "../src/Exception.cpp" "../src/main.cpp"
+    "../src/Exception.cpp"
 )
 add_dependencies (check tester_binary)
 add_test (NAME test_binary COMMAND tester_binary)
 
 #################################################################
 
-add_executable (tester_loader EXCLUDE_FROM_ALL
-    "Loader.cpp" "../src/utils/binary.cpp"
-    "../src/loader/Loader.cpp" "../src/loader/LoaderTR1.cpp"
-    "../src/loader/LoaderTR2.cpp" "../src/loader/LoaderTR3.cpp"
-)
-#add_dependencies (check tester_loader)
-#add_test (NAME test_loader COMMAND tester_loader)
-
-#################################################################
-
 add_executable (tester_script EXCLUDE_FROM_ALL
     "Script.cpp" "ScriptPayload.h" "ScriptTest.h"
-    "../src/Script.cpp" "../src/main.cpp"
-    "../src/utils/binary.cpp" "../src/Exception.cpp"
+    "../src/Script.cpp" "../src/Exception.cpp"
+    "../src/utils/binary.cpp"
 )
 
 find_package (ZLIB REQUIRED)

test/Loader.cpp

@@ -1,71 +0,0 @@
-/*!
- * \file test/Loader.cpp
- * \brief Level Loader Unit Test
- *
- * \author xythobuz
- */
-
-#include "global.h"
-#include "loader/Loader.h"
-
-int main(int argc, char* argv[]) {
-    if (argc != 2) {
-        std::cout << "Usage:" << std::endl;
-        std::cout << "\t" << argv[0] << " /path/to/level.tr2" << std::endl;
-        return 0; // Don't fail when just running this test...
-    }
-
-    // Print file engine version
-    std::cout << "Loading \"" << argv[1] << "\"" << std::endl;
-    std::cout << "Trying to detect engine version... ";
-    Loader::LoaderVersion v = Loader::checkFile(argv[1]);
-    switch (v) {
-        case Loader::TR_1:
-            std::cout << "TR 1";
-            break;
-
-        case Loader::TR_2:
-            std::cout << "TR 2";
-            break;
-
-        case Loader::TR_3:
-            std::cout << "TR 3";
-            break;
-
-        case Loader::TR_4:
-            std::cout << "TR 4";
-            break;
-
-        case Loader::TR_5:
-            std::cout << "TR 5";
-            break;
-
-        case Loader::TR_UNKNOWN:
-            std::cout << "Unknown version!" << std::endl;
-            return 2;
-    }
-    std::cout << " detected!" << std::endl;
-
-    // Create matching loader
-    std::cout << std::endl << "Creating level loader... ";
-    std::unique_ptr<Loader> loader = Loader::createLoader(argv[1]);
-    if (!loader) {
-        std::cout << "Failed!" << std::endl;
-        return 3;
-    } else {
-        std::cout << "Success!" << std::endl;
-    }
-
-    // Try to load the level
-    std::cout << "Trying to load level... ";
-    int error = loader->load(argv[1]);
-    if (error != 0) {
-        std::cout << "Failure!" << std::endl;
-        std::cout << "Error code: " << error << std::endl;
-    } else {
-        std::cout << "Success!" << std::endl;
-    }
-
-    return error;
-}
-