Merge pull request #121 from vidartf/fixes

Fixes some issues from #88

Author: vidartf

examples/Animation.ipynb

@@ -280,6 +280,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# This lets three.js create the geometry, then syncs back vertex positions etc.\n",
+    "# For this reason, you should allow for the sync to complete before executing the next cell\n",
     "morph = PlainBufferGeometry.from_geometry(SphereBufferGeometry(1, 32, 16))"
    ]
   },

examples/superellipsoid.ipynb

@@ -29,7 +29,7 @@
     "y_box = np.concatenate((-np.ones(n-1), np.linspace(-1, 1., n), np.ones(n-2), np.linspace(1, -1., n-1, endpoint=False)))\n",
     "nx_box = x_box.size\n",
     "\n",
-    "coords = np.empty((nx_box**2, 3))\n",
+    "coords = np.empty((nx_box**2, 3), dtype=np.float32)\n",
     "\n",
     "def superellipse(rx, ry, m):\n",
     "    \"\"\"\n",
@@ -176,6 +176,7 @@
     "    superellipsoid(rx_slider.value, ry_slider.value, rz_slider.value, \n",
     "                   m1_slider.value, m2_slider.value)\n",
     "    coordinate_widget.array = coords\n",
+    "    coordinate_widget.notify_changed()\n",
     "    \n",
     "m1_slider.observe(update, names=['value'])\n",
     "m2_slider.observe(update, names=['value'])\n",

js/scripts/generate-wrappers.js

@@ -946,16 +946,18 @@ function createPythonFiles() {
     }
 
     return mapPromiseFnOverThreeModules(function(relativePath) {
-            createPythonWrapper(relativePath);
-            // ensures each dir has empty __init__.py file for proper importing of sub dirs
-            createPythonModuleInitFile(relativePath);
+            return createPythonWrapper(relativePath).then(function() {
+                // ensures each dir has empty __init__.py file for proper importing of sub dirs
+                createPythonModuleInitFile(relativePath);
+            });
         })
         .then(function() {
             return mapPromiseFnOverFileList(CUSTOM_CLASSES, function(relativePath) {
-                createPythonWrapper(relativePath);
-                // ensures each dir has empty __init__.py file for proper importing of sub dirs
-                createPythonModuleInitFile(relativePath);
-            })
+                return createPythonWrapper(relativePath).then(function() {
+                    // ensures each dir has empty __init__.py file for proper importing of sub dirs
+                    createPythonModuleInitFile(relativePath);
+                });
+            });
         })
         .then(function() {
             // top level __init__.py file imports *all* pythreejs modules into namespace

pythreejs/geometries/PlainBufferGeometry.py

@@ -22,7 +22,7 @@ def validate(self, proposal):
 
         if 'index' in value:
             # We treat index special, so we might as well do some checking:
-            idx = value['index']
+            idx = value['index'].array
             array = idx.array if isinstance(idx, NDArrayWidget) else idx
             if array.dtype.kind != 'u':
                 raise TraitError('Index attribute must have unsigned integer data')

pythreejs/traits.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 from traitlets import (
     Unicode, Int, CInt, Instance, Enum, List, Dict, Float, CFloat,
@@ -42,16 +44,16 @@ def Matrix4(trait_type=CFloat, default=None, **kwargs):
 
 def Face3(**kwargs):
     return Tuple(
-        CInt(),     # a — Vertex A index.
-        CInt(),     # b — Vertex B index.
-        CInt(),     # c — Vertex C index.
-        Union([     # normal — (optional) Face normal (Vector3) or array of 3 vertex normals.
+        CInt(),     # a - Vertex A index.
+        CInt(),     # b - Vertex B index.
+        CInt(),     # c - Vertex C index.
+        Union([     # normal - (optional) Face normal (Vector3) or array of 3 vertex normals.
             Vector3(),
             List(Vector3(), minlen=3, maxlen=3)]),
-        Union([     # color — (optional) Face color or array of vertex colors.
+        Union([     # color - (optional) Face color or array of vertex colors.
             Unicode(),
             List(Unicode(), minlen=3, maxlen=3)]),
-        CInt(),     # materialIndex — (optional) which index of an array of materials to associate with the face.
+        CInt(),     # materialIndex - (optional) which index of an array of materials to associate with the face.
         )
 
 def Euler(default=None, **kwargs):