Cleanup following review

Author: vidartf

js/scripts/generate-enums.js

@@ -51,8 +51,9 @@ var jsEnumTemplate = compileTemplate('js_enums');
 var pyEnumTemplate = compileTemplate('py_enums');
 
 
-
-
+//
+// Helper functions
+//
 
 function checkUnused() {
     return new Promise(function(resolve, reject) {
@@ -78,6 +79,11 @@ function checkUnused() {
     });
 }
 
+
+//
+// Generator functions
+//
+
 function writeJavascriptFile() {
     // Here we generate a code to enum string LUT
 

js/src/core/Renderer.js

@@ -83,9 +83,9 @@ var RendererView = RenderableView.extend({
     acquireRenderer: function() {
         RenderableView.prototype.acquireRenderer.call(this);
 
-        var background = ThreeModel.prototype.convertColorModelToThree( this.model.get('background') );
-        var background_opacity = ThreeModel.prototype.convertFloatModelToThree( this.model.get('background_opacity') );
-        this.renderer.setClearColor( background, background_opacity );
+        var background = ThreeModel.prototype.convertColorModelToThree(this.model.get('background'));
+        var background_opacity = ThreeModel.prototype.convertFloatModelToThree(this.model.get('background_opacity'));
+        this.renderer.setClearColor(background, background_opacity);
     }
 
 });

js/src/geometries/PlainGeometry.js

@@ -1,8 +1,3 @@
-//
-// This file auto-generated with generate-wrappers.js
-// Date: Thu Jun 01 2017 10:45:06 GMT+0200 (W. Europe Daylight Time)
-//
-
 var AutogenPlainGeometryModel = require('../geometries/PlainGeometry').PlainGeometryModel;
 
 

js/src/objects/CloneArray.js

@@ -13,8 +13,7 @@ function ThreeCloneArray(original, positions, merge) {
 }
 
 
-
-ThreeCloneArray.prototype = Object.assign( Object.create( THREE.Object3D.prototype ), {
+ThreeCloneArray.prototype = Object.assign(Object.create(THREE.Object3D.prototype), {
 
 	constructor: ThreeCloneArray,
 
@@ -51,14 +50,14 @@ ThreeCloneArray.prototype = Object.assign( Object.create( THREE.Object3D.prototy
             // Attribute count per
             var merged = new THREE.BufferGeometry();
             var attributes = geom.attributes;
-            for ( var key in attributes ) {
+            for (var key in attributes) {
                 var attribute = attributes[ key ];
                 var attributeArray = attribute.array;
                 // Allocate new buffer:
-                var mergedAttributeArray = new attributeArray.constructor( attributeArray.length * N );
-                var mergedAttribute = new attribute.constructor( mergedAttributeArray, attribute.itemSize, attribute.normalized );
+                var mergedAttributeArray = new attributeArray.constructor(attributeArray.length * N);
+                var mergedAttribute = new attribute.constructor(mergedAttributeArray, attribute.itemSize, attribute.normalized);
                 mergedAttribute.dynamic = attribute.dynamic;
-                merged.addAttribute( key, mergedAttribute );
+                merged.addAttribute(key, mergedAttribute);
             }
 
             var oldIndex = geom.getIndex();

pythreejs/_base/Three.py

@@ -1,5 +1,3 @@
-"""
-"""
 from ipywidgets import DOMWidget, Widget, widget_serialization
 from traitlets import Unicode, CInt, Bool, Instance
 from .._package import npm_pkg_name

pythreejs/pythreejs.py

@@ -143,25 +143,6 @@ class ShaderMaterial(Material):
     wireframeLinewidth = CFloat(1.0).tag(sync=True)
 
 
-# class SpriteMaterial(Material):
-#     _view_name = Unicode('SpriteMaterialView').tag(sync=True)
-#     _model_name = Unicode('SpriteMaterialModel').tag(sync=True)
-
-#     uvScale = List(CFloat).tag(sync=True)
-#     sizeAttenuation = Bool().tag(sync=True)
-#     uvOffset = List(CFloat).tag(sync=True)
-#     useScreenCoordinates = Bool().tag(sync=True)
-#     scaleByViewport = Bool().tag(sync=True)
-#     alignment = List(CFloat).tag(sync=True)
-
-
-# class Sprite(Object3D):
-#     _view_name = Unicode('SpriteView').tag(sync=True)
-#     _model_name = Unicode('SpriteModel').tag(sync=True)
-
-#     material = Instance(Material, allow_none=True).tag(sync=True, **widget_serialization)
-#     scaleToTexture = Bool().tag(sync=True)
-
 
 class PlotMesh(Mesh):
     plot = Instance('sage.plot.plot3d.base.Graphics3d')
@@ -237,14 +218,6 @@ class AnaglyphEffect(Effect):
     _model_name = Unicode('AnaglyphEffectModel').tag(sync=True)
 
 
-# class SpotLight(PointLight):
-#     _view_name = Unicode('SpotLight').tag(sync=True)
-#     _model_name = Unicode('SpotLightModel').tag(sync=True)
-
-#     angle = CFloat(10).tag(sync=True)
-#     exponent = CFloat(0.5).tag(sync=True)
-
-
 # Some helper classes and functions
 def lights_color():
     return [

pythreejs/sage.py

@@ -55,8 +55,8 @@ def json_texture(t):
                          polygonOffsetUnits=1)
 
 def json_box(t):
-    return BoxGeometry(width=t['size'][0], 
-                        height=t['size'][1], 
+    return BoxGeometry(width=t['size'][0],
+                        height=t['size'][1],
                         depth=t['size'][2])
 
 def json_index_face_set(t):
@@ -94,7 +94,7 @@ def json_line(t):
     mesh.append(c)
     if (tree_geometry['arrowhead']):
         height = .03*tree_geometry['thickness']
-        c = Mesh(material=m, 
+        c = Mesh(material=m,
                     geometry=CylinderGeometry(radiusTop=0,
                                                  radiusBottom=.02*tree_geometry['thickness'],
                                                  height=height,
@@ -135,7 +135,7 @@ def json_text(t):
     tree_geometry = t['geometry']
     tree_texture = t['texture']
     tt = TextTexture(string=tree_geometry['string'])
-    sm = SpriteMaterial(map=tt, opacity=tree_texture['opacity'], transparent = tree_texture['opacity'] < 1 )
+    sm = SpriteMaterial(map=tt, opacity=tree_texture['opacity'], transparent = tree_texture['opacity'] < 1)
     return Sprite(material=sm, scaleToTexture=True)
 
 def json_point(t):