Skip to content

Commit 2442e96

Browse files
RikaheiRikahei
authored
Merge branch 'mrdoob:dev' into fontLoader_direction
2 parents c7dcccf + b5eb474 commit 2442e96

35 files changed

+1293
-297
lines changed

‎build/three.cjs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57457,34 +57457,34 @@ class CameraHelper extends LineSegments {
5745757457

5745857458
// near
5745957459

57460-
setPoint( 'n1', pointMap, geometry, _camera, - w, - h, nearZ );
57461-
setPoint( 'n2', pointMap, geometry, _camera, w, - h, nearZ );
57462-
setPoint( 'n3', pointMap, geometry, _camera, - w, h, nearZ );
57460+
setPoint( 'n1', pointMap, geometry, _camera, -1, -1, nearZ );
57461+
setPoint( 'n2', pointMap, geometry, _camera, w, -1, nearZ );
57462+
setPoint( 'n3', pointMap, geometry, _camera, -1, h, nearZ );
5746357463
setPoint( 'n4', pointMap, geometry, _camera, w, h, nearZ );
5746457464

5746557465
// far
5746657466

57467-
setPoint( 'f1', pointMap, geometry, _camera, - w, - h, farZ );
57468-
setPoint( 'f2', pointMap, geometry, _camera, w, - h, farZ );
57469-
setPoint( 'f3', pointMap, geometry, _camera, - w, h, farZ );
57467+
setPoint( 'f1', pointMap, geometry, _camera, -1, -1, farZ );
57468+
setPoint( 'f2', pointMap, geometry, _camera, w, -1, farZ );
57469+
setPoint( 'f3', pointMap, geometry, _camera, -1, h, farZ );
5747057470
setPoint( 'f4', pointMap, geometry, _camera, w, h, farZ );
5747157471

5747257472
// up
5747357473

5747457474
setPoint( 'u1', pointMap, geometry, _camera, w * 0.7, h * 1.1, nearZ );
57475-
setPoint( 'u2', pointMap, geometry, _camera, - w * 0.7, h * 1.1, nearZ );
57475+
setPoint( 'u2', pointMap, geometry, _camera, -1 * 0.7, h * 1.1, nearZ );
5747657476
setPoint( 'u3', pointMap, geometry, _camera, 0, h * 2, nearZ );
5747757477

5747857478
// cross
5747957479

57480-
setPoint( 'cf1', pointMap, geometry, _camera, - w, 0, farZ );
57480+
setPoint( 'cf1', pointMap, geometry, _camera, -1, 0, farZ );
5748157481
setPoint( 'cf2', pointMap, geometry, _camera, w, 0, farZ );
57482-
setPoint( 'cf3', pointMap, geometry, _camera, 0, - h, farZ );
57482+
setPoint( 'cf3', pointMap, geometry, _camera, 0, -1, farZ );
5748357483
setPoint( 'cf4', pointMap, geometry, _camera, 0, h, farZ );
5748457484

57485-
setPoint( 'cn1', pointMap, geometry, _camera, - w, 0, nearZ );
57485+
setPoint( 'cn1', pointMap, geometry, _camera, -1, 0, nearZ );
5748657486
setPoint( 'cn2', pointMap, geometry, _camera, w, 0, nearZ );
57487-
setPoint( 'cn3', pointMap, geometry, _camera, 0, - h, nearZ );
57487+
setPoint( 'cn3', pointMap, geometry, _camera, 0, -1, nearZ );
5748857488
setPoint( 'cn4', pointMap, geometry, _camera, 0, h, nearZ );
5748957489

5749057490
geometry.getAttribute( 'position' ).needsUpdate = true;

‎build/three.core.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57455,34 +57455,34 @@ class CameraHelper extends LineSegments {
5745557455

5745657456
// near
5745757457

57458-
setPoint( 'n1', pointMap, geometry, _camera, - w, - h, nearZ );
57459-
setPoint( 'n2', pointMap, geometry, _camera, w, - h, nearZ );
57460-
setPoint( 'n3', pointMap, geometry, _camera, - w, h, nearZ );
57458+
setPoint( 'n1', pointMap, geometry, _camera, -1, -1, nearZ );
57459+
setPoint( 'n2', pointMap, geometry, _camera, w, -1, nearZ );
57460+
setPoint( 'n3', pointMap, geometry, _camera, -1, h, nearZ );
5746157461
setPoint( 'n4', pointMap, geometry, _camera, w, h, nearZ );
5746257462

5746357463
// far
5746457464

57465-
setPoint( 'f1', pointMap, geometry, _camera, - w, - h, farZ );
57466-
setPoint( 'f2', pointMap, geometry, _camera, w, - h, farZ );
57467-
setPoint( 'f3', pointMap, geometry, _camera, - w, h, farZ );
57465+
setPoint( 'f1', pointMap, geometry, _camera, -1, -1, farZ );
57466+
setPoint( 'f2', pointMap, geometry, _camera, w, -1, farZ );
57467+
setPoint( 'f3', pointMap, geometry, _camera, -1, h, farZ );
5746857468
setPoint( 'f4', pointMap, geometry, _camera, w, h, farZ );
5746957469

5747057470
// up
5747157471

5747257472
setPoint( 'u1', pointMap, geometry, _camera, w * 0.7, h * 1.1, nearZ );
57473-
setPoint( 'u2', pointMap, geometry, _camera, - w * 0.7, h * 1.1, nearZ );
57473+
setPoint( 'u2', pointMap, geometry, _camera, -1 * 0.7, h * 1.1, nearZ );
5747457474
setPoint( 'u3', pointMap, geometry, _camera, 0, h * 2, nearZ );
5747557475

5747657476
// cross
5747757477

57478-
setPoint( 'cf1', pointMap, geometry, _camera, - w, 0, farZ );
57478+
setPoint( 'cf1', pointMap, geometry, _camera, -1, 0, farZ );
5747957479
setPoint( 'cf2', pointMap, geometry, _camera, w, 0, farZ );
57480-
setPoint( 'cf3', pointMap, geometry, _camera, 0, - h, farZ );
57480+
setPoint( 'cf3', pointMap, geometry, _camera, 0, -1, farZ );
5748157481
setPoint( 'cf4', pointMap, geometry, _camera, 0, h, farZ );
5748257482

57483-
setPoint( 'cn1', pointMap, geometry, _camera, - w, 0, nearZ );
57483+
setPoint( 'cn1', pointMap, geometry, _camera, -1, 0, nearZ );
5748457484
setPoint( 'cn2', pointMap, geometry, _camera, w, 0, nearZ );
57485-
setPoint( 'cn3', pointMap, geometry, _camera, 0, - h, nearZ );
57485+
setPoint( 'cn3', pointMap, geometry, _camera, 0, -1, nearZ );
5748657486
setPoint( 'cn4', pointMap, geometry, _camera, 0, h, nearZ );
5748757487

5748857488
geometry.getAttribute( 'position' ).needsUpdate = true;

‎build/three.core.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/three.module.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)