fix transparent args and disentangle font size with face (for resizing)

Author: shensquared

src/meshcat/commands.py

@@ -45,13 +45,13 @@ def __init__(self, text, geometry_or_object, material=None, path=[]):
             self.object = geometry_or_object
         else:
             if geometry_or_object is None:
-                geometry_or_object = Plane()
+                geometry_or_object = Plane(width=10, height=5)
                 # if writing onto the scene, default material is transparent
                 material = MeshPhongMaterial(map=self.text_texture,
-                   needsUpdate=True, opacity = 0.0)
+                                             needsUpdate=True, transparent=True)
             if material is None:
                 material = MeshPhongMaterial(map=self.text_texture,
-                   needsUpdate=True)
+                                             needsUpdate=True)
             if isinstance(material, PointsMaterial):
                 raise(ArgumentError(
                     "Cannot write text onto points; please supply a mesh material"))

src/meshcat/geometry.py

@@ -221,12 +221,12 @@ def lower(self, object_data):
 class MeshMaterial(Material):
 
     def __init__(self, color=0xffffff, reflectivity=0.5, map=None,
-        opacity = 1.0, **kwargs):
+        transparent = False, **kwargs):
         super(MeshMaterial, self).__init__()
         self.color = color
         self.reflectivity = reflectivity
         self.map = map
-        self.opacity = opacity
+        self.transparent = transparent
         self.properties = kwargs
 
     def lower(self, object_data):
@@ -235,7 +235,7 @@ def lower(self, object_data):
             u"type": self._type,
             u"color": self.color,
             u"reflectivity": self.reflectivity,
-            u"opacity": self.opacity
+            u"transparent": self.transparent
         }
         data.update(self.properties)
         if self.map is not None:
@@ -281,23 +281,24 @@ class CanvasImage(Image):
 
     def __init__(self, alpha):
         super(CanvasImage, self).__init__()
-        self.alpha = alpha
 
     def lower(self, object_data):
         return {
             u"uuid": self.uuid,
-            u"url": u'place_holder',
-            u"alpha": self.alpha
         }
 
 
 class TextTexture(Texture):
 
-    def __init__(self, text, font='96px sans-serif', width=200, height=100,
+    def __init__(self, text, font_size = 96, font_face='sans-serif',
+       width=200, height=100,
        position=[10, 10],alpha=True):
         super(TextTexture, self).__init__()
         self.text = text
-        self.font = font
+        # font_size will be passed to the JS side as is; however if the text
+        # width exceeds canvas width, font_size will be reduced.
+        self.font_size = font_size
+        self.font_face = font_face
         self.width = width
         self.height = height
         self.position = position
@@ -308,7 +309,8 @@ def lower(self, object_data):
             u"uuid": self.uuid,
             u"type": u"TextTexture",
             u"text": unicode(self.text),
-            u"font": self.font,
+            u"font_size": self.font_size,
+            u"font_face": self.font_face,
             u"width": self.width,
             u"height": self.height,
             u"position": self.position,