Keep Camera in Room. Travis glbinding changes.

ChangeLog.md

@@ -7,6 +7,7 @@
     * Slightly tweaked portal visibility checks.
     * Fix to allow imguifilesystem to compile using Visual Studio 2013.
     * Very simple implementation of solid-mode using white texture.
+    * New option to keep camera in a room.
 
     [ 20150405 ]
     * No longer flipping axis in shaders, now turning camera upside-down.

cmake/travis_script_linux.sh

@@ -7,13 +7,9 @@ if [ "$CC" = "clang" ]; then export CC="clang-3.5"; fi
 if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
 
 # Need to build latest glbinding from source
-#GLBVER=`curl https://api.github.com/repos/hpicgs/glbinding/releases/latest | grep -m1 tag_name | cut -d\" -f4`
-#curl -L https://github.com/hpicgs/glbinding/archive/${GLBVER}.tar.gz | tar xzf -
-#cd glbinding-${GLBVER#v}
-
-# Need to use master until a fixed version is released
-git clone https://github.com/hpicgs/glbinding.git
-cd glbinding
+GLBVER=`curl https://api.github.com/repos/hpicgs/glbinding/releases/latest | grep -m1 tag_name | cut -d\" -f4`
+curl -L https://github.com/hpicgs/glbinding/archive/${GLBVER}.tar.gz | tar xzf -
+cd glbinding-${GLBVER#v}
 
 mkdir build
 cd build

cmake/travis_script_mac.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 
 # Need to build latest glbinding from source
-#GLBVER=`curl https://api.github.com/repos/hpicgs/glbinding/releases/latest | grep -m1 tag_name | cut -d\" -f4`
-#curl -L https://github.com/hpicgs/glbinding/archive/${GLBVER}.tar.gz | tar xzf -
-#cd glbinding-${GLBVER#v}
-
-# Need to use master until a fixed version is released
-git clone https://github.com/hpicgs/glbinding.git
-cd glbinding
+GLBVER=`curl https://api.github.com/repos/hpicgs/glbinding/releases/latest | grep -m1 tag_name | cut -d\" -f4`
+curl -L https://github.com/hpicgs/glbinding/archive/${GLBVER}.tar.gz | tar xzf -
+cd glbinding-${GLBVER#v}
 
 mkdir build
 cd build

include/Camera.h

@@ -44,6 +44,9 @@ class Camera {
     static void setShowOverlay(bool s) { showOverlay = s; }
     static bool getShowOverlay() { return showOverlay; }
 
+    static void setKeepInRoom(bool k) { keepInRoom = k; }
+    static bool getKeepInRoom() { return keepInRoom; }
+
     static bool boxInFrustum(BoundingBox b);
     static void displayFrustum(glm::mat4 MVP);
 
@@ -60,6 +63,7 @@ class Camera {
     static glm::mat4 view;
     static float rotationDeltaX, rotationDeltaY;
     static bool updateViewFrustum, dirty, showOverlay, movingFaster;
+    static bool keepInRoom;
     static int room;
 };
 

src/Camera.cpp

@@ -12,6 +12,7 @@
 
 #include "global.h"
 #include "RunTime.h"
+#include "World.h"
 #include "system/Shader.h"
 #include "system/Sound.h"
 #include "system/Window.h"
@@ -63,6 +64,7 @@ bool Camera::updateViewFrustum = true;
 bool Camera::dirty = true;
 bool Camera::showOverlay = false;
 bool Camera::movingFaster = false;
+bool Camera::keepInRoom = false;
 int Camera::room = -1;
 
 void Camera::reset() {
@@ -182,21 +184,24 @@ bool Camera::update() {
     glm::quat quatX = glm::angleAxis(rot.y, glm::vec3(1.0f, 0.0f, 0.0f));
     glm::quat quaternion = quatZ * quatY * quatX;
 
-    glm::vec3 clampedSpeed;
-    if (movingFaster) {
-        clampedSpeed = posSpeed * runFactor;
-        if (glm::length(clampedSpeed) > (maxSpeed * runFactor)) {
-            clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed * runFactor;
+    float factor = movingFaster ? runFactor : 1.0f;
+    glm::vec3 clampedSpeed = posSpeed * factor;
+    if (glm::length(clampedSpeed) > (maxSpeed * factor)) {
+        clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed * factor;
+    }
+
+    glm::vec3 newPos = pos + (quaternion * clampedSpeed * dT);
+    if (keepInRoom) {
+        if ((room < 0) || (room >= World::sizeRoom())) {
+            keepInRoom = false;
+            pos = newPos;
+        } else if (World::getRoom(room).getBoundingBox().inBox(newPos)) {
+            pos = newPos;
         }
     } else {
-        clampedSpeed = posSpeed;
-        if (glm::length(clampedSpeed) > maxSpeed) {
-            clampedSpeed = glm::normalize(clampedSpeed) * maxSpeed;
-        }
+        pos = newPos;
     }
 
-    pos += quaternion * clampedSpeed * dT;
-
     glm::mat4 translate = glm::translate(glm::mat4(1.0f), pos);
     glm::mat4 rotate = glm::toMat4(quaternion);
     view = glm::inverse(translate * rotate);

src/Game.cpp

@@ -72,6 +72,7 @@ int Game::loadLevel(std::string level) {
             Camera::setPosition(glm::vec3(getLara().getPosition().x,
                                           getLara().getPosition().y - 1024.0f,
                                           getLara().getPosition().z));
+            Camera::setRoom(getLara().getRoom());
         }
     } else {
         Log::get(LOG_ERROR) << "No suitable loader for this level!" << Log::endl;

src/Render.cpp

@@ -243,18 +243,23 @@ void Render::displayUI() {
         ImGui::Separator();
         ImGui::Text("Camera:");
         bool updateViewFrustum = Camera::getUpdateViewFrustum();
-        if (ImGui::Checkbox("Update Frustum##render", &updateViewFrustum)) {
+        if (ImGui::Checkbox("Update Frustum##camera", &updateViewFrustum)) {
             Camera::setUpdateViewFrustum(updateViewFrustum);
         }
         ImGui::SameLine();
-        ImGui::Checkbox("Show Frustum##render", &displayViewFrustum);
+        ImGui::Checkbox("Show Frustum##camera", &displayViewFrustum);
         ImGui::SameLine();
         bool showOverlay = Camera::getShowOverlay();
-        if (ImGui::Checkbox("Overlay", &showOverlay)) {
+        if (ImGui::Checkbox("Overlay##camera", &showOverlay)) {
             Camera::setShowOverlay(showOverlay);
         }
+        ImGui::SameLine();
+        bool keepInRoom = Camera::getKeepInRoom();
+        if (ImGui::Checkbox("Keep in Room##camera", &keepInRoom)) {
+            Camera::setKeepInRoom(keepInRoom);
+        }
         glm::vec3 camPos = Camera::getPosition();
-        if (ImGui::SliderFloat3("Position", &camPos.x, -100000, 100000)) {
+        if (ImGui::SliderFloat3("Position##camera", &camPos.x, -100000, 100000)) {
             Camera::setPosition(camPos);
         }