From 90539cc15d0bb7729156f284425f1ecdf5a978a3 Mon Sep 17 00:00:00 2001 From: kovacsv Date: Sun, 24 Oct 2021 18:08:50 +0200 Subject: [PATCH] Move MeshInstanceId to a separate file. --- sandbox/embed_selfhost_errors.html | 1 + sandbox/embed_selfhost_externallibs.html | 1 + sandbox/embed_selfhost_fullscreen.html | 1 + sandbox/embed_selfhost_manual.html | 1 + sandbox/embed_selfhost_multiple.html | 1 + sandbox/embed_selfhost_single.html | 1 + sandbox/embed_selfhost_single_scroll.html | 1 + source/model/meshinstanceid.js | 13 +++++++++++++ source/model/modelutils.js | 14 -------------- tools/config.json | 1 + website/embed.html | 1 + website/index.html | 1 + 12 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 source/model/meshinstanceid.js diff --git a/sandbox/embed_selfhost_errors.html b/sandbox/embed_selfhost_errors.html index c9ee5b4..3ea2d76 100644 --- a/sandbox/embed_selfhost_errors.html +++ b/sandbox/embed_selfhost_errors.html @@ -41,6 +41,7 @@ + diff --git a/sandbox/embed_selfhost_externallibs.html b/sandbox/embed_selfhost_externallibs.html index a776e1d..b32415f 100644 --- a/sandbox/embed_selfhost_externallibs.html +++ b/sandbox/embed_selfhost_externallibs.html @@ -41,6 +41,7 @@ + diff --git a/sandbox/embed_selfhost_fullscreen.html b/sandbox/embed_selfhost_fullscreen.html index e6e14f6..182bec8 100644 --- a/sandbox/embed_selfhost_fullscreen.html +++ b/sandbox/embed_selfhost_fullscreen.html @@ -40,6 +40,7 @@ + diff --git a/sandbox/embed_selfhost_manual.html b/sandbox/embed_selfhost_manual.html index 20fa9e1..0de1d4c 100644 --- a/sandbox/embed_selfhost_manual.html +++ b/sandbox/embed_selfhost_manual.html @@ -41,6 +41,7 @@ + diff --git a/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html index f880b86..c7d79f2 100644 --- a/sandbox/embed_selfhost_multiple.html +++ b/sandbox/embed_selfhost_multiple.html @@ -41,6 +41,7 @@ + diff --git a/sandbox/embed_selfhost_single.html b/sandbox/embed_selfhost_single.html index 9afc8e9..8a45298 100644 --- a/sandbox/embed_selfhost_single.html +++ b/sandbox/embed_selfhost_single.html @@ -40,6 +40,7 @@ + diff --git a/sandbox/embed_selfhost_single_scroll.html b/sandbox/embed_selfhost_single_scroll.html index 41d07f4..b0a2467 100644 --- a/sandbox/embed_selfhost_single_scroll.html +++ b/sandbox/embed_selfhost_single_scroll.html @@ -40,6 +40,7 @@ + diff --git a/source/model/meshinstanceid.js b/source/model/meshinstanceid.js new file mode 100644 index 0000000..230d5e4 --- /dev/null +++ b/source/model/meshinstanceid.js @@ -0,0 +1,13 @@ +OV.MeshInstanceId = class +{ + constructor (nodeId, meshIndex) + { + this.nodeId = nodeId; + this.meshIndex = meshIndex; + } + + IsEqual (rhs) + { + return this.nodeId === rhs.nodeId && this.meshIndex === rhs.meshIndex; + } +}; diff --git a/source/model/modelutils.js b/source/model/modelutils.js index 55e4d44..e36bfb3 100644 --- a/source/model/modelutils.js +++ b/source/model/modelutils.js @@ -1,17 +1,3 @@ -OV.MeshInstanceId = class -{ - constructor (nodeId, meshIndex) - { - this.nodeId = nodeId; - this.meshIndex = meshIndex; - } - - IsEqual (rhs) - { - return this.nodeId === rhs.nodeId && this.meshIndex === rhs.meshIndex; - } -}; - OV.CalculateTriangleNormal = function (v0, v1, v2) { let v = OV.SubCoord3D (v1, v0); diff --git a/tools/config.json b/tools/config.json index d920150..d323b5a 100644 --- a/tools/config.json +++ b/tools/config.json @@ -37,6 +37,7 @@ "source/model/modelfinalization.js", "source/model/quantities.js", "source/model/generator.js", + "source/model/meshinstanceid.js", "source/import/importerutils.js", "source/import/importerbase.js", "source/import/importerobj.js", diff --git a/website/embed.html b/website/embed.html index 065e109..6f53cf1 100644 --- a/website/embed.html +++ b/website/embed.html @@ -50,6 +50,7 @@ + diff --git a/website/index.html b/website/index.html index 6053ad4..cd5d20a 100644 --- a/website/index.html +++ b/website/index.html @@ -50,6 +50,7 @@ +