Merge pull request #133 from vidartf/fix-geometry-names

Fix geometry names

Author: vidartf

examples/Animation.ipynb

@@ -282,7 +282,7 @@
    "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))"
+    "morph = BufferGeometry.from_geometry(SphereBufferGeometry(1, 32, 16))"
    ]
   },
   {
@@ -370,7 +370,7 @@
     "N_BONES = 3\n",
     "\n",
     "ref_cylinder = CylinderGeometry(5, 5, 50, 5, N_BONES * 5, True)\n",
-    "cylinder = PlainGeometry.from_geometry(ref_cylinder)"
+    "cylinder = Geometry.from_geometry(ref_cylinder)"
    ]
   },
   {

examples/BufferAttributes and BufferGeometry.ipynb

@@ -93,7 +93,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "geometry = PlainBufferGeometry(\n",
+    "geometry = BufferGeometry(\n",
     "    attributes={'position': vertices},\n",
     ")"
    ]
@@ -195,7 +195,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "geometry = PlainBufferGeometry(\n",
+    "geometry = BufferGeometry(\n",
     "    attributes={\n",
     "        'position': vertices,\n",
     "        'index': index,\n",
@@ -242,7 +242,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "plain = PlainBufferGeometry.from_geometry(sphere)"
+    "plain = BufferGeometry.from_geometry(sphere)"
    ]
   },
   {
@@ -268,7 +268,7 @@
    "outputs": [],
    "source": [
     "# Now from a non-buffer geometry:\n",
-    "box = PlainBufferGeometry.from_geometry(BoxGeometry())"
+    "box = BufferGeometry.from_geometry(BoxGeometry())"
    ]
   },
   {

examples/Examples.ipynb

@@ -218,7 +218,7 @@
    "source": [
     "# On windows, linewidth of the material has no effect\n",
     "size = 4\n",
-    "linesgeom = PlainGeometry(vertices=[[0, 0, 0],\n",
+    "linesgeom = Geometry(vertices=[[0, 0, 0],\n",
     "                                    [size, 0, 0],\n",
     "                                    [0, 0, 0],\n",
     "                                    [0, size, 0],\n",
@@ -335,7 +335,7 @@
     "faces = [f + [None, [vertexcolors[i] for i in f]] for f in faces]\n",
     "\n",
     "# Create the geometry:\n",
-    "cubeGeometry = PlainGeometry(vertices=vertices,\n",
+    "cubeGeometry = Geometry(vertices=vertices,\n",
     "    faces=faces,\n",
     "    colors=vertexcolors)\n",
     "# Calculate normals per face, for nice crisp edges:\n",
@@ -408,7 +408,7 @@
     "vertexcolors = np.asarray([(0,0,0), (0,0,1), (0,1,0), (1,0,0),\n",
     "                           (0,1,1), (1,0,1), (1,1,0), (1,1,1)], dtype='float32')\n",
     "\n",
-    "cubeGeometry = PlainBufferGeometry(attributes=dict(\n",
+    "cubeGeometry = BufferGeometry(attributes=dict(\n",
     "    position=BufferAttribute(vertices, normalized=False),\n",
     "    index=BufferAttribute(faces, normalized=False),\n",
     "    color=BufferAttribute(vertexcolors),\n",

examples/GeometryVertices.ipynb

@@ -53,7 +53,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "g2 = PlainGeometry.from_geometry(g)"
+    "g2 = Geometry.from_geometry(g)"
    ]
   },
   {
@@ -80,7 +80,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "g3 = PlainGeometry(vertices=g2.vertices[:], faces=g2.faces[:])"
+    "g3 = Geometry(vertices=g2.vertices[:], faces=g2.faces[:])"
    ]
   },
   {

examples/superellipsoid.ipynb

@@ -122,7 +122,7 @@
     "\n",
     "coordinate_widget = ConstrainedNDArrayWidget(dtype='float32')(array=coords)\n",
     "\n",
-    "surf_g = PlainBufferGeometry(attributes=dict(\n",
+    "surf_g = BufferGeometry(attributes=dict(\n",
     "    position=BufferAttribute(coordinate_widget),\n",
     "    index=BufferAttribute(cvx.simplices.ravel().astype(np.uint16)),\n",
     "))\n",

js/scripts/generate-wrappers.js

@@ -39,8 +39,8 @@ var CUSTOM_CLASSES = [
     'controls/TrackballControls.js',
     'controls/FlyControls.js',
     'controls/Picker.js',
-    'geometries/PlainGeometry.js',
-    'geometries/PlainBufferGeometry.js',
+    'core/BaseGeometry.js',
+    'core/BaseBufferGeometry.js',
     'objects/CloneArray.js',
     'objects/Blackbox.js',
 ];

js/scripts/templates/py_wrapper.mustache

@@ -38,8 +38,8 @@ class {{ className }}({{ superClass.className }}):
 
     {{#each properties as |prop propName|}}
     {{ propName }} = {{{ prop.trait_declaration }}}
-    {{/each}}
 
+    {{/each}}
 
 if six.PY3:
     import inspect