Skip to content

Commit 0b35549

Browse files
mrdoobmrdoob
committed
r70
1 parent ea27d09 commit 0b35549

File tree

469 files changed

+13235
-6277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

469 files changed

+13235
-6277
lines changed

‎build/three.js‎

Lines changed: 1333 additions & 1518 deletions
Large diffs are not rendered by default.

‎build/three.min.js‎

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

‎docs/api/cameras/CubeCamera.html‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<script src="../../list.js"></script>
6+
<script src="../../page.js"></script>
7+
<link type="text/css" rel="stylesheet" href="../../page.css" />
8+
</head>
9+
<body>
10+
[page:Object3D] &rarr;
11+
12+
<h1>[name]</h1>
13+
14+
<div class="desc">Creates 6 cameras that render to a [page:WebGLRenderTargetCube].</div>
15+
16+
<h2>Examples</h2>
17+
18+
<div>[example:webgl_materials_cubemap_dynamic materials / cubemap / dynamic ]</div>
19+
<div>[example:webgl_materials_cubemap_dynamic2 materials / cubemap / dynamic2 ]</div>
20+
<div>[example:webgl_materials_cubemap_dynamic2 shading / physical ]</div>
21+
22+
<code>//Create cube camera
23+
var cubeCamera = new THREE.CubeCamera( 1, 100000, 128 );
24+
scene.add( cubeCamera );
25+
26+
//Create car
27+
var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, ambient: 0xffffff, envMap: cubeCamera.renderTarget } );
28+
var car = new Mesh( carGeometry, chromeMaterial );
29+
scene.add( car );
30+
31+
//Update the render target cube
32+
car.setVisible( false );
33+
cubeCamera.position.copy( car.position );
34+
cubeCamera.updateCubeMap( renderer, scene );
35+
36+
//Render the scene
37+
car.setVisible( true );
38+
renderer.render( scene, camera );
39+
</code>
40+
41+
42+
<h2>Constructor</h2>
43+
44+
45+
<h3>[name]([page:number near], [page:number far], [page:number cubeResolution])</h3>
46+
<div>
47+
near -- The near clipping distance. <br />
48+
far -- The far clipping distance <br />
49+
cubeResolution -- Sets the width of the cube.
50+
</div>
51+
<div>
52+
Constructs a CubeCamera that contains 6 [page:PerspectiveCamera PerspectiveCameras] that then
53+
render to a [page:WebGLRenderTargetCube]
54+
</div>
55+
56+
57+
<h2>Properties</h2>
58+
59+
60+
61+
<h3>[property:WebGLRenderTargetCube renderTarget]</h3>
62+
<div>
63+
The cube texture that gets generated.
64+
</div>
65+
66+
<h2>Methods</h2>
67+
68+
69+
70+
<h3>[method:todo updateCubeMap]([page:todo renderer], [page:todo scene])</h3>
71+
<div>
72+
renderer -- The current WebGL renderer <br />
73+
scene -- The current scene
74+
</div>
75+
<div>
76+
Call this to update the renderTarget.
77+
</div>
78+
79+
<h2>Source</h2>
80+
81+
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
82+
</body>
83+
</html>

‎docs/api/constants/ShadowingTypes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link type="text/css" rel="stylesheet" href="../../page.css" />
88
</head>
99
<body>
10-
<h1>Shadowing Type Contants</h1>
10+
<h1>Shadowing Type Constants</h1>
1111

1212
<h2>Shadow Map</h2>
1313
<div>

‎docs/api/constants/Textures.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ <h2>Mapping Modes</h2>
2121
THREE.UVMapping<br />
2222
THREE.CubeReflectionMapping<br />
2323
THREE.CubeRefractionMapping<br />
24-
THREE.SphericalReflectionMapping<br />
25-
THREE.SphericalRefractionMapping
24+
THREE.SphericalReflectionMapping
2625
</div>
2726

2827
<h2>Wrapping Modes</h2>

‎docs/api/core/Object3D.html‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2>Properties</h2>
2525

2626
<h3>[property:Integer id]</h3>
2727
<div>
28-
Unique number for this object instance.
28+
readonly – Unique number for this object instance.
2929
</div>
3030

3131
<h3>[property:String uuid]</h3>
@@ -59,11 +59,6 @@ <h3>[property:Euler rotation]</h3>
5959
Object's local rotation (<a href="https://en.wikipedia.org/wiki/Euler_angles" target="_blank">Euler angles</a>), in radians.
6060
</div>
6161

62-
<h3>[property:String eulerOrder]</h3>
63-
<div>
64-
Order of axis for Euler angles.
65-
</div>
66-
6762
<h3>[property:Vector3 scale]</h3>
6863
<div>
6964
Object's local scale.
@@ -81,53 +76,64 @@ <h3>[property:Matrix4 matrix]</h3>
8176

8277
<h3>[property:Quaternion quaternion]</h3>
8378
<div>
84-
Object's local rotation as [page:Quaternion Quaternion]. Only used when useQuaternion is set to true.
85-
</div>
86-
87-
<h3>[property:Boolean useQuaternion]</h3>
88-
<div>
89-
Use quaternion instead of Euler angles for specifying local rotation.
90-
</div>
91-
92-
<h3>[property:Float renderDepth]</h3>
93-
<div>
94-
Override depth-sorting order if non *null*.
79+
Object's local rotation as [page:Quaternion Quaternion].
9580
</div>
9681

9782
<h3>[property:Boolean visible]</h3>
9883
<div>
9984
Object gets rendered if *true*.
10085
</div>
86+
<div>
87+
default – true
88+
</div>
10189

10290
<h3>[property:Boolean castShadow]</h3>
10391
<div>
10492
Gets rendered into shadow map.
10593
</div>
94+
<div>
95+
default – false
96+
</div>
10697

10798
<h3>[property:Boolean receiveShadow]</h3>
10899
<div>
109100
Material gets baked in shadow receiving.
110101
</div>
102+
<div>
103+
default – false
104+
</div>
111105

112106
<h3>[property:Boolean frustumCulled]</h3>
113107
<div>
114108
When this is set, it checks every frame if the object is in the frustum of the camera. Otherwise the object gets drawn every frame even if it isn't visible.
115109
</div>
110+
<div>
111+
default – true
112+
</div>
116113

117114
<h3>[property:Boolean matrixAutoUpdate]</h3>
118115
<div>
119116
When this is set, it calculates the matrix of position, (rotation or quaternion) and scale every frame and also recalculates the matrixWorld property.
120117
</div>
118+
<div>
119+
default – true
120+
</div>
121121

122122
<h3>[property:Boolean matrixWorldNeedsUpdate]</h3>
123123
<div>
124124
When this is set, it calculates the matrixWorld in that frame and resets this property to false.
125125
</div>
126+
<div>
127+
default – false
128+
</div>
126129

127130
<h3>[property:Boolean rotationAutoUpdate]</h3>
128131
<div>
129132
When this is set, then the rotationMatrix gets calculated every frame.
130133
</div>
134+
<div>
135+
default – true
136+
</div>
131137

132138
<h3>[property:object userData]</h3>
133139
<div>
@@ -200,29 +206,46 @@ <h3>[method:null lookAt]( [page:Vector3 vector] )</h3>
200206
Rotates object to face point in space.
201207
</div>
202208

203-
<h3>[method:null add]( [page:Object3D object] )</h3>
209+
<h3>[method:null add]( [page:Object3D object], ... )</h3>
204210
<div>
205211
object - An object.<br />
206212
</div>
207213
<div>
208-
Adds *object* as child of this object.
214+
Adds *object* as child of this object. An arbitrary number of objects may be added.
209215
</div>
210216

211-
<h3>[method:null remove]( [page:Object3D object] )</h3>
217+
<h3>[method:null remove]( [page:Object3D object], ... )</h3>
212218
<div>
213219
object - An object.<br />
214220
</div>
215221
<div>
216-
Removes *object* as child of this object.
222+
Removes *object* as child of this object. An arbitrary number of objects may be removed.
217223
</div>
218224

219225
<h3>[method:null traverse]( [page:Function callback] )</h3>
220226
<div>
221-
callback - An Function with as first argument an object3D object.<br />
227+
callback - A function with as first argument an object3D object.<br />
222228
</div>
223229
<div>
224230
Executes the callback on this object and all descendants.
225231
</div>
232+
233+
<h3>[method:null traverseVisible]( [page:Function callback] )</h3>
234+
<div>
235+
callback - A function with as first argument an object3D object.<br />
236+
</div>
237+
<div>
238+
Like traverse, but the callback will only be executed for visible objects.
239+
Descendants of invisible objects are not traversed.
240+
</div>
241+
242+
<h3>[method:null traverseAncestors]( [page:Function callback] )</h3>
243+
<div>
244+
callback - A function with as first argument an object3D object.<br />
245+
</div>
246+
<div>
247+
Executes the callback on this object and all ancestors.
248+
</div>
226249

227250
<h3>[method:null updateMatrix]()</h3>
228251
<div>

‎docs/api/examples/Lut.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2>Constructor</h2>
2525

2626
<h3>[name]( colormap, numberOfColors )</h3>
2727
<div>
28-
colormap - optional argument that sets a colormap from prefefined colormaps. Available colormaps are : "rainbow", "cooltowarm", "blackbody".
28+
colormap - optional argument that sets a colormap from predefined colormaps. Available colormaps are : "rainbow", "cooltowarm", "blackbody".
2929
numberOfColors - optional argument that sets the number of colors used to represent the data array.
3030
</div>
3131

‎docs/api/extras/cameras/CombinedCamera.html‎ renamed to ‎docs/api/examples/cameras/CombinedCamera.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
<h1>[name]</h1>
1313

14-
<div class="desc">A general perpose camera, for setting FOV, Lens Focal Length,
14+
<div class="desc">A general purpose camera, for setting FOV, Lens Focal Length,
1515
and switching between perspective and orthographic views easily.
1616
Use this only if you do not wish to manage
17-
both a Orthographic and Perspective Camera</div>
17+
both an Orthographic and Perspective Camera</div>
1818

1919

2020
<h2>Constructor</h2>
@@ -69,14 +69,14 @@ <h3>[property:number zoom]</h3>
6969
Gets or sets the zoom factor of the camera.
7070
</div>
7171

72-
<h3>[property:number far]</h3>
72+
<h3>[property:number near]</h3>
7373
<div>
74-
Gets camera frustum far plane.
74+
Gets camera frustum near plane.
7575
</div>
7676

77-
<h3>[property:number near]</h3>
77+
<h3>[property:number far]</h3>
7878
<div>
79-
Gets camera frustum near plane.
79+
Gets camera frustum far plane.
8080
</div>
8181

8282
<h3>[property:OrthographicCamera cameraO]</h3>
@@ -101,23 +101,23 @@ <h3>[property:boolean inPerspectiveMode]</h3>
101101

102102
<h2>Methods</h2>
103103

104-
<h3>[method:todo setFov]([page:Number fov])</h3>
104+
<h3>[method:null setFov]([page:Number fov])</h3>
105105
<div>
106106
fov -- Camera frustum vertical field of view in perspective view.
107107
</div>
108108
<div>
109109
sets the camera frustum vertical field of view in perspective view.
110110
</div>
111111

112-
<h3>[method:todo setZoom]([page:Number zoom])</h3>
112+
<h3>[method:null setZoom]([page:Number zoom])</h3>
113113
<div>
114114
zoom -- The zoom factor.
115115
</div>
116116
<div>
117117
Sets the zoomfactor.
118118
</div>
119119

120-
<h3>[method:todo setLens]([page:number focalLength], [page:Number frameHeight])</h3>
120+
<h3>[method:null setLens]([page:number focalLength], [page:Number frameHeight])</h3>
121121
<div>
122122
focalLength -- The focal length of a lens is defined as the distance from the optical center of a lens (or, the secondary principal point for a complex lens like a camera lens) to the focal point (sensor) when the lens is focused on an object at infinity. <br />
123123
frameHeight -- the size of the frame in mm. (default is *35*)
@@ -126,37 +126,37 @@ <h3>[method:todo setLens]([page:number focalLength], [page:Number frameHeight])<
126126
Sets the fov based on lens data.
127127
</div>
128128

129-
<h3>[method:todo toFrontView]()</h3>
129+
<h3>[method:null toFrontView]()</h3>
130130
<div>
131131
Sets the camera to view the front of the target.
132132
</div>
133133

134-
<h3>[method:todo toBackView]()</h3>
134+
<h3>[method:null toBackView]()</h3>
135135
<div>
136136
Sets the camera to view the back of the target.
137137
</div>
138138

139-
<h3>[method:todo toLeftView]()</h3>
139+
<h3>[method:null toLeftView]()</h3>
140140
<div>
141141
Sets the camera to view the left of the target.
142142
</div>
143143

144-
<h3>[method:todo toRightView]()</h3>
144+
<h3>[method:null toRightView]()</h3>
145145
<div>
146146
Sets the camera to view the right of the target.
147147
</div>
148148

149-
<h3>[method:todo toTopView]()</h3>
149+
<h3>[method:null toTopView]()</h3>
150150
<div>
151151
Sets the camera to view the top.
152152
</div>
153153

154-
<h3>[method:todo toBottomView]()</h3>
154+
<h3>[method:null toBottomView]()</h3>
155155
<div>
156156
Sets the camera to view the bottom.
157157
</div>
158158

159-
<h3>[method:todo setSize]([page:Number width], [page:Number height])</h3>
159+
<h3>[method:null setSize]([page:Number width], [page:Number height])</h3>
160160
<div>
161161
width -- The width of the orthographic view.<br />
162162
height -- The height of the orthographic view.
@@ -165,17 +165,17 @@ <h3>[method:todo setSize]([page:Number width], [page:Number height])</h3>
165165
Sets the size of the orthographic view.
166166
</div>
167167

168-
<h3>[method:todo toOrthographic]()</h3>
168+
<h3>[method:null toOrthographic]()</h3>
169169
<div>
170170
Change the camera to orthographic view.
171171
</div>
172172

173-
<h3>[method:todo toPerspective]()</h3>
173+
<h3>[method:null toPerspective]()</h3>
174174
<div>
175175
Change the camera to Perspective view.
176176
</div>
177177

178-
<h3>[method:todo updateProjectionMatrix]()</h3>
178+
<h3>[method:null updateProjectionMatrix]()</h3>
179179
<div>
180180
Updates the ProjectionMatrix.
181181
</div>

0 commit comments

Comments
 (0)