Skip to content

Commit f735178

Browse files
mrdoobmrdoob
committed
r81
1 parent f6c33ca commit f735178

File tree

117 files changed

+29741
-27875
lines changed

Some content is hidden

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

117 files changed

+29741
-27875
lines changed

‎build/three.js

Lines changed: 25641 additions & 25585 deletions
Large diffs are not rendered by default.

‎build/three.min.js

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

‎docs/api/core/BufferGeometry.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,6 @@ <h3>[method:null computeBoundingSphere]()</h3>
228228
Bounding spheres aren't computed by default. They need to be explicitly computed, otherwise they are *null*.
229229
</div>
230230

231-
<h3>[method:null computeOffsets] ( [page:Integer size] )</h3>
232-
<div>
233-
Compute the draw offset for large models by chunking the index buffer into chunks of 65k addressable vertices.
234-
This method will effectively rewrite the index buffer and remap all attributes to match the new indices.
235-
WARNING: This method will also expand the vertex count to prevent sprawled triangles across draw offsets.
236-
size - Defaults to 65535 or 4294967296 if extension OES_element_index_uint supported, but allows for larger or smaller chunks.
237-
</div>
238-
239231
<h3>[method:null merge]( [page:BufferGeometry bufferGeometry], [page:Integer offset] )</h3>
240232
<div>
241233
Merge in another BufferGeometry with an optional offset of where to start merging in.

‎docs/api/core/Uniform.html

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<base href="../../" />
6+
<script src="list.js"></script>
7+
<script src="page.js"></script>
8+
<link type="text/css" rel="stylesheet" href="page.css" />
9+
</head>
10+
<body>
11+
<h1>[name]</h1>
12+
13+
<div class="desc">Uniforms are global [link:https://www.opengl.org/documentation/glsl/ GLSL] variables. They are passed to shader programs.
14+
</div>
15+
16+
<h3>Example</h3>
17+
<p>
18+
When declaring a uniform of a [page:ShaderMaterial], it is declared by value or by object.
19+
</p>
20+
<code>
21+
uniforms: {
22+
time: { value: 1.0 },
23+
resolution: new THREE.Uniform(new THREE.Vector2())
24+
}
25+
</code>
26+
27+
<h3>Uniform types</h3>
28+
29+
<p>
30+
Each uniform must have a *value* property. The type of the value must correspond to the type of the uniform variable in the GLSL code as specified for the primitive GLSL types in the table below. Uniform structures and arrays are also supported. GLSL arrays of primitive type must either be specified as an array of the corresponding THREE objects or as a flat array containing the data of all the objects. In other words; GLSL primitives in arrays must not be represented by arrays. This rule does not apply transitively. An array of *vec2* arrays, each with a length of five vectors, must be an array of arrays, of either five *THREE.Vector2* objects or ten *number*s.
31+
</p>
32+
<table>
33+
<caption><a id="uniform-types">Uniform types</a></caption>
34+
<thead>
35+
<tr>
36+
<th>GLSL type</th>
37+
<th>JavaScript type</th>
38+
</tr>
39+
</thead>
40+
<tbody>
41+
42+
<tr>
43+
<td>int</td>
44+
<td>[page:Number]</td>
45+
</tr>
46+
<tr>
47+
<td>float</td>
48+
<td>[page:Number]</td>
49+
</tr>
50+
<tr>
51+
<td>bool</td>
52+
<td>[page:Boolean]</td>
53+
</tr>
54+
<tr>
55+
<td>bool</td>
56+
<td>[page:Number]</td>
57+
</tr>
58+
59+
<tr>
60+
<td>vec2</td>
61+
<td>[page:Vector2 THREE.Vector2]</td>
62+
</tr>
63+
<tr>
64+
<td>vec2</td>
65+
<td>[page:Float32Array Float32Array] (*)</td>
66+
</tr>
67+
<tr>
68+
<td>vec2</td>
69+
<td>[page:Array Array] (*)</td>
70+
</tr>
71+
<tr>
72+
<td>vec3</td>
73+
<td>[page:Vector3 THREE.Vector3]</td>
74+
</tr>
75+
<tr>
76+
<td>vec3</td>
77+
<td>[page:Color THREE.Color]</td>
78+
</tr>
79+
<tr>
80+
<td>vec3</td>
81+
<td>[page:Float32Array Float32Array] (*)</td>
82+
</tr>
83+
<tr>
84+
<td>vec3</td>
85+
<td>[page:Array Array] (*)</td>
86+
</tr>
87+
<tr>
88+
<td>vec4</td>
89+
<td>[page:Vector4 THREE.Vector4]</td>
90+
</tr>
91+
<tr>
92+
<td>vec4</td>
93+
<td>[page:Quaternion THREE.Quaternion]</td>
94+
</tr>
95+
<tr>
96+
<td>vec4</td>
97+
<td>[page:Float32Array Float32Array] (*)</td>
98+
</tr>
99+
<tr>
100+
<td>vec4</td>
101+
<td>[page:Array Array] (*)</td>
102+
</tr>
103+
104+
<tr>
105+
<td>mat2</td>
106+
<td>[page:Float32Array Float32Array] (*)</td>
107+
</td>
108+
<tr>
109+
<td>mat2</td>
110+
<td>[page:Array Array] (*)</td>
111+
</td>
112+
<tr>
113+
<td>mat3</td>
114+
<td>[page:Matrix3 THREE.Matrix3]</td>
115+
</tr>
116+
<tr>
117+
<td>mat3</td>
118+
<td>[page:Float32Array Float32Array] (*)</td>
119+
</tr>
120+
<tr>
121+
<td>mat3</td>
122+
<td>[page:Array Array] (*)</td>
123+
</tr>
124+
<tr>
125+
<td>mat4</td>
126+
<td>[page:Matrix3 THREE.Matrix4]</td>
127+
</tr>
128+
<tr>
129+
<td>mat4</td>
130+
<td>[page:Float32Array Float32Array] (*)</td>
131+
</tr>
132+
<tr>
133+
<td>mat4</td>
134+
<td>[page:Array Array] (*)</td>
135+
</tr>
136+
137+
<tr>
138+
<td>ivec2, bvec2</td>
139+
<td>[page:Float32Array Float32Array] (*)</td>
140+
</tr>
141+
<tr>
142+
<td>ivec2, bvec2</td>
143+
<td>[page:Array Array] (*)</td>
144+
</tr>
145+
<tr>
146+
<td>ivec3, bvec3</td>
147+
<td>[page:Int32Array Int32Array] (*)</td>
148+
</tr>
149+
<tr>
150+
<td>ivec3, bvec3</td>
151+
<td>[page:Array Array] (*)</td>
152+
</tr>
153+
<tr>
154+
<td>ivec4, bvec4</td>
155+
<td>[page:Int32Array Int32Array] (*)</td>
156+
</tr>
157+
<tr>
158+
<td>ivec4, bvec4</td>
159+
<td>[page:Array Array] (*)</td>
160+
</tr>
161+
162+
<tr>
163+
<td>sampler2D</td>
164+
<td>[page:Texture THREE.Texture]</td>
165+
</tr>
166+
<tr>
167+
<td>samplerCube</td>
168+
<td>[page:CubeTexture THREE.CubeTexture]</tr>
169+
</tr>
170+
171+
</tbody>
172+
</table>
173+
</p>
174+
<p>
175+
(*) Same for an (innermost) array (dimension) of the same GLSL type, containing the components of all vectors or matrices in the array.
176+
</p>
177+
178+
<h2>Constructor</h2>
179+
180+
<h3>[name]( [page:Object value] )</h3>
181+
<div>
182+
value -- An object containing the value to set up the uniform. It's type must be one of the Uniform Types described above.
183+
</div>
184+
185+
<h2>Properties</h2>
186+
187+
<h3>[property:Object value]</h3>
188+
<div>
189+
Current value of the uniform.
190+
</div>
191+
192+
<h3>[property:Boolean dynamic]</h3>
193+
<div>
194+
Sets wether this uniform is updated at each render call when used by a renderer.
195+
You must set this attribute by calling [page:.onUpdate].
196+
</div>
197+
198+
<h2>Methods</h2>
199+
200+
<h3>[method:Uniform onUpdate]( [page:Function callback] ) [page:Uniform this]</h3>
201+
<div>
202+
Set the callback function to update this uniform at each render call. The callback has two optional parameters :
203+
<ul>
204+
<li>[page:Object object] : The current object associated to the [page:Material] using this [page:Uniform]</li>
205+
<li>[page:Camera camera] : The current camera used by the current [page:WebGLRenderer]</li>
206+
</ul>
207+
</div>
208+
209+
<h2>Source</h2>
210+
211+
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
212+
</body>
213+
</html>

‎docs/api/extras/helpers/EdgesHelper.html

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

‎docs/api/extras/helpers/WireframeHelper.html

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

‎docs/api/extras/geometries/BoxBufferGeometry.html renamed to ‎docs/api/geometries/BoxBufferGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

‎docs/api/extras/geometries/BoxGeometry.html renamed to ‎docs/api/geometries/BoxGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

‎docs/api/extras/geometries/CircleBufferGeometry.html renamed to ‎docs/api/geometries/CircleBufferGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

‎docs/api/extras/geometries/CircleGeometry.html renamed to ‎docs/api/geometries/CircleGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

‎docs/api/extras/geometries/ConeBufferGeometry.html renamed to ‎docs/api/geometries/ConeBufferGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

‎docs/api/extras/geometries/ConeGeometry.html renamed to ‎docs/api/geometries/ConeGeometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<base href="../../../" />
5+
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
88
<link type="text/css" rel="stylesheet" href="page.css" />

0 commit comments

Comments
 (0)