ecere/gfx/3D: Camera integration support

- For integrating with Display::DrawMesh() / Display::DrawTranslucency()
- Directly setting viewMatrix and cPosition
- Not recomputing the camera when SetCamera is called with a null surface

diff --git a/ecere/src/gfx/3D/Camera.ec b/ecere/src/gfx/3D/Camera.ec
index 1aba78c..68583f4 100644 (file)
--- a/ecere/src/gfx/3D/Camera.ec
+++ b/ecere/src/gfx/3D/Camera.ec
@@ -582,6 +582,16 @@ public:
       result.z += cPosition.z;
    }
 
+   public void setViewMatrix(Matrix value)
+   {
+      viewMatrix = value;
+   }
+
+   public void setCPosition(Vector3D value)
+   {
+      cPosition = value;
+   }
+
 private:
    Camera()
    {

diff --git a/ecere/src/gfx/Display.ec b/ecere/src/gfx/Display.ec
index a403299..62c6e94 100644 (file)
--- a/ecere/src/gfx/Display.ec
+++ b/ecere/src/gfx/Display.ec
@@ -613,7 +613,7 @@ public:
             camera.Setup(width, height, null);
 
          // Always calling Update() here had broken interpolation in OrbitWithMouse!
-         if(!camera.cAngle.w)
+         if(!camera.cAngle.w && surface)
             camera.Update();
 
          if(display3D.selection)

diff --git a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index 1df3dde..0c3a9cd 100644 (file)
--- a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@ -3759,7 +3759,7 @@ class OpenGLDisplayDriver : DisplayDriver
       OGLDisplay oglDisplay = display.driverData;
       //Logf("SetCamera\n");
 
-      if(camera)
+      if(surface && camera)
       {
          int left = surface.box.left + surface.offset.x;
          int top = surface.box.top  + surface.offset.y;
@@ -3830,7 +3830,7 @@ class OpenGLDisplayDriver : DisplayDriver
 
          glEnable(GL_MULTISAMPLE_ARB);
       }
-      else if(display.display3D.camera)
+      else if(surface && display.display3D.camera)
       {
          oglDisplay.depthWrite = false;
          glViewport(0,0,display.width,display.height);