Separate Camera and SystemCamera

Author: einarf

demosys/scene/camera.py

@@ -35,19 +35,9 @@ def __init__(self, fov=60, aspect=1.0, near=1, far=100):
         # Yaw and Pitch
         self.yaw = -90.0
         self.pitch = 0.0
-        self.mouse_sensitivity = 0.5
-        self.last_x = None
-        self.last_y = None
 
         # World up vector
         self._up = Vector3([0.0, 1.0, 0.0])
-        # Position movement states
-        self._xdir = STILL
-        self._zdir = STILL
-        self._ydir = STILL
-        self._last_time = 0
-        # Velocity in axis units per second
-        self.velocity = 10.0
 
         # Projection attributes
         self.projection = None
@@ -67,6 +57,107 @@ def set_position(self, x, y, z):
         """
         self.position = Vector3([x, y, z])
 
+    @property
+    def view_matrix(self):
+        """
+        :return: The current view matrix for the camera
+        """
+        self._update_yaw_and_pitch()
+        return self._gl_look_at(self.position, self.position + self.dir, self._up)
+
+    def _update_yaw_and_pitch(self):
+        """
+        Updates the camera vectors based on the current yaw and pitch
+        """
+        front = Vector3([0.0, 0.0, 0.0])
+        front.x = cos(radians(self.yaw)) * cos(radians(self.pitch))
+        front.y = sin(radians(self.pitch))
+        front.z = sin(radians(self.yaw)) * cos(radians(self.pitch))
+
+        self.dir = vector.normalise(front)
+        self.right = vector.normalise(vector3.cross(self.dir, self._up))
+        self.up = vector.normalise(vector3.cross(self.right, self.dir))
+
+    def set_projection(self, fov=None, aspect=None, near=None, far=None):
+        """
+        Update projection parameters and return the new version
+
+        :param fov: Field of view
+        :param aspect: Aspect ratio
+        :param near: Near plane
+        :param far: Far plane
+        :return: Projection matrix
+        """
+        self.fov = fov or self.fov
+        self.near = near or self.near
+        self.far = far or self.far
+        self.aspect = aspect or self.aspect
+        self.projection = matrix44.create_perspective_projection_matrix(
+            self.fov, self.aspect, self.near, self.far)
+
+        return self.projection
+
+    def look_at(self, vec=None, pos=None):
+        """
+        Look at a specific point
+
+        :param vec: Vector3 position
+        :param pos: python list [x, y, x]
+        :return: Camera matrix
+        """
+        if pos:
+            vec = Vector3(pos)
+        if vec is None:
+            raise ValueError("vector or pos must be set")
+        return self._gl_look_at(self.position, vec, self._up)
+
+    def _gl_look_at(self, pos, target, up):
+        """
+        The standard lookAt method
+
+        :param pos: current position
+        :param target: target position to look at
+        :param up: direction up
+        """
+        z = vector.normalise(pos - target)
+        x = vector.normalise(vector3.cross(vector.normalise(up), z))
+        y = vector3.cross(z, x)
+
+        translate = matrix44.create_identity()
+        translate[3][0] = -pos.x
+        translate[3][1] = -pos.y
+        translate[3][2] = -pos.z
+
+        rotate = matrix44.create_identity()
+        rotate[0][0] = x[0]  # -- X
+        rotate[1][0] = x[1]
+        rotate[2][0] = x[2]
+        rotate[0][1] = y[0]  # -- Y
+        rotate[1][1] = y[1]
+        rotate[2][1] = y[2]
+        rotate[0][2] = z[0]  # -- Z
+        rotate[1][2] = z[1]
+        rotate[2][2] = z[2]
+
+        return matrix44.multiply(translate, rotate)
+
+
+class SystemCamera(Camera):
+    """System camera controlled by mouse and keyboard"""
+    def __init__(self, fov=60, aspect=1.0, near=1, far=100):
+        # Position movement states
+        self._xdir = STILL
+        self._zdir = STILL
+        self._ydir = STILL
+        self._last_time = 0
+        # Velocity in axis units per second
+        self.velocity = 10.0
+        self.mouse_sensitivity = 0.5
+        self.last_x = None
+        self.last_y = None
+
+        super().__init__(fov=fov, aspect=aspect, near=near, far=far)
+
     def move_state(self, direction, activate):
         """
         Set the camera position move state
@@ -116,20 +207,7 @@ def rot_state(self, x, y):
         if self.pitch < -85.0:
             self.pitch = -85.0
 
-        self.update_yaw_and_pitch()
-
-    def update_yaw_and_pitch(self):
-        """
-        Updates the camera vectors based on the current yaw and pitch
-        """
-        front = Vector3([0.0, 0.0, 0.0])
-        front.x = cos(radians(self.yaw)) * cos(radians(self.pitch))
-        front.y = sin(radians(self.pitch))
-        front.z = sin(radians(self.yaw)) * cos(radians(self.pitch))
-
-        self.dir = vector.normalise(front)
-        self.right = vector.normalise(vector3.cross(self.dir, self._up))
-        self.up = vector.normalise(vector3.cross(self.right, self.dir))
+        self._update_yaw_and_pitch()
 
     @property
     def view_matrix(self):
@@ -162,66 +240,3 @@ def view_matrix(self):
             self.position -= self.up * self.velocity * t
 
         return self._gl_look_at(self.position, self.position + self.dir, self._up)
-
-    def set_projection(self, fov=None, aspect=None, near=None, far=None):
-        """
-        Update projection parameters and return the new version
-
-        :param fov: Field of view
-        :param aspect: Aspect ratio
-        :param near: Near plane
-        :param far: Far plane
-        :return: Projection matrix
-        """
-        self.fov = fov or self.fov
-        self.near = near or self.near
-        self.far = far or self.far
-        self.aspect = aspect or self.aspect
-        self.projection = matrix44.create_perspective_projection_matrix(
-            self.fov, self.aspect, self.near, self.far)
-        return self.projection
-
-    def look_at(self, vec=None, pos=None):
-        """
-        Look at a specific point
-
-        :param vec: Vector3 position
-        :param pos: python list [x, y, x]
-        :return: Camera matrix
-        """
-        if pos:
-            vec = Vector3(pos)
-        if vec is None:
-            raise ValueError("vector or pos must be set")
-        return self._gl_look_at(self.position, vec, self._up)
-
-    def _gl_look_at(self, pos, target, up):
-        """
-        The standard lookAt method
-
-        :param pos: current position
-        :param target: target position to look at
-        :param up: direction up
-        """
-        z = vector.normalise(pos - target)
-        x = vector.normalise(vector3.cross(vector.normalise(self._up), z))
-        y = vector3.cross(z, x)
-
-        translate = matrix44.create_identity()
-        translate[3][0] = -pos.x
-        translate[3][1] = -pos.y
-        translate[3][2] = -pos.z
-
-        rotate = matrix44.create_identity()
-        rotate[0][0] = x[0]  # -- X
-        rotate[1][0] = x[1]
-        rotate[2][0] = x[2]
-        rotate[0][1] = y[0]  # -- Y
-        rotate[1][1] = y[1]
-        rotate[2][1] = y[2]
-        rotate[0][2] = z[0]  # -- Z
-        rotate[1][2] = z[1]
-        rotate[2][2] = z[2]
-
-        # return matrix44.multiply(rotate, translate)
-        return matrix44.multiply(translate, rotate)

demosys/view/controller.py

@@ -42,7 +42,7 @@ def run(manager=None):
 
     # Set up the default system camera
     global CAMERA
-    CAMERA = camera.Camera(aspect=Effect.window_aspect, fov=60.0, near=1, far=1000)
+    CAMERA = camera.SystemCamera(aspect=Effect.window_aspect, fov=60.0, near=1, far=1000)
     Effect.sys_camera = CAMERA
 
     # Initialize Effects