Define trait WebGLDataUnion

Author: vidartf

js/scripts/prop-types.js

@@ -285,7 +285,7 @@ _.extend(ArrayBufferType.prototype, BaseType.prototype, {
             args.push(`shape_constraint=${this.shapeConstraint}`);
         }
 
-        return `DataUnion(${args.join(', ')}).tag(sync=True)`;
+        return `WebGLDataUnion(${args.join(', ')}).tag(sync=True)`;
     },
     getPropertyConverterFn: function() {
         return 'convertArrayBuffer';

js/scripts/templates/py_wrapper.mustache

@@ -6,8 +6,6 @@ from traitlets import (
     Tuple, List, Dict, Float, CFloat, Bool, Union, Any,
     )
 
-from ipydatawidgets import DataUnion
-
 from {{ py_base_relative_path }}enums import *
 from {{ py_base_relative_path }}traits import *
 

pythreejs/core/BufferAttribute.py

@@ -11,24 +11,10 @@ class BufferAttribute(BaseBufferAttribute):
 
     def __init__(self, array=None, normalized=True, **kwargs):
         if array is not None:
-            # If not supplied, leave as undefined.
+            # Only include array in kwargs if supplied
             # This is needed for remote initialization
+            # (Undefined behaves differently)
             kwargs['array'] = array
         kwargs['normalized'] = normalized
         # NOTE: skip init of direct parent class on purpose:
         super(BaseBufferAttribute, self).__init__(**kwargs)
-
-    @validate('array')
-    def _valid_array(self, proposal):
-        value = proposal['value']
-        if isinstance(value, NDArrayWidget):
-            value = value.array
-
-        if isinstance(proposal['value'], NDArrayWidget):
-            if value is not Undefined and value.dtype == np.float64:
-                raise TraitError('Cannot use a float64 data widget as a BufferAttribute source.')
-            return proposal['value']
-        if value is not Undefined and value.dtype == np.float64:
-            # 64-bit not supported, coerce to 32-bit
-            value = value.astype(np.float32)
-        return value

pythreejs/textures/DataTexture.py

@@ -12,25 +12,16 @@ class DataTexture(BaseDataTexture):
     @validate('data')
     def _valid_data(self, proposal):
         value = proposal['value']
-        if isinstance(value, NDArrayWidget):
-            value = value.array
+        array = value.array if isinstance(value, NDArrayWidget) else value
 
         # Validate shape
-        if np.ndim(value) < 2 or np.ndim(value) > 3:
+        if np.ndim(array) < 2 or np.ndim(array) > 3:
             raise TraitError('Data needs to have two or three dimensions. Given shape was: %r'
-                % (np.shape(value),))
+                % (np.shape(array),))
 
         old = self._trait_values.get(proposal['trait'].name, None)
-        if old is not None and np.ndim(old) > 0 and np.shape(old) != np.shape(value):
+        if old is not None and np.ndim(old) > 0 and np.shape(old) != np.shape(array):
             raise TraitError('Cannot change shape of previously initialized DataTexture. %r vs %r'
-                % (np.shape(old), np.shape(value)))
+                % (np.shape(old), np.shape(array)))
 
-        if isinstance(proposal['value'], NDArrayWidget):
-            if value is not Undefined and value.dtype == np.float64:
-                raise TraitError('Cannot use a float64 data widget as a BufferAttribute source.')
-            return proposal['value']
-        if value is not Undefined and value.dtype == np.float64:
-            # 64-bit not supported, coerce to 32-bit
-            value = value.astype(np.float32)
         return value
-

pythreejs/traits.py

@@ -1,5 +1,10 @@
 
-from traitlets import Unicode, Int, CInt, Instance, Enum, List, Dict, Float, CFloat, Bool, Tuple
+from traitlets import (
+    Unicode, Int, CInt, Instance, Enum, List, Dict, Float, CFloat,
+    Bool, Tuple, Undefined, TraitError,
+)
+
+from ipydatawidgets import DataUnion, NDArrayWidget
 
 def Vector2(trait_type=CFloat, default=None, **kwargs):
     if default is None:
@@ -42,3 +47,17 @@ def Euler(default=None, **kwargs):
     if default is None:
         default = [0, 0, 0, 'XYZ']
     return Tuple(CFloat(), CFloat(), CFloat(), Unicode(), default_value=default, **kwargs)
+
+
+class WebGLDataUnion(DataUnion):
+    def validate(self, obj, value):
+        value = super(WebGLDataUnion, self).validate(obj, value)
+        array = value.array if isinstance(value, NDArrayWidget) else value
+
+        if array is not Undefined and str(array.dtype) == 'float64':
+            if isinstance(value, NDArrayWidget):
+                raise TraitError('Cannot use a float64 data widget as a BufferAttribute source.')
+            else:
+                # 64-bit not supported, coerce to 32-bit
+                value = value.astype('float32')
+        return value

setup.py

@@ -48,7 +48,10 @@
             'pythreejs/static/index.js.map',
         ]),
     ],
-    'install_requires': ['ipywidgets>=7.0.0a9', 'ipydatawidgets'],
+    'install_requires': [
+        'ipywidgets>=7.0.0a9',
+        'ipydatawidgets'
+    ],
     'packages': find_packages(),
     'zip_safe': False,
     'cmdclass': cmdclass,