Skip to content

Commit 310dd22

Browse files
mrdoobmrdoob
committed
More post-release improvements.
1 parent 605a8c6 commit 310dd22

File tree

3 files changed

+89
-59
lines changed

3 files changed

+89
-59
lines changed

‎build/three.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5784,7 +5784,7 @@ THREE.Ray.prototype = {
57845784
this.direction.copy( v ).sub( this.origin ).normalize();
57855785

57865786
return this;
5787-
5787+
57885788
},
57895789

57905790
recast: function () {
@@ -5855,7 +5855,7 @@ THREE.Ray.prototype = {
58555855

58565856
return function ( v0, v1, optionalPointOnRay, optionalPointOnSegment ) {
58575857

5858-
// from http://www.geometrictools.com/LibMathematics/Distance/Wm5DistRay3Segment3.cpp
5858+
// from http://www.geometrictools.com/GTEngine/Include/Mathematics/GteDistRaySegment.h
58595859
// It returns the min distance between the ray and the segment
58605860
// defined by v0 and v1
58615861
// It can also set two optional targets :
@@ -6176,7 +6176,7 @@ THREE.Ray.prototype = {
61766176

61776177
return function ( a, b, c, backfaceCulling, optionalTarget ) {
61786178

6179-
// from http://www.geometrictools.com/LibMathematics/Intersection/Wm5IntrRay3Triangle3.cpp
6179+
// from http://www.geometrictools.com/GTEngine/Include/Mathematics/GteIntrRay3Triangle3.h
61806180

61816181
edge1.subVectors( b, a );
61826182
edge2.subVectors( c, a );
@@ -28670,7 +28670,7 @@ THREE.WebGLCapabilities = function ( gl, extensions, parameters ) {
2867028670

2867128671
this.getMaxPrecision = getMaxPrecision;
2867228672

28673-
this.precision = parameters.precision !== undefined ? parameters.precision : 'highp',
28673+
this.precision = parameters.precision !== undefined ? parameters.precision : 'highp';
2867428674
this.logarithmicDepthBuffer = parameters.logarithmicDepthBuffer !== undefined ? parameters.logarithmicDepthBuffer : false;
2867528675

2867628676
this.maxTextures = gl.getParameter( gl.MAX_TEXTURE_IMAGE_UNITS );

‎docs/api/core/Object3D.html

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,46 @@ <h3>[method:Object3D getObjectById]([page:Integer id])</h3>
272272
Searches through the object's children and returns the first with a matching id.
273273
</div>
274274

275+
<h3>[method:Vector3 getWorldPosition]([page:Vector3 optionalTarget])</h3>
276+
<div>
277+
optionalTarget — Optional target to set the result. Otherwise, a new `Vector3` is instantiated. (optional)<br />
278+
</div>
279+
<div>
280+
Returns a vector representing the position of the object in world space.
281+
</div>
282+
283+
<h3>[method:Quaternion getWorldQuaternion]([page:Quaternion optionalTarget])</h3>
284+
<div>
285+
optionalTarget — Optional target to set the result. Otherwise, a new `Quaternion` is instantiated. (optional)<br />
286+
</div>
287+
<div>
288+
Returns a quaternion representing the rotation of the object in world space.
289+
</div>
290+
291+
<h3>[method:Euler getWorldRotation]([page:Euler optionalTarget])</h3>
292+
<div>
293+
optionalTarget — Optional target to set the result. Otherwise, a new `Euler` is instantiated. (optional)<br />
294+
</div>
295+
<div>
296+
Returns the euler angles representing the rotation of the object in world space.
297+
</div>
298+
299+
<h3>[method:Vector3 getWorldScale]([page:Vector3 optionalTarget])</h3>
300+
<div>
301+
optionalTarget — Optional target to set the result. Otherwise, a new `Vector3` is instantiated. (optional)<br />
302+
</div>
303+
<div>
304+
Returns a vector of the scaling factors applied to the object for each axis in world space.
305+
</div>
306+
307+
<h3>[method:Vector3 getWorldDirection]([page:Vector3 optionalTarget])</h3>
308+
<div>
309+
optionalTarget — Optional target to set the result. Otherwise, a new `Vector3` is instantiated. (optional)<br />
310+
</div>
311+
<div>
312+
Returns a vector representing the direction of object's positive z-axis in world space.
313+
</div>
314+
275315
<h3>[method:Object3D translateOnAxis]([page:Vector3 axis], [page:Float distance])</h3>
276316
<div>
277317
axis -- A normalized vector in object space.<br />

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

Lines changed: 45 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,46 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
44
<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-
[page:Line] &rarr;
12-
13-
<h1>[name]</h1>
14-
15-
<div class="desc">The GridHelper is an object to define grids. Grids are two-dimensional arrays of lines.</div>
16-
17-
18-
<h2>Example</h2>
19-
20-
<code>var size = 10;
21-
var step = 1;
22-
23-
var gridHelper = new THREE.GridHelper( size, step );
24-
scene.add( gridHelper );
25-
</code>
26-
[example:webgl_helpers Example using various helpers]
27-
28-
29-
<h2>Constructor</h2>
30-
31-
<h3>[name]([page:number size], [page:Number step])</h3>
32-
<div>
33-
size -- The size of the grid <br />
34-
step -- The size of the step between 2 lines
35-
</div>
36-
<div>
37-
Creates a new [name] of size 'size' and with steps of size 'step'.
38-
</div>
39-
40-
<h2>Methods</h2>
41-
42-
<h3>[method:null setColors]([page:number colorCenterLine], [page:Number colorGrid])</h3>
43-
<div>
44-
colorCenterLine -- The color of the centerline. This can be a [page:Color], a hexadecimal value and an CSS-Color name. <br />
45-
colorGrid -- The color of the lines of the grid. This can be a [page:Color], a hexadecimal value and an CSS-Color name.
46-
</div>
47-
<div>
48-
Updates the color of the grid lines.
49-
</div>
50-
51-
52-
<h2>Source</h2>
53-
54-
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
55-
</body>
56-
</html>
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+
[page:Line] &rarr;
12+
13+
<h1>[name]</h1>
14+
15+
<div class="desc">The GridHelper is an object to define grids. Grids are two-dimensional arrays of lines.</div>
16+
17+
18+
<h2>Example</h2>
19+
20+
<code>var size = 10;
21+
var step = 1;
22+
23+
var gridHelper = new THREE.GridHelper( size, step );
24+
scene.add( gridHelper );
25+
</code>
26+
[example:webgl_helpers Example using various helpers]
27+
28+
29+
<h2>Constructor</h2>
30+
31+
<h3>[name]( [page:number size], [page:Number step], [page:Color colorCenterLine], [page:Color colorGrid] )</h3>
32+
<div>
33+
size -- The size of the grid <br />
34+
step -- The size of the step between 2 lines <br />
35+
colorCenterLine -- The color of the centerline. This can be a [page:Color], a hexadecimal value and an CSS-Color name. Default is 0x444444 <br />
36+
colorGrid -- The color of the lines of the grid. This can be a [page:Color], a hexadecimal value and an CSS-Color name. Default is 0x888888
37+
</div>
38+
<div>
39+
Creates a new [name] of size 'size' and with steps of size 'step'. Colors are optional.
40+
</div>
41+
42+
<h2>Source</h2>
43+
44+
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
45+
</body>
46+
</html>

0 commit comments

Comments
 (0)