WIP Buffer geometries

Author: vidartf

js/scripts/generate-wrappers.js

@@ -39,6 +39,7 @@ var CUSTOM_CLASSES = [
     'controls/FlyControls.js',
     'controls/Picker.js',
     'geometries/PlainGeometry.js',
+    'geometries/PlainBufferGeometry.js',
     'objects/CloneArray.js',
 ];
 

js/scripts/prop-types.js

@@ -264,7 +264,7 @@ function ArrayBufferType(arrayType) {
 }
 _.extend(ArrayBufferType.prototype, BaseType.prototype, {
     getTraitlet: function() {
-        return 'List().tag(sync=True)';
+        return 'Array().tag(sync=True, **array_serialization)';
     },
     getPropertyConverterFn: function() {
         return 'convertArrayBuffer';
@@ -372,30 +372,6 @@ _.extend(FaceArray.prototype, BaseType.prototype, {
     },
 });
 
-function BufferAttribute() {
-    this.defaultValue = null;
-}
-_.extend(BufferAttribute.prototype, BaseType.prototype, {
-    getTraitlet: function() {
-        return 'BufferAttribute(default_value=None, allow_none=True).tag(sync=True)';
-    },
-    getPropertyConverterFn: function() {
-        return 'convertBufferAttribute';
-    },
-});
-
-function BufferAttributeDict() {
-    this.defaultValue = {};
-}
-_.extend(BufferAttributeDict.prototype, BaseType.prototype, {
-    getTraitlet: function() {
-        return 'Tuple().tag(sync=True)';
-    },
-    getPropertyConverterFn: function() {
-        return 'convertBufferAttributeDict';
-    },
-});
-
 function Matrix3() {
     this.defaultValue = [
         1, 0, 0,
@@ -469,8 +445,6 @@ module.exports = {
     ColorArray: ColorArray,
     Array: ArrayType,
     ArrayBuffer: ArrayBufferType,
-    BufferAttribute: BufferAttribute,
-    BufferAttributeDict: BufferAttributeDict,
     Dict: DictType,
     Function: FunctionType,
     Vector2: Vector2,

js/scripts/three-class-config.js

@@ -194,9 +194,9 @@ module.exports = {
         relativePath: './core/BufferAttribute',
         properties: {
             array:       new Types.ArrayBuffer(),
+            count:       new Types.Int(0),
             dynamic:     new Types.Bool(false),
             itemSize:    new Types.Int(1),
-            count:       new Types.Int(0),
             needsUpdate: new Types.Bool(false),
             normalized:  new Types.Bool(true),
             version:     new Types.Int(-1),
@@ -209,11 +209,6 @@ module.exports = {
         properties: {
             name:       new Types.String(''),
             type:       new Types.String(''),
-            attributes: new Types.BufferAttributeDict(),
-            position:   new Types.BufferAttribute(),
-            normal:     new Types.BufferAttribute(),
-            color:      new Types.BufferAttribute(),
-            index:      new Types.BufferAttribute(),
         },
         propsDefinedByThree: [ 'type' ]
     },
@@ -270,6 +265,22 @@ module.exports = {
             _ref_geometry: new Types.ThreeType('Geometry', {allowNull: false}),
         },
     },
+    PlainBufferGeometry: {
+        relativePath: './geometries/PlainGeometry',
+        superClass: 'Geometry',
+        properties: {
+            attributes: new Types.ThreeTypeDict('BufferAttribute'),
+            position:   new Types.ThreeType('BufferAttribute'),
+            normal:     new Types.ThreeType('BufferAttribute'),
+            color:      new Types.ThreeType('BufferAttribute'),
+            index:      new Types.ThreeType('BufferAttribute'),
+            morphAttributes: new Types.ThreeTypeDict('BufferAttribute'),
+            MaxIndex:   new Types.Int(65535),
+            //groups:     new Types.Group(),
+            //drawRange:  new Types.DrawRange(),
+            _ref_geometry: new Types.ThreeType('Geometry', {allowNull: false}),
+        },
+    },
     InstancedBufferAttribute: {
         relativePath: './core/InstancedBufferAttribute',
     },

js/src/_base/Three.js

@@ -674,71 +674,6 @@ var ThreeModel = widgets.WidgetModel.extend({
         return "#" + c.getHexString();
     },
 
-    // BufferAttribute
-    convertBufferAttributeModelToThree: function(ba, propName) {
-
-        // null array means null attribute
-        // this is necessary because plain Tuple traits cannot set allow_none=True
-        if (!ba[0]) {
-            return null;
-        }
-
-        var uuid = ba[3];
-        var cached = this.getThreeObjectFromCache({ uuid: uuid });
-        var result;
-        if (cached) {
-            result = cached;
-
-            // TODO: currently array and itemsize cannot be changed
-            // result.array = new Float32Array(ba[0]);
-            // result.itemSize = ba[1];
-        } else {
-            result = new THREE.BufferAttribute(
-                ba[0], // array
-                ba[1]  // itemSize
-            );
-            this.putThreeObjectIntoCache({ uuid: result.uuid }, result);
-        }
-
-        result.dynamic = ba[2];
-        result.uuid = ba[3];
-        result.version = ba[4];
-        result.needsUpdate = true;
-
-        return result;
-    },
-
-    convertBufferAttributeThreeToModel: function(ba, propName) {
-        if (!ba || !ba.array) {
-            return [ null, -1, false, '', -1 ];
-        }
-
-        // make sure buffer attributes are cached before sending on
-        this.putThreeObjectIntoCache({ uuid: ba.uuid }, ba);
-
-        return [
-            Array.prototype.slice.call(ba.array),
-            ba.itemSize,
-            ba.dynamic,
-            ba.uuid,
-            ba.version
-        ];
-    },
-
-    // BufferAttributeDict
-    convertBufferAttributeDictModelToThree: function(baList, propName) {
-        return _.reduce(baList, function(result, ba, name) {
-            result[ba[0]] = this.convertBufferAttributeModelToThree(ba[1], propName);
-            return result;
-        }, {}, this);
-    },
-
-    convertBufferAttributeDictThreeToModel: function(baDict, propName) {
-        return _.map(baDict, function(ba, name) {
-            return [ name, this.convertBufferAttributeThreeToModel(ba, propName) ];
-        }, this);
-    },
-
 });
 
 module.exports = {

js/src/geometries/PlainBufferGeometry.js

@@ -0,0 +1,41 @@
+var AutogenPlainBufferGeometryModel = require('../geometries/PlainGeometry').PlainBufferGeometryModel;
+
+
+var PlainBufferGeometryModel = AutogenPlainBufferGeometryModel.extend({
+
+    constructThreeObject: function() {
+
+        var result = new THREE.BufferGeometry();
+
+        var ref = this.get('_ref_geometry');
+        if (ref) {
+            return ref.initPromise.bind(this).then(function() {
+                result.copy(ref.obj);
+
+                // A bit of a hack:
+                // Sync out all copied properties before returning
+                this.obj = result;
+                var old_three = this.props_created_by_three;
+                this.props_created_by_three = {};
+                [
+                    'name', 'colors', 'faces', 'vertices', 'faceVertexUvs', 'morphTargets',
+                    'morphNormals', 'skinWeights', 'skinIndices', 'lineDistances',
+                    'boundingBox', 'boundingSphere'
+                ].forEach(key => {
+                    this.props_created_by_three[key] = true;
+                });
+                this.syncToModel();
+                this.props_created_by_three = old_three;
+                return result;
+            });
+        }
+
+        return Promise.resolve(result);
+
+    },
+
+});
+
+module.exports = {
+    PlainBufferGeometryModel: PlainBufferGeometryModel,
+};

pythreejs/geometries/PlainBufferGeometry.py

@@ -0,0 +1,14 @@
+
+from .PlainBufferGeometry_autogen import PlainBufferGeometry as PlainBufferGeometryBase
+
+
+class PlainBufferGeometry(PlainBufferGeometryBase):
+
+    @classmethod
+    def from_geometry(cls, geometry):
+        """Creates a PlainBufferGeometry of another geometry.
+        """
+        return cls(_ref_geometry=geometry)
+
+
+

pythreejs/geometries/PlainGeometry.py

@@ -9,7 +9,7 @@ def from_geometry(cls, geometry):
         """Creates a PlainGeometry of another geometry.
 
         NOTE:
-        The PlainGeometry will copy the arrays from the source geometry.abs
+        The PlainGeometry will copy the arrays from the source geometry.
         To avoid this, use PlainBufferGeometry (TODO).
         """
         return cls(_ref_geometry=geometry)

pythreejs/traits.py

@@ -37,15 +37,6 @@ def Matrix4(trait_type=CFloat, default=None, **kwargs):
 
 def Face3(**kwargs):
     return Tuple(CInt(), CInt(), CInt(), Vector3(), Unicode(), CInt(), Tuple(), Tuple())
-
-def BufferAttribute(trait_type=CFloat, **kwargs):
-    return Tuple(
-        List(allow_none=True),      # 0. array
-        CInt(allow_none=False),     # 1. itemSize
-        Bool(default_value=False),  # 2. dynamic
-        Unicode(),                  # 3. uuid
-        CInt(),                     # 6. version
-        default_value=(None, -1, False, "", -1)
     )
 
 def Euler(default=None, **kwargs):