preliminary functioning BufferGeometry

Author: abelnation

examples/test.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
@@ -28,22 +28,55 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 5,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
    "source": [
     "# Geometries\n",
     "torus = TorusGeometry(radius=12, tube=3, radialSegments=16, tubularSegments=100)\n",
-    "sphere = SphereGeometry(radius=3)"
+    "sphere = SphereGeometry(radius=12)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 2,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "bufferSphere = SphereBufferGeometry(radius=12, _flat=True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "sphere"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "bufferSphere"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
    },
    "outputs": [],
    "source": [
@@ -58,7 +91,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
@@ -70,7 +103,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -83,7 +116,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -96,7 +129,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -107,7 +140,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -123,7 +156,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -135,7 +168,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -147,7 +180,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -158,7 +191,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
@@ -169,7 +202,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
@@ -197,6 +230,25 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
    "version": "2.7.12"
+  },
+  "widgets": {
+   "state": {
+    "0a809e8300f346eb862771f52c7a56e9": {
+     "views": [
+      {
+       "cell_index": 5
+      }
+     ]
+    },
+    "1b7dbab4e7bd42eb95a23627821497f7": {
+     "views": [
+      {
+       "cell_index": 4
+      }
+     ]
+    }
+   },
+   "version": "1.2.0"
   }
  },
  "nbformat": 4,

js/scripts/generate-wrappers.js

@@ -67,14 +67,21 @@ function getClassConfig(className, doLog) {
     var result = {};
     _.extend(result, curClass);
 
+    result.propsDefinedByThree = [];
+    result.propsDefinedByThree = result.propsDefinedByThree.concat(curClass.propsDefinedByThree || []);
+
     // combine cur props with superclass properties for allProperties
     result.allProperties = {};
     if (curClass.superClass && curClass.superClass !== classConfigs._defaults.superClass) {
         var superClassConfig = getClassConfig(curClass.superClass);
         _.extend(result.allProperties, superClassConfig.allProperties);
+
+        result.propsDefinedByThree = result.propsDefinedByThree.concat(superClassConfig.propsDefinedByThree || []);
     }
     _.extend(result.allProperties, curClass.properties);
 
+    // we want to inherit all propsDefinedByThree
+
     // add defaults
     _.defaults(
         result, 
@@ -306,6 +313,7 @@ _.extend(JavascriptWrapper.prototype, {
             return {
                 defaultJson: prop.getJSPropertyValue(),
                 property_array_name: prop.getPropArrayName(),
+                property_converter: prop.getPropertyConverterFn(),
             };
 
         }, this);
@@ -382,9 +390,9 @@ _.extend(JavascriptWrapper.prototype, {
         if (!prop) {
             throw new Error('invalid propName: ' + propName);
         }
-        var converter = prop.propToValueConverterFn();
+        var converter = prop.getPropertyConverterFn();
         if (converter) {
-            return "this." + converter + "(this.get('" + propName + "'))";
+            return "this." + converter +  "ModelToThree(this.get('" + propName + "'), '" + propName +"')";
         } else {
             return "this.get('" + propName + "')";
         }
@@ -537,12 +545,15 @@ function PythonWrapper(modulePath) {
     this.pyBaseRelativePath = path.relative(this.destDirAbsolutePath, pySrcDir);
     this.pyBaseRelativePath = relativePathToPythonImportPath(this.pyBaseRelativePath);
 
+    this.hasParameters = false;
+
     this.config = getClassConfig(this.className);
 
     this.processSuperClass();
     this.processDependencies();
     this.processProperties();
     this.processDocsUrl();
+    this.processConstructorArgs();
 
     // Template and context
     this.template = pyWrapperTemplate;
@@ -551,6 +562,10 @@ function PythonWrapper(modulePath) {
         generatorScriptName: path.basename(__filename),
         threejs_docs_url: this.docsUrl,
         py_base_relative_path: this.pyBaseRelativePath,
+        constructor: {
+            args: this.constructorArgs,
+            hasParameters: this.hasParameters,
+        },
 
         className: this.className,
         viewName: this.className + 'View',
@@ -646,15 +661,36 @@ _.extend(PythonWrapper.prototype, {
     processProperties: function() {
 
         this.properties = _.mapObject(this.config.properties, function(prop, propName) {
-
             return {
                 trait_declaration: prop.getTraitlet(),
+                defaultJson: prop.getPythonDefaultValue(),
             };
-        
         }, this);
 
     },
 
+    processConstructorArgs: function() {
+        this.constructorArgs = this.config.constructorArgs.map(function(propName) {
+            // Currently, we don't generate an __init__ method for classes that use the parameters
+            // constructor arg
+            if (propName === 'parameters') {
+                this.hasParameters = true;
+                return {
+                    name: propName,
+                    prop: {
+                        defaultJson: '{}',
+                    }
+                }
+            }
+            return {
+                name: propName,
+                prop: {
+                    defaultJson: this.config.allProperties[propName].getPythonDefaultValue(),
+                }
+            };
+        }, this);
+    },
+
     processDocsUrl: function() {
 
         var refTokens = this.modulePath.split(path.sep);
@@ -694,6 +730,7 @@ function createPythonWrapper(modulePath) {
     try {
         var wrapper = new PythonWrapper(modulePath);
     } catch (e) {
+        console.log(e);
         console.log('skipping: ' + modulePath);
         return Promise.resolve(false);
     }