home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/upstream/master'

Browse Source
This commit is contained in:
alteredq
2010-11-09 22:47:16 +01:00
parent c545318b51 a7d70a0eff
commit baced836f3
11 changed files with 12 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Three.js
+1 -1
View File
File diff suppressed because one or more lines are too long
build/ThreeDebug.js
+1 -1
View File
File diff suppressed because one or more lines are too long
utils/Builder.py
-83
View File
@@ -1,83 +0,0 @@
import sys
import os
filename = 'Three.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('core/Geometry.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('lights/Light.js')
files.append('lights/AmbientLight.js')
files.append('lights/DirectionalLight.js')
files.append('lights/PointLight.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('objects/Line.js')
files.append('objects/Mesh.js')
files.append('materials/LineColorMaterial.js')
files.append('materials/MeshPhongMaterial.js')
files.append('materials/MeshBitmapMaterial.js')
files.append('materials/MeshColorFillMaterial.js')
files.append('materials/MeshColorStrokeMaterial.js')
files.append('materials/MeshFaceMaterial.js')
files.append('materials/ParticleBitmapMaterial.js')
files.append('materials/ParticleCircleMaterial.js')
files.append('materials/ParticleDOMMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/Projector.js')
files.append('renderers/DOMRenderer.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"
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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js")
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/BuilderCanvas.py
-79
View File
@@ -1,79 +0,0 @@
import sys
import os
filename = 'ThreeCanvas.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('core/Geometry.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('lights/Light.js')
files.append('lights/AmbientLight.js')
files.append('lights/DirectionalLight.js')
files.append('lights/PointLight.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('objects/Line.js')
files.append('objects/Mesh.js')
files.append('materials/LineColorMaterial.js')
files.append('materials/MeshPhongMaterial.js')
files.append('materials/MeshBitmapMaterial.js')
files.append('materials/MeshColorFillMaterial.js')
files.append('materials/MeshColorStrokeMaterial.js')
files.append('materials/MeshFaceMaterial.js')
files.append('materials/ParticleBitmapMaterial.js')
files.append('materials/ParticleCircleMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/Projector.js')
files.append('renderers/CanvasRenderer.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"
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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js")
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/BuilderDOM.py
-62
View File
@@ -1,62 +0,0 @@
import sys
import os
filename = 'ThreeDOM.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('materials/ParticleDOMMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/Projector.js')
files.append('renderers/DOMRenderer.js')
files.append('renderers/renderables/RenderableParticle.js')
string = ''
for item in files:
src_file = open('../src/' + item,'r')
string += src_file.read() + "\n"
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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js")
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/BuilderDebug.py
-93
View File
@@ -1,93 +0,0 @@
import sys
import os
filename = 'ThreeDebug.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('core/Geometry.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('lights/Light.js')
files.append('lights/AmbientLight.js')
files.append('lights/DirectionalLight.js')
files.append('lights/PointLight.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('objects/Line.js')
files.append('objects/Mesh.js')
files.append('materials/LineColorMaterial.js')
files.append('materials/MeshPhongMaterial.js')
files.append('materials/MeshBitmapMaterial.js')
files.append('materials/MeshColorFillMaterial.js')
files.append('materials/MeshColorStrokeMaterial.js')
files.append('materials/MeshFaceMaterial.js')
files.append('materials/ParticleBitmapMaterial.js')
files.append('materials/ParticleCircleMaterial.js')
files.append('materials/ParticleDOMMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/Projector.js')
files.append('renderers/DOMRenderer.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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js");
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/BuilderSVG.py
-78
View File
@@ -1,78 +0,0 @@
import sys
import os
filename = 'ThreeSVG.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('core/Geometry.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('lights/Light.js')
files.append('lights/AmbientLight.js')
files.append('lights/DirectionalLight.js')
files.append('lights/PointLight.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('objects/Line.js')
files.append('objects/Mesh.js')
files.append('materials/LineColorMaterial.js')
files.append('materials/MeshBitmapMaterial.js')
files.append('materials/MeshColorFillMaterial.js')
files.append('materials/MeshColorStrokeMaterial.js')
files.append('materials/MeshFaceMaterial.js')
files.append('materials/ParticleBitmapMaterial.js')
files.append('materials/ParticleCircleMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/Projector.js')
files.append('renderers/SVGRenderer.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"
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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js")
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/BuilderWebGL.py
-74
View File
@@ -1,74 +0,0 @@
import sys
import os
filename = 'ThreeWebGL.js'
# MERGER
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/Ray.js')
files.append('core/Rectangle.js')
files.append('core/Matrix3.js')
files.append('core/Matrix4.js')
files.append('core/Vertex.js')
files.append('core/Face3.js')
files.append('core/Face4.js')
files.append('core/UV.js')
files.append('core/Geometry.js')
files.append('cameras/Camera.js')
files.append('io/Loader.js')
files.append('lights/Light.js')
files.append('lights/AmbientLight.js')
files.append('lights/DirectionalLight.js')
files.append('lights/PointLight.js')
files.append('objects/Object3D.js')
files.append('objects/Particle.js')
files.append('objects/Line.js')
files.append('objects/Mesh.js')
files.append('materials/LineColorMaterial.js')
files.append('materials/MeshPhongMaterial.js')
files.append('materials/MeshBitmapMaterial.js')
files.append('materials/MeshColorFillMaterial.js')
files.append('materials/MeshColorStrokeMaterial.js')
files.append('materials/MeshFaceMaterial.js')
files.append('materials/ParticleBitmapMaterial.js')
files.append('materials/ParticleCircleMaterial.js')
files.append('scenes/Scene.js')
files.append('renderers/WebGLRenderer.js')
string = ''
for item in files:
src_file = open('../src/' + item,'r')
string += src_file.read() + "\n"
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/" + filename + " --charset utf-8 -v")
os.unlink("temp.js")
# HEADER
rev_file = open('REVISION','r')
rev = rev_file.read().rstrip()
output = '../build/' + filename
string = "// " + filename + " r" + 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/build.bat
+2 -2
View File
@@ -1,2 +1,2 @@
python build.py --full
python build.py --full --debug
python build.py
python build.py --debug
utils/build.py
+5 -4
View File
@@ -66,18 +66,19 @@ def makeDebug(text):
def build(files, debug, outputFilename):
print "=" * 40
print "Compiling", outputFilename, ("(debug = %d)" % debug)
print "=" * 40
text = merge(files)
if debug:
text = makeDebug(text)
outputFilename = outputFilename + 'Debug'
outputFilename = outputFilename + '.js'
print "=" * 40
print "Compiling", outputFilename
print "=" * 40
output(addHeader(compress(text), outputFilename), outputFilename)
utils/build.sh
+3 -16
View File
@@ -1,19 +1,6 @@
#!/bin/sh
echo Compiling Three.js
python Builder.py
python build.py
python build.py --debug
echo Compiling ThreeDebug.js
python BuilderDebug.py
# echo Compiling ThreeDOM.js
# python BuilderDOM.py
# echo Compiling ThreeCanvas.js
# python BuilderCanvas.py
# echo Compiling ThreeSVG.js
# python BuilderSVG.py
# echo Compiling ThreeWebGL.js
# python BuilderWebGL.py
# python build.py --help