LoaderTR1 Unfinished Business support. Sprint for camera movement.

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140306 ]
+    * Fixed LoaderTR1, can now also open the Unfinished Business levels
+    * Walk key can now be used to increase free-camera movement speed
+
     [ 20140305 ]
     * SoundAL now has more useful error message output.
     * Fixed TR1 color map parsing, now textures have the proper color values.

include/Camera.h

@@ -60,7 +60,7 @@ class Camera {
     static glm::mat4 projection;
     static glm::mat4 view;
     static float rotationDeltaX, rotationDeltaY;
-    static bool updateViewFrustum, dirty, showOverlay;
+    static bool updateViewFrustum, dirty, showOverlay, movingFaster;
     static int room;
 };
 

src/Camera.cpp

@@ -43,6 +43,7 @@ const static float controllerDeadZone = 0.33f;
 const static float controllerViewFactor = glm::pi<float>();
 const static float rotationAngleClamp = glm::pi<float>() * 2.0f;
 const static float rotationAngleVertMax = glm::pi<float>() / 2.0f;
+const static float runFactor = 2.5f;
 
 const static glm::vec3 rightUnit(1.0f, 0.0f, 0.0f);
 const static glm::vec3 upUnit(0.0f, 1.0f, 0.0f);
@@ -59,6 +60,7 @@ float Camera::rotationDeltaY = 0.75f;
 bool Camera::updateViewFrustum = true;
 bool Camera::dirty = true;
 bool Camera::showOverlay = false;
+bool Camera::movingFaster = false;
 int Camera::room = -1;
 
 void Camera::reset() {
@@ -96,6 +98,8 @@ void Camera::handleAction(ActionEvents action, bool isFinished) {
         posSpeed += upUnit * maxSpeed * factor;
     } else if (action == crouchAction) {
         posSpeed -= upUnit * maxSpeed * factor;
+    } else if (action == walkAction) {
+        movingFaster = !isFinished;
     } else {
         return;
     }
@@ -176,9 +180,17 @@ bool Camera::update() {
     glm::quat quatX = glm::angleAxis(rot.y, glm::vec3(1.0f, 0.0f, 0.0f));
     glm::quat quaternion = quatY * quatX;
 
-    glm::vec3 clampedSpeed(posSpeed);
-    if (glm::length(clampedSpeed) > maxSpeed) {
-        clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed;
+    glm::vec3 clampedSpeed;
+    if (movingFaster) {
+        clampedSpeed = posSpeed * runFactor;
+        if (glm::length(clampedSpeed) > (maxSpeed * runFactor)) {
+            clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed * runFactor;
+        }
+    } else {
+        clampedSpeed = posSpeed;
+        if (glm::length(clampedSpeed) > maxSpeed) {
+            clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed;
+        }
     }
 
     pos += quaternion * clampedSpeed * dT;

src/loader/LoaderTR1.cpp

@@ -10,6 +10,7 @@
 #include "Log.h"
 #include "SoundManager.h"
 #include "World.h"
+#include "utils/strings.h"
 #include "loader/LoaderTR1.h"
 
 int LoaderTR1::load(std::string f) {
@@ -22,6 +23,10 @@ int LoaderTR1::load(std::string f) {
         return 2; // Not a TR1 level?!
     }
 
+    bool unfinishedBusiness = stringEndsWith(f, ".tub");
+    if (unfinishedBusiness)
+        Log::get(LOG_INFO) << "LoaderTR1: Detected Unfinished Business level!" << Log::endl;
+
     loadTextures();
 
     file.seek(file.tell() + 4); // Unused value?
@@ -33,6 +38,10 @@ int LoaderTR1::load(std::string f) {
     loadStaticMeshes();
     loadTextiles();
     loadSprites();
+
+    if (unfinishedBusiness)
+        loadPalette();
+
     loadCameras();
     loadSoundSources();
     loadBoxesOverlapsZones();
@@ -41,7 +50,9 @@ int LoaderTR1::load(std::string f) {
 
     file.seek(file.tell() + 8192); // TODO light map!
 
-    loadPalette();
+    if (!unfinishedBusiness)
+        loadPalette();
+
     loadCinematicFrames();
     loadDemoData();
     loadSoundMap();