Merge pull request #106 from rdeits/rd/perspective-camera

Add perspective camera bindings (and test)

Author: rdeits

src/meshcat/commands.py

@@ -1,4 +1,4 @@
-from .geometry import Geometry, Object, Mesh, MeshPhongMaterial, OrthographicCamera, PointsMaterial, Points
+from .geometry import Geometry, Object, Mesh, MeshPhongMaterial, OrthographicCamera, PerspectiveCamera, PointsMaterial, Points
 from .path import Path
 
 
@@ -9,7 +9,7 @@ def __init__(self, geometry_or_object, material=None, path=None):
             if material is not None:
                 raise(ValueError("Please supply either an Object OR a Geometry and a Material"))
             self.object = geometry_or_object
-        elif isinstance(geometry_or_object, OrthographicCamera):
+        elif isinstance(geometry_or_object, (OrthographicCamera, PerspectiveCamera)):
             self.object = geometry_or_object
         else:
             if material is None:

src/meshcat/geometry.py

@@ -286,6 +286,56 @@ def lower(self):
         }
         return data
 
+class PerspectiveCamera(SceneElement):
+    """
+    The PerspectiveCamera is the default camera used by the meshcat viewer. See
+    https://threejs.org/docs/#api/en/cameras/PerspectiveCamera for more
+    information.
+    """
+    def __init__(self, fov = 50, aspect = 1, near = 0.1, far = 2000,
+                 zoom = 1, filmGauge=35, filmOffset = 0, focus = 10):
+        """
+        fov   : Camera frustum vertical field of view, from bottom to top of view, in degrees. Default is 50.
+        aspect: Camera frustum aspect ratio, usually the canvas width / canvas height. Default is 1 (square canvas).
+        near  : Camera frustum near plane. Default is 0.1. The valid range is greater than 0 and less than the current
+                value of the far plane. Note that, unlike for the OrthographicCamera, 0 is not a valid value for a
+                PerspectiveCamera's near plane.
+        far   : Camera frustum far plane. Default is 2000.
+        zoom  : Gets or sets the zoom factor of the camera. Default is 1.
+        filmGauge: Film size used for the larger axis. Default is 35 (millimeters). This parameter does not influence
+                   the projection matrix unless .filmOffset is set to a nonzero value.
+        filmOffset: Horizontal off-center offset in the same unit as .filmGauge. Default is 0.
+        focus: Object distance used for stereoscopy and depth-of-field effects. This parameter does not influence
+               the projection matrix unless a StereoCamera is being used. Default is 10.
+        """
+        #super(PerspectiveCamera, self).__init__()
+        SceneElement.__init__(self)
+        self.fov = fov
+        self.aspect = aspect
+        self.far = far
+        self.near = near
+        self.zoom = zoom
+        self.filmGauge = filmGauge
+        self.filmOffset = filmOffset
+        self.focus = focus
+
+    def lower(self):
+        data = {
+            u"object": {
+                u"uuid": self.uuid,
+                u"type": u"PerspectiveCamera",
+                u"aspect": self.aspect,
+                u"far": self.far,
+                u"filmGauge": self.filmGauge,
+                u"filmOffset": self.filmOffset,
+                u"focus": self.focus,
+                u"fov": self.fov,
+                u"near": self.near,
+                u"zoom": self.zoom,
+            }
+        }
+        return data
+
 def item_size(array):
     if array.ndim == 1:
         return 1

src/meshcat/tests/test_drawing.py

@@ -286,3 +286,17 @@ def runTest(self):
         self.vis['/Cameras/default/rotated/<object>'].set_property(
             "position", [0, 0, 0])
         self.vis['/Grid'].set_property("visible", False)
+
+class TestPerspectiveCamera(VisualizerTest):
+    def runTest(self):
+        """
+        Test that we can set_object with a PerspectiveCamera.
+        """
+        self.vis.set_object(g.Box([0.5, 0.5, 0.5]))
+
+        camera = g.PerspectiveCamera(fov=90)
+        self.vis['/Cameras/default/rotated'].set_object(camera)
+        self.vis['/Cameras/default'].set_transform(
+            tf.translation_matrix([1, -1, 0.5]))
+        self.vis['/Cameras/default/rotated/<object>'].set_property(
+            "position", [0, 0, 0])