Skip to content

Commit 1b1fb7a

Browse files
committed
* Code clean up (yuicompressor doesn't throw a single warning :D) and some reformating
* Minor fixes (Geometry normal calculation) * Isolated Matrix3 code into `Matrix3.js` * README and TODO updated
1 parent 79ab4bf commit 1b1fb7a

28 files changed

+675
-661
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ For creating a customised version of the library, including the source files in
9494
<script type="text/javascript" src="js/three/core/Vector3.js"></script>
9595
<script type="text/javascript" src="js/three/core/Vector4.js"></script>
9696
<script type="text/javascript" src="js/three/core/Rectangle.js"></script>
97+
<script type="text/javascript" src="js/three/core/Matrix3.js"></script>
9798
<script type="text/javascript" src="js/three/core/Matrix4.js"></script>
9899
<script type="text/javascript" src="js/three/core/Vertex.js"></script>
99100
<script type="text/javascript" src="js/three/core/Face3.js"></script>
@@ -110,15 +111,16 @@ For creating a customised version of the library, including the source files in
110111
<script type="text/javascript" src="js/three/objects/Line.js"></script>
111112
<script type="text/javascript" src="js/three/objects/Mesh.js"></script>
112113
<script type="text/javascript" src="js/three/materials/LineColorMaterial.js"></script>
113-
<script type="text/javascript" src="js/three/materials/MeshBitmapUVMappingMaterial.js"></script>
114+
<script type="text/javascript" src="js/three/materials/MeshPhongMaterial.js"></script>
115+
<script type="text/javascript" src="js/three/materials/MeshBitmapMaterial.js"></script>
114116
<script type="text/javascript" src="js/three/materials/MeshColorFillMaterial.js"></script>
115117
<script type="text/javascript" src="js/three/materials/MeshColorStrokeMaterial.js"></script>
116-
<script type="text/javascript" src="js/three/materials/MeshFaceColorFillMaterial.js"></script>
117-
<script type="text/javascript" src="js/three/materials/MeshFaceColorStrokeMaterial.js"></script>
118+
<script type="text/javascript" src="js/three/materials/MeshFaceMaterial.js"></script>
118119
<script type="text/javascript" src="js/three/materials/ParticleBitmapMaterial.js"></script>
119120
<script type="text/javascript" src="js/three/materials/ParticleCircleMaterial.js"></script>
120121
<script type="text/javascript" src="js/three/scenes/Scene.js"></script>
121122
<script type="text/javascript" src="js/three/renderers/Projector.js"></script>
123+
<script type="text/javascript" src="js/three/renderers/DOMRenderer.js"></script>
122124
<script type="text/javascript" src="js/three/renderers/CanvasRenderer.js"></script>
123125
<script type="text/javascript" src="js/three/renderers/SVGRenderer.js"></script>
124126
<script type="text/javascript" src="js/three/renderers/WebGLRenderer.js"></script>
@@ -132,11 +134,20 @@ For creating a customised version of the library, including the source files in
132134

133135
Thanks to the power of the internets (and github <3) these people have kindly helped out with the project.
134136

135-
[philogb](http://github.com/philogb), [supereggbert](http://github.com/supereggbert), [kikko](http://github.com/kikko), [kile](http://kile.stravaganza.org/), ...
137+
([alteredq](http://github.com/alteredq)), [philogb](http://github.com/philogb), [supereggbert](http://github.com/supereggbert), [kikko](http://github.com/kikko), [kile](http://kile.stravaganza.org/), ...
136138

137139

138140
### Change Log ###
139141

142+
2010 10 28 - **r25** (54.480 kb)
143+
144+
* `WebGLRenderer` now up to date with other renderers! ([alteredq](http://github.com/alteredq))
145+
* .obj to .js python converter ([alteredq](http://github.com/alteredq))
146+
* Blender 2.54 exporter
147+
* Added `MeshFaceMaterial` (multipass per face)
148+
* Reworked `CanvasRenderer` and `SVGRenderer` material handling
149+
150+
140151
2010 10 06 - **r18** (44.420 kb)
141152

142153
* Added `PointLight`

TODO

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,9 @@ Examples
66
* DOMRenderer example
77

88
Materials
9-
* MeshFaceMaterial? (Renderer would use face materials instead, MeshFaceColorFillFaceMaterial/MeshFaceColorStrokeMaterial wouldn't be needed?)
109
* MeshBitmapSphereMappingMaterial. http://en.wikipedia.org/wiki/Sphere_mapping
1110
* MeshBitmapCubeMappingMaterial. http://en.wikipedia.org/wiki/Cube_mapping
12-
* MeshBitmapMaterial? (Merge all MeshBitmap*Materials and have a mode parameter like... MeshBitmapMaterial.UV_MAPPING)
1311
* MeshShaderMaterial for WebGLRenderer
14-
* Add MeshBitmapUVMappingMaterial to WebGLRenderer
1512

1613
Renderers
17-
* Add PointLight to WebGLRenderer
18-
* WebGLRenderer support MeshBitmapUVMappingMaterial (look at alteredq branch)
19-
* Double check DirectionalLight WebGLRenderer code (doesn't seem correct)
2014
* FrustrumClipping near to Renderer (CanvasRenderer and SVGRenderer)

build/Three.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ThreeDebug.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/camera_free.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<script type="text/javascript" src="../src/core/Vector3.js"></script>
2424
<script type="text/javascript" src="../src/core/Vector4.js"></script>
2525
<script type="text/javascript" src="../src/core/Rectangle.js"></script>
26+
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
2627
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
2728
<script type="text/javascript" src="../src/core/Vertex.js"></script>
2829
<script type="text/javascript" src="../src/core/Face3.js"></script>

examples/hci_clickcube.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<script type="text/javascript" src="../src/core/Vector3.js"></script>
2323
<script type="text/javascript" src="../src/core/Vector4.js"></script>
2424
<script type="text/javascript" src="../src/core/Rectangle.js"></script>
25+
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
2526
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
2627
<script type="text/javascript" src="../src/core/Vertex.js"></script>
2728
<script type="text/javascript" src="../src/core/Face3.js"></script>

examples/lights_test.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ <h1>Lights test</h1>
4949
<script type="text/javascript" src="../src/core/Vector3.js"></script>
5050
<script type="text/javascript" src="../src/core/Vector4.js"></script>
5151
<script type="text/javascript" src="../src/core/Rectangle.js"></script>
52+
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
5253
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
5354
<script type="text/javascript" src="../src/core/Vertex.js"></script>
5455
<script type="text/javascript" src="../src/core/Face3.js"></script>

examples/materials_test.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ <h1>Multi-materials test</h1>
5252
<script type="text/javascript" src="../src/core/Vector3.js"></script>
5353
<script type="text/javascript" src="../src/core/Vector4.js"></script>
5454
<script type="text/javascript" src="../src/core/Rectangle.js"></script>
55+
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
5556
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
5657
<script type="text/javascript" src="../src/core/Vertex.js"></script>
5758
<script type="text/javascript" src="../src/core/Face3.js"></script>

examples/obj_convert_test.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ <h1>OBJ to Three.js converter test</h1>
5252
<script type="text/javascript" src="../src/core/Vector3.js"></script>
5353
<script type="text/javascript" src="../src/core/Vector4.js"></script>
5454
<script type="text/javascript" src="../src/core/Rectangle.js"></script>
55+
<script type="text/javascript" src="../src/core/Matrix3.js"></script>
5556
<script type="text/javascript" src="../src/core/Matrix4.js"></script>
5657
<script type="text/javascript" src="../src/core/Vertex.js"></script>
5758
<script type="text/javascript" src="../src/core/Face3.js"></script>

0 commit comments

Comments
 (0)