- Added three_debug.js (Renders some debug data)

src/renderers/CanvasRenderer.js

@@ -56,8 +56,8 @@ THREE.CanvasRenderer = function () {
 
 		}
 
-		/*
-		_context.fillStyle = 'rgba(255, 255, 0, 0.5)';
+		/* DEBUG
+		_context.fillStyle = 'rgba(0, 255, 255, 0.5)';
 		_context.fillRect(_clipRect.getX(), _clipRect.getY(), _clipRect.getWidth(), _clipRect.getHeight());
 		*/
 
@@ -306,15 +306,21 @@ THREE.CanvasRenderer = function () {
 
 				}
 
+				/* DEBUG
+				_context.lineWidth = 1;
+				_context.strokeStyle = 'rgba( 0, 255, 0, 0.5 )';
+				_context.strokeRect( _bboxRect.getX(), _bboxRect.getY(), _bboxRect.getWidth(), _bboxRect.getHeight() );
+				*/
+
 				_clearRect.addRectangle( _bboxRect );
 
 			}
 
 		}
 
-		/*
+		/* DEBUG
 		_context.lineWidth = 1;
-		_context.strokeStyle = 'rgba( 0, 0, 255, 0.5 )';
+		_context.strokeStyle = 'rgba( 255, 0, 0, 0.5 )';
 		_context.strokeRect( _clearRect.getX(), _clearRect.getY(), _clearRect.getWidth(), _clearRect.getHeight() );
 		*/
 

utils/deployer.py

@@ -3,66 +3,66 @@ import os
 
 # MERGER
 
-rev = 13;
+rev = 13
 
-files = [];
-files.append('Three.js');
-files.append('core/Color.js');
-files.append('core/Vector2.js');
-files.append('core/Vector3.js');
-files.append('core/Vector4.js');
-files.append('core/Rectangle.js');
-files.append('core/Matrix4.js');
-files.append('core/Vertex.js');
-files.append('core/Face3.js');
-files.append('core/Face4.js');
-files.append('core/Geometry.js');
-files.append('cameras/Camera.js');
-files.append('objects/Object3D.js');
-files.append('objects/Particle.js');
-files.append('objects/Line.js');
-files.append('objects/Mesh.js');
-files.append('materials/BitmapUVMappingMaterial.js');
-files.append('materials/ColorFillMaterial.js');
-files.append('materials/ColorStrokeMaterial.js');
-files.append('materials/FaceColorFillMaterial.js');
-files.append('materials/FaceColorStrokeMaterial.js');
-files.append('materials/ParticleBitmapMaterial.js');
-files.append('materials/ParticleCircleMaterial.js');
-files.append('scenes/Scene.js');
-files.append('renderers/Renderer.js');
-files.append('renderers/CanvasRenderer.js');
-files.append('renderers/SVGRenderer.js');
-files.append('renderers/WebGLRenderer.js');
-files.append('renderers/renderables/RenderableFace3.js');
-files.append('renderers/renderables/RenderableFace4.js');
-files.append('renderers/renderables/RenderableParticle.js');
-files.append('renderers/renderables/RenderableLine.js');
+files = []
+files.append('Three.js')
+files.append('core/Color.js')
+files.append('core/Vector2.js')
+files.append('core/Vector3.js')
+files.append('core/Vector4.js')
+files.append('core/Rectangle.js')
+files.append('core/Matrix4.js')
+files.append('core/Vertex.js')
+files.append('core/Face3.js')
+files.append('core/Face4.js')
+files.append('core/Geometry.js')
+files.append('cameras/Camera.js')
+files.append('objects/Object3D.js')
+files.append('objects/Particle.js')
+files.append('objects/Line.js')
+files.append('objects/Mesh.js')
+files.append('materials/BitmapUVMappingMaterial.js')
+files.append('materials/ColorFillMaterial.js')
+files.append('materials/ColorStrokeMaterial.js')
+files.append('materials/FaceColorFillMaterial.js')
+files.append('materials/FaceColorStrokeMaterial.js')
+files.append('materials/ParticleBitmapMaterial.js')
+files.append('materials/ParticleCircleMaterial.js')
+files.append('scenes/Scene.js')
+files.append('renderers/Renderer.js')
+files.append('renderers/CanvasRenderer.js')
+files.append('renderers/SVGRenderer.js')
+files.append('renderers/WebGLRenderer.js')
+files.append('renderers/renderables/RenderableFace3.js')
+files.append('renderers/renderables/RenderableFace4.js')
+files.append('renderers/renderables/RenderableParticle.js')
+files.append('renderers/renderables/RenderableLine.js')
 
-string = '';
+string = ''
 
 for item in files:
-	src_file = open('../src/' + item,'r');
-	string += src_file.read() + "\n";
+	src_file = open('../src/' + item,'r')
+	string += src_file.read() + "\n"
 
-tmp_file = open('temp.js','w');
-tmp_file.write(string);
-tmp_file.close();
+tmp_file = open('temp.js','w')
+tmp_file.write(string)
+tmp_file.close()
 
 
 # YUICOMPRESSOR
 
-os.system("java -jar yuicompressor-2.4.2.jar temp.js -o ../build/three.js --charset utf-8 -v");
-os.unlink("temp.js");
+os.system("java -jar yuicompressor-2.4.2.jar temp.js -o ../build/three.js --charset utf-8 -v")
+os.unlink("temp.js")
 
 # HEADER
 
-output = '../build/three.js';
-string = "// three.js r" + str(rev) + " - http://github.com/mrdoob/three.js\n";
+output = '../build/three.js'
+string = "// three.js r" + str(rev) + " - http://github.com/mrdoob/three.js\n"
 
-src_file = open(output,'r');
-string += src_file.read();
+src_file = open(output,'r')
+string += src_file.read()
 
-dep_file = open(output,'w');
-dep_file.write(string);
-dep_file.close();
+dep_file = open(output,'w')
+dep_file.write(string)
+dep_file.close()

utils/deployer_debug.py

+import sys
+import os
+
+# MERGER
+
+rev = 13
+
+files = []
+files.append('Three.js')
+files.append('core/Color.js')
+files.append('core/Vector2.js')
+files.append('core/Vector3.js')
+files.append('core/Vector4.js')
+files.append('core/Rectangle.js')
+files.append('core/Matrix4.js')
+files.append('core/Vertex.js')
+files.append('core/Face3.js')
+files.append('core/Face4.js')
+files.append('core/Geometry.js')
+files.append('cameras/Camera.js')
+files.append('objects/Object3D.js')
+files.append('objects/Particle.js')
+files.append('objects/Line.js')
+files.append('objects/Mesh.js')
+files.append('materials/BitmapUVMappingMaterial.js')
+files.append('materials/ColorFillMaterial.js')
+files.append('materials/ColorStrokeMaterial.js')
+files.append('materials/FaceColorFillMaterial.js')
+files.append('materials/FaceColorStrokeMaterial.js')
+files.append('materials/ParticleBitmapMaterial.js')
+files.append('materials/ParticleCircleMaterial.js')
+files.append('scenes/Scene.js')
+files.append('renderers/Renderer.js')
+files.append('renderers/CanvasRenderer.js')
+files.append('renderers/SVGRenderer.js')
+files.append('renderers/WebGLRenderer.js')
+files.append('renderers/renderables/RenderableFace3.js')
+files.append('renderers/renderables/RenderableFace4.js')
+files.append('renderers/renderables/RenderableParticle.js')
+files.append('renderers/renderables/RenderableLine.js')
+
+string = ''
+
+for item in files:
+	src_file = open('../src/' + item,'r')
+	string += src_file.read() + "\n"
+
+position = 0
+
+while True:
+	position = string.find("/* DEBUG", position)
+	if position == -1:
+		break
+	string = string[0:position] + string[position+8:]
+	position = string.find("*/", position)
+	string = string[0:position] + string[position+2:]
+
+tmp_file = open('temp.js','w')
+tmp_file.write(string)
+tmp_file.close()
+
+
+# YUICOMPRESSOR
+
+os.system("java -jar yuicompressor-2.4.2.jar temp.js -o ../build/three_debug.js --charset utf-8 -v")
+os.unlink("temp.js");
+
+# HEADER
+
+output = '../build/three_debug.js'
+string = "// three.js r" + str(rev) + " - http://github.com/mrdoob/three.js\n"
+
+src_file = open(output,'r')
+string += src_file.read();
+
+dep_file = open(output,'w')
+dep_file.write(string)
+dep_file.close()

utils/export_threejs_25a2.py

@@ -22,7 +22,7 @@ def write(filename, scene, ob, \
     if not filename.lower().endswith('.js'):
         filename += '.js'
 
-    classname = filename.replace('.js','').split('/')[-1]
+    classname = filename.split('/')[-1].replace('.js','')
 
     if not ob:
         raise Exception("Error, Select the object to export")

utils/export_threejs_25b.py

@@ -22,7 +22,7 @@ def write(filename, scene, ob, \
     if not filename.lower().endswith('.js'):
         filename += '.js'
 
-    classname = filename.replace('.js','').split('/')[-1]
+    classname = filename.split('/')[-1].replace('.js','')
 
     if not ob:
         raise Exception("Error, Select the object to export")