Asset manager fixes, activate/deactivate FirstPersonView

src/dagon/graphics/fpview.d

@@ -4,6 +4,8 @@ import dlib.core.memory;
 import dlib.math.vector;
 import dlib.math.matrix;
 
+import derelict.sdl2.sdl;
+
 import dagon.core.ownership;
 import dagon.core.event;
 
@@ -12,7 +14,10 @@ import dagon.graphics.view;
 
 class FirstPersonView: EventListener, View
 {
-    FirstPersonCamera camera;  
+    FirstPersonCamera camera;
+    int oldMouseX = 0;
+    int oldMouseY = 0;
+    bool _active = false;
 
     this(EventManager emngr, Vector3f camPos, Owner owner)
     {
@@ -24,22 +29,46 @@ class FirstPersonView: EventListener, View
     void update(double dt)
     {
         processEvents();
-
-        int hWidth = eventManager.windowWidth / 2;
-        int hHeight = eventManager.windowHeight / 2;
-        float turn_m = -(hWidth - eventManager.mouseX) * 0.1f;
-        float pitch_m = (hHeight - eventManager.mouseY) * 0.1f;
-        camera.pitch += pitch_m;
-        camera.turn += turn_m;
-        float pitchLimitMax = 60.0f;
-        float pitchLimitMin = -60.0f;
-        if (camera.pitch > pitchLimitMax)
-            camera.pitch = pitchLimitMax;
-        else if (camera.pitch < pitchLimitMin)
-            camera.pitch = pitchLimitMin;
-        eventManager.setMouseToCenter();
+
+        if (_active)
+        {            
+            float turn_m =  (eventManager.mouseRelX) * 0.2f;
+            float pitch_m = (eventManager.mouseRelY) * 0.2f;
+
+            camera.pitch += pitch_m;
+            camera.turn += turn_m;
+            float pitchLimitMax = 60.0f;
+            float pitchLimitMin = -60.0f;
+            if (camera.pitch > pitchLimitMax)
+                camera.pitch = pitchLimitMax;
+            else if (camera.pitch < pitchLimitMin)
+                camera.pitch = pitchLimitMin;
+        }
+
         camera.update(dt);
     }
+
+    void active(bool v)
+    {
+        if (v)
+        {
+            oldMouseX = eventManager.mouseX;
+            oldMouseY = eventManager.mouseY;
+            SDL_SetRelativeMouseMode(1);
+        }
+        else
+        {
+            SDL_SetRelativeMouseMode(0);
+            eventManager.setMouse(oldMouseX, eventManager.windowHeight - oldMouseY);
+        }
+
+        _active = v;
+    }
+
+    bool active()
+    {
+        return _active;
+    }
 
     Matrix4x4f viewMatrix()
     {
@@ -51,4 +80,3 @@ class FirstPersonView: EventListener, View
         return camera.invViewMatrix();
     }
 }
-

src/dagon/graphics/freeview.d

@@ -44,7 +44,7 @@ class Freeview: EventListener, View
 
     override void onMouseButtonDown(int button)
     {
-        if (button == MB_MIDDLE)
+        if (button == MB_LEFT)
         {
             prevMouseX = eventManager.mouseX;
             prevMouseY = eventManager.mouseY;
@@ -65,20 +65,20 @@ class Freeview: EventListener, View
     {
         processEvents();
 
-        if (eventManager.mouseButtonPressed[MB_MIDDLE] && eventManager.keyPressed[KEY_LSHIFT])
+        if (eventManager.mouseButtonPressed[MB_LEFT] && eventManager.keyPressed[KEY_LSHIFT])
         {
             float shift_x = (eventManager.mouseX - prevMouseX) * 0.1f;
             float shift_y = (eventManager.mouseY - prevMouseY) * 0.1f;
             Vector3f trans = camera.getUpVector * shift_y + camera.getRightVector * shift_x;
             camera.translateTarget(trans);
         }
-        else if (eventManager.mouseButtonPressed[MB_MIDDLE] && eventManager.keyPressed[KEY_LCTRL])
+        else if (eventManager.mouseButtonPressed[MB_LEFT] && eventManager.keyPressed[KEY_LCTRL])
         {
             float shift_x = (eventManager.mouseX - prevMouseX);
             float shift_y = (eventManager.mouseY - prevMouseY);
             camera.zoom((shift_x + shift_y) * 0.1f);
         }
-        else if (eventManager.mouseButtonPressed[MB_MIDDLE])
+        else if (eventManager.mouseButtonPressed[MB_LEFT])
         {                
             float turn_m = (eventManager.mouseX - prevMouseX);
             float pitch_m = -(eventManager.mouseY - prevMouseY);

src/dagon/graphics/material.d

@@ -9,18 +9,18 @@ import dagon.core.ownership;
 import dagon.graphics.texture;
 import dagon.graphics.rc;
 
-enum
-{
-    CBlack = Color4f(0.0f, 0.0f, 0.0f, 1.0f),
-    CWhite = Color4f(1.0f, 1.0f, 1.0f, 1.0f),
-    CRed = Color4f(1.0f, 0.0f, 0.0f, 1.0f),
-    COrange = Color4f(1.0f, 0.5f, 0.0f, 1.0f),
-    CYellow = Color4f(1.0f, 1.0f, 0.0f, 1.0f),
-    CGreen = Color4f(0.0f, 1.0f, 0.0f, 1.0f),
-    CCyan = Color4f(0.0f, 1.0f, 1.0f, 1.0f),
-    CBlue = Color4f(0.0f, 0.0f, 1.0f, 1.0f),
-    CPurple = Color4f(0.5f, 0.0f, 1.0f, 1.0f),
-    CMagenta = Color4f(1.0f, 0.0f, 1.0f, 1.0f)
+enum
+{
+    CBlack = Color4f(0.0f, 0.0f, 0.0f, 1.0f),
+    CWhite = Color4f(1.0f, 1.0f, 1.0f, 1.0f),
+    CRed = Color4f(1.0f, 0.0f, 0.0f, 1.0f),
+    COrange = Color4f(1.0f, 0.5f, 0.0f, 1.0f),
+    CYellow = Color4f(1.0f, 1.0f, 0.0f, 1.0f),
+    CGreen = Color4f(0.0f, 1.0f, 0.0f, 1.0f),
+    CCyan = Color4f(0.0f, 1.0f, 1.0f, 1.0f),
+    CBlue = Color4f(0.0f, 0.0f, 1.0f, 1.0f),
+    CPurple = Color4f(0.5f, 0.0f, 1.0f, 1.0f),
+    CMagenta = Color4f(1.0f, 0.0f, 1.0f, 1.0f)
 }
 
 enum MaterialInputType