Merge pull request #156 from vidartf/fixed

Various fixes

Author: vidartf

js/package.json

@@ -35,6 +35,15 @@
     "three": "^0.88.0",
     "underscore": "^1.8.3"
   },
+  "keywords": [
+    "jupyterlab",
+    "extension",
+    "jupyterlab extension",
+    "notebook",
+    "jupyter",
+    "widgets",
+    "three"
+  ],
   "jupyterlab": {
     "extension": "src/jupyterlab-plugin"
   }

js/scripts/copy-files.js

@@ -15,7 +15,7 @@ const docStaticDir = path.resolve(baseDir, '..', 'docs', 'source', '_static');
 
 function copyThree() {
     return fse.copy(
-        path.resolve(threeBuildDir, 'three.min.js'),
+        path.resolve(threeBuildDir, 'three.js'),
         path.resolve(staticDir, 'three.js')
     ).then(function() {
         console.log('Copied three.js to static folder');
@@ -33,7 +33,7 @@ function copyBundleToDocs() {
 
 function copyThreeToDocs() {
     return fse.copy(
-        path.resolve(threeBuildDir, 'three.min.js'),
+        path.resolve(threeBuildDir, 'three.js'),
         path.resolve(docStaticDir, 'three.js')
     ).then(function() {
         console.log('Copied three.js to docs folder');

js/scripts/templates/js_enums.mustache

@@ -1,6 +1,5 @@
 //
 // This file auto-generated with {{ generatorScriptName }}
-// Date: {{ now }}
 //
 
 {{#each categories as |category|}}

js/scripts/templates/js_index.mustache

@@ -1,6 +1,5 @@
 //
 // This file auto-generated with {{ generatorScriptName }}
-// Date: {{ now }}
 //
 {{#if top_level}}
 

js/scripts/templates/js_wrapper.mustache

@@ -1,6 +1,5 @@
 //
 // This file auto-generated with {{ generatorScriptName }}
-// Date: {{ now }}
 //
 
 var _ = require('underscore');

js/scripts/templates/py_enums.mustache

@@ -1,6 +1,5 @@
 """
 This file auto-generated with {{ generatorScriptName }}
-Date: {{ now }}
 """
 
 class EnumNamespace:

js/scripts/templates/py_shader_utils.mustache

@@ -1,7 +1,6 @@
 """{{ name }}
 
 Autogenerated by {{ generatorScriptName }}
-Date: {{ now }}
 """
 
 import json

js/scripts/templates/py_top_level_init.mustache

@@ -1,6 +1,5 @@
 #
 # This file automatically generated by {{ generateScriptName }}
-# Date: {{ now }}
 #
 
 from __future__ import absolute_import

js/scripts/templates/py_wrapper.mustache

@@ -22,7 +22,6 @@ class {{ className }}({{ superClass.className }}):
     """{{ className }}
 
     Autogenerated by {{ generatorScriptName }}
-    Date: {{ now }}
     {{#if isCustom}}
     This class is a custom class for pythreejs, with no
     direct corresponding class in three.js.

js/scripts/three-class-config.js

@@ -101,6 +101,9 @@ module.exports = {
     CubeCamera: {
         relativePath: './cameras/CubeCamera',
         superClass: 'Object3D',
+        properties: {
+            type: new Types.String('CubeCamera'),
+        }
     },
     OrthographicCamera: {
         relativePath: './cameras/OrthographicCamera',
@@ -113,6 +116,7 @@ module.exports = {
             bottom: new Types.Float(),
             near:   new Types.Float(0.1),
             far:    new Types.Float(2000),
+            type:   new Types.String('OrthographicCamera'),
         },
         constructorArgs: [ 'left', 'right', 'top', 'bottom', 'near', 'far' ],
     },
@@ -129,13 +133,15 @@ module.exports = {
             // view:       new Types.Dict(),
             // filmGauge:  new Types.Float(35.0),
             // filmOffset: new Types.Float(0.0),
+            type:   new Types.String('PerspectiveCamera'),
         },
         constructorArgs: [ 'fov', 'aspect', 'near', 'far' ],
     },
     ArrayCamera: {
         relativePath: './cameras/ArrayCamera',
         superClass: 'PerspectiveCamera',
         properties: {
+            type:   new Types.String('ArrayCamera'),
         },
         constructorArgs: [ 'fov', 'aspect', 'near', 'far' ],
     },
@@ -341,6 +347,7 @@ module.exports = {
             attributes:         new Types.ThreeTypeDict(['BufferAttribute', 'InterleavedBufferAttribute']),
             morphAttributes:    new Types.BufferMorphAttributes(),
             MaxIndex:           new Types.Int(65535),
+            type:               new Types.String('BufferGeometry'),
             // TODO: These likely require special types:
             //groups:             new Types.GeometryGroup(),
             //drawRange:          new Types.DrawRange(),
@@ -668,6 +675,7 @@ module.exports = {
             refractionRatio:    new Types.Float(0.98),
             skinning:           new Types.Bool(false),
             specularMap:        new Types.ThreeType('Texture'),
+            type:               new Types.String('MeshBasicMaterial'),
             wireframe:          new Types.Bool(false),
             wireframeLinewidth: new Types.Float(1),
             wireframeLinecap:   new Types.String('round'), // TODO: enum?
@@ -1036,6 +1044,7 @@ module.exports = {
             geometry: new Types.ThreeType(['BaseGeometry', 'BaseBufferGeometry'], {nullable: false}),
             drawMode: new Types.Enum('DrawModes', 'TrianglesDrawMode'),
             morphTargetInfluences: new Types.Array(),
+            type: new Types.String('Mesh'),
         },
         propsDefinedByThree: ['morphTargetInfluences'],
     },
@@ -1673,6 +1682,7 @@ module.exports = {
             hex: new Types.Int(0),
             headLength: new Types.Float(null, {nullable: true}),
             headWidth: new Types.Float(null, {nullable: true}),
+            type: new Types.String('ArrowHelper'),
         },
     },
     AxesHelper: {