Clean up manual/auto definitions (partially)

Author: vidartf

js/scripts/generate-wrappers.js

@@ -824,6 +824,7 @@ function createTopLevelPythonModuleFile() {
 
 var CUSTOM_CLASSES = [
     'textures/ImageTexture.js',
+    'textures/TextTexture.js',
 ];
 
 function createJavascriptFiles() {

js/scripts/three-class-config.js

@@ -774,9 +774,19 @@ module.exports = {
     },
     Line: {
         relativePath: './objects/Line',
+        constructorArgs: [ 'geometry', 'material' ],
+        properties: {
+            material: new Types.ThreeType('Material'),
+            geometry: new Types.ThreeType(['Geometry', 'BufferGeometry']),
+        }
     },
     LineSegments: {
         relativePath: './objects/LineSegments',
+        constructorArgs: [ 'geometry', 'material' ],
+        properties: {
+            material: new Types.ThreeType('Material'),
+            geometry: new Types.ThreeType(['Geometry', 'BufferGeometry']),
+        }
     },
     Mesh: {
         relativePath: './objects/Mesh',
@@ -798,6 +808,12 @@ module.exports = {
     },
     Sprite: {
         relativePath: './objects/Sprite',
+        superClass: 'Object3D',
+        constructorArgs: [ 'material' ],
+        properties: {
+            material: new Types.ThreeType('SpriteMaterial'),
+        },
+        propsDefinedByThree: [ 'isSprite' ]
     },
     WebGLRenderTarget: {
         relativePath: './renderers/WebGLRenderTarget',
@@ -884,6 +900,18 @@ module.exports = {
         },
         constructorArgs: [ 'imageUri', 'mapping', 'wrapS', 'wrapT', 'magFilter', 'minFilter', 'format', 'type', 'anisotropy' ],
     },
+    TextTexture: {
+        relativePath: './textures/TextTexture',
+        superClass: 'Texture',
+        properties: {
+            color: new Types.Color('white'),
+            fontFace: new Types.String('Arial'),
+            size: new Types.Int(12),
+            string: new Types.String(''),
+            squareTexture: new Types.Bool(true),
+        },
+        constructorArgs: ['string'],
+    },
     VideoTexture: {
         relativePath: './textures/VideoTexture',
     },

js/src/textures/TextTexture.js

@@ -0,0 +1,52 @@
+var _ = require('underscore');
+var Promise = require('bluebird');
+var TextTextureBase = require('./TextTexture.autogen');
+
+var TextTextureView = TextTextureBase.TextTextureView.extend({});
+
+var TextTextureModel = TextTextureBase.TextTextureModel.extend({
+
+    constructThreeObjectAsync: function() {
+        var fontFace = this.get('fontFace');
+        var size = this.get('size');
+        var color = this.get('color');
+        var string = this.get('string');
+
+        var self = this;
+
+        var p = new Promise(function(resolve, reject) {
+            var canvas = document.createElement('canvas');
+            var context = canvas.getContext('2d');
+
+            canvas.height = size;
+            var font = 'Normal ' + size + 'px ' + fontFace;
+            context.font = font;
+
+            var metrics = context.measureText(string);
+            var textWidth = metrics.width;
+            canvas.width = textWidth;
+
+            if (self.get('squareTexture')) {
+                canvas.height = canvas.width;
+            }
+
+            self.aspect = canvas.width / canvas.height;
+
+            context.textAlign = 'center';
+            context.textBaseline = 'middle';
+            context.fillStyle = color;
+            // Must set the font again for the fillText call
+            context.font = font;
+            context.fillText(string, canvas.width / 2, canvas.height / 2);
+
+            return resolve(new THREE.Texture(canvas));
+        });
+        return p;
+    },
+
+});
+
+module.exports = {
+    TextTextureModel: TextTextureModel,
+    TextTextureView: TextTextureView,
+};