Skip to content

Commit 7be3789

Browse files
maximeqmaximeq
committed
Updated dist
1 parent 51e45bf commit 7be3789

File tree

5 files changed

+86
-92
lines changed

5 files changed

+86
-92
lines changed

‎dist/three-js-blobtree.cjs

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
1111
var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
1212

1313
function checkDependancy(packageName, dependancyName, dependancy) {
14+
let duplicationMessage = `${packageName}: ${dependancyName} is duplicated. Your bundle includes ${dependancyName} twice. Please repair your bundle.`;
1415
try {
1516
if (THREE[dependancyName] === undefined) {
1617
THREE[dependancyName] = dependancy;
1718
return;
1819
}
1920

2021
if (THREE[dependancyName] !== dependancy) {
21-
throw new Error(`${packageName}: ${dependancyName} is duplicated. Your bundle includes ${dependancyName} twice. Please repair your bundle.`);
22+
throw duplicationMessage;
2223
}
2324
} catch (error) {
24-
if (!error.message.match(/is duplicated/)) {
25+
if (error !== duplicationMessage) {
2526
console.warn(
26-
`${packageName}: Duplication check unavailable. ${error}`
27+
`${packageName}: Duplication check unavailable.` + error
2728
);
2829
} else {
2930
throw error;
@@ -32,18 +33,10 @@ function checkDependancy(packageName, dependancyName, dependancy) {
3233
}
3334

3435
function checkThreeRevision(packageName, revision) {
35-
try {
36-
if (THREE.REVISION != revision) {
37-
throw new Error(`${packageName} depends on THREE revision ${revision}, but current revision is ${THREE.REVISION}.`)
38-
}
39-
} catch (error) {
40-
if (!error.message.match(/depends on THREE revision/)) {
41-
console.warn(
42-
`${packageName}: Revision check unavailable. ${error}`
43-
);
44-
} else {
45-
throw error;
46-
}
36+
if (THREE.REVISION != revision) {
37+
console.error(
38+
`${packageName} depends on THREE revision ${revision}, but current revision is ${THREE.REVISION}.`
39+
);
4740
}
4841
}
4942

@@ -2499,7 +2492,7 @@ const Material$8 = Material_1;
24992492
class ScaleNode extends Node$2 {
25002493

25012494
static type = "ScaleNode";
2502-
2495+
25032496
/**
25042497
* @param {Array.<Node>=} children The children to add to this node.Just a convenient parameter, you can do it manually using addChild.
25052498
*/
@@ -2545,27 +2538,32 @@ class ScaleNode extends Node$2 {
25452538

25462539
/**
25472540
* @link Node.fromJSON
2548-
*
2541+
*
25492542
* @param {ScaleNodeJSON} json
25502543
* @returns {ScaleNode}
25512544
*/
25522545
static fromJSON(json) {
2553-
var res = new ScaleNode();
2554-
res.setScale(new THREE$k.Vector3(json.scale_x
2555-
,json.scale_y
2556-
,json.scale_z));
2557-
for (var i = 0; i < json.children.length; ++i) {
2558-
res.addChild(Types$f.fromJSON(json.children[i]));
2559-
}
2560-
return res;
2546+
var res = new ScaleNode();
2547+
res.setScale(
2548+
new THREE$k.Vector3(
2549+
json.scale_x,
2550+
json.scale_y,
2551+
json.scale_z
2552+
)
2553+
);
2554+
for (var i = 0; i < json.children.length; ++i) {
2555+
res.addChild(Types$f.fromJSON(json.children[i]));
2556+
}
2557+
return res;
25612558
}
25622559

25632560
/**
25642561
* @link ScaleNode.setScale
2562+
* @param {THREE.Vector3} scale
25652563
*/
25662564
setScale(scale)
25672565
{
2568-
this._scale = scale;
2566+
this._scale.copy(scale);
25692567
this.invalidAABB();
25702568
}
25712569

@@ -2593,7 +2591,7 @@ class ScaleNode extends Node$2 {
25932591
let x_scale = bb_size.x*(this._scale.x - 1.0);
25942592
let y_scale = bb_size.y*(this._scale.y - 1.0);
25952593
let z_scale = bb_size.z*(this._scale.z - 1.0);
2596-
2594+
25972595
this.aabb.expandByVector(new THREE$k.Vector3(x_scale,y_scale,z_scale));
25982596
this.valid_aabb = true;
25992597
}
@@ -2647,15 +2645,15 @@ class ScaleNode extends Node$2 {
26472645

26482646

26492647
if (this.aabb.containsPoint(p) && l !== 0) {
2650-
2648+
26512649

26522650
let center = new THREE$k.Vector3();
26532651
this.aabb.getCenter(center);
2654-
2652+
26552653
let st_p = new THREE$k.Vector3((p.x - center.x)/this._scale.x + center.x
26562654
,(p.y - center.y)/ this._scale.y + center.y
26572655
,(p.z - center.z)/ this._scale.z + center.z);
2658-
2656+
26592657
res.v = Number.MAX_VALUE;
26602658
for (var i = 0; i < l; ++i) {
26612659
this.children[i].value(st_p, tmp);

‎dist/three-js-blobtree.js

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

‎dist/three-js-blobtree.js.map

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

‎dist/three-js-blobtree.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.

‎dist/three-js-blobtree.mjs

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ import require$$0 from 'three';
22
import require$$0$1, { BufferGeometryUtils as BufferGeometryUtils$1 } from 'three/examples/jsm/utils/BufferGeometryUtils';
33

44
function checkDependancy(packageName, dependancyName, dependancy) {
5+
let duplicationMessage = `${packageName}: ${dependancyName} is duplicated. Your bundle includes ${dependancyName} twice. Please repair your bundle.`;
56
try {
67
if (THREE[dependancyName] === undefined) {
78
THREE[dependancyName] = dependancy;
89
return;
910
}
1011

1112
if (THREE[dependancyName] !== dependancy) {
12-
throw new Error(`${packageName}: ${dependancyName} is duplicated. Your bundle includes ${dependancyName} twice. Please repair your bundle.`);
13+
throw duplicationMessage;
1314
}
1415
} catch (error) {
15-
if (!error.message.match(/is duplicated/)) {
16+
if (error !== duplicationMessage) {
1617
console.warn(
17-
`${packageName}: Duplication check unavailable. ${error}`
18+
`${packageName}: Duplication check unavailable.` + error
1819
);
1920
} else {
2021
throw error;
@@ -23,18 +24,10 @@ function checkDependancy(packageName, dependancyName, dependancy) {
2324
}
2425

2526
function checkThreeRevision(packageName, revision) {
26-
try {
27-
if (THREE.REVISION != revision) {
28-
throw new Error(`${packageName} depends on THREE revision ${revision}, but current revision is ${THREE.REVISION}.`)
29-
}
30-
} catch (error) {
31-
if (!error.message.match(/depends on THREE revision/)) {
32-
console.warn(
33-
`${packageName}: Revision check unavailable. ${error}`
34-
);
35-
} else {
36-
throw error;
37-
}
27+
if (THREE.REVISION != revision) {
28+
console.error(
29+
`${packageName} depends on THREE revision ${revision}, but current revision is ${THREE.REVISION}.`
30+
);
3831
}
3932
}
4033

@@ -2490,7 +2483,7 @@ const Material$8 = Material_1;
24902483
class ScaleNode extends Node$2 {
24912484

24922485
static type = "ScaleNode";
2493-
2486+
24942487
/**
24952488
* @param {Array.<Node>=} children The children to add to this node.Just a convenient parameter, you can do it manually using addChild.
24962489
*/
@@ -2536,27 +2529,32 @@ class ScaleNode extends Node$2 {
25362529

25372530
/**
25382531
* @link Node.fromJSON
2539-
*
2532+
*
25402533
* @param {ScaleNodeJSON} json
25412534
* @returns {ScaleNode}
25422535
*/
25432536
static fromJSON(json) {
2544-
var res = new ScaleNode();
2545-
res.setScale(new THREE$k.Vector3(json.scale_x
2546-
,json.scale_y
2547-
,json.scale_z));
2548-
for (var i = 0; i < json.children.length; ++i) {
2549-
res.addChild(Types$f.fromJSON(json.children[i]));
2550-
}
2551-
return res;
2537+
var res = new ScaleNode();
2538+
res.setScale(
2539+
new THREE$k.Vector3(
2540+
json.scale_x,
2541+
json.scale_y,
2542+
json.scale_z
2543+
)
2544+
);
2545+
for (var i = 0; i < json.children.length; ++i) {
2546+
res.addChild(Types$f.fromJSON(json.children[i]));
2547+
}
2548+
return res;
25522549
}
25532550

25542551
/**
25552552
* @link ScaleNode.setScale
2553+
* @param {THREE.Vector3} scale
25562554
*/
25572555
setScale(scale)
25582556
{
2559-
this._scale = scale;
2557+
this._scale.copy(scale);
25602558
this.invalidAABB();
25612559
}
25622560

@@ -2584,7 +2582,7 @@ class ScaleNode extends Node$2 {
25842582
let x_scale = bb_size.x*(this._scale.x - 1.0);
25852583
let y_scale = bb_size.y*(this._scale.y - 1.0);
25862584
let z_scale = bb_size.z*(this._scale.z - 1.0);
2587-
2585+
25882586
this.aabb.expandByVector(new THREE$k.Vector3(x_scale,y_scale,z_scale));
25892587
this.valid_aabb = true;
25902588
}
@@ -2638,15 +2636,15 @@ class ScaleNode extends Node$2 {
26382636

26392637

26402638
if (this.aabb.containsPoint(p) && l !== 0) {
2641-
2639+
26422640

26432641
let center = new THREE$k.Vector3();
26442642
this.aabb.getCenter(center);
2645-
2643+
26462644
let st_p = new THREE$k.Vector3((p.x - center.x)/this._scale.x + center.x
26472645
,(p.y - center.y)/ this._scale.y + center.y
26482646
,(p.z - center.z)/ this._scale.z + center.z);
2649-
2647+
26502648
res.v = Number.MAX_VALUE;
26512649
for (var i = 0; i < l; ++i) {
26522650
this.children[i].value(st_p, tmp);

0 commit comments

Comments
 (0)