Move exporter utils content to model utils.

sandbox/embed_selfhost_fullscreen.html

@@ -39,7 +39,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>

sandbox/embed_selfhost_multiple.html

@@ -41,7 +41,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>

sandbox/embed_selfhost_single.html

@@ -39,7 +39,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>

sandbox/embed_selfhost_single_scroll.html

@@ -39,7 +39,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>

source/export/exporterutils.js

@@ -1,34 +0,0 @@
-OV.EnumerateModelVerticesAndTriangles = function (model, callbacks)
-{
-    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
-        let mesh = model.GetMesh (meshIndex);
-        for (let vertexIndex = 0; vertexIndex < mesh.VertexCount (); vertexIndex++) {
-            let vertex = mesh.GetVertex (vertexIndex);
-            callbacks.onVertex (vertex.x, vertex.y, vertex.z);
-        }
-    }
-    let vertexOffset = 0;
-    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
-        let mesh = model.GetMesh (meshIndex);
-        for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
-            let triangle = mesh.GetTriangle (triangleIndex);
-            callbacks.onTriangle (triangle.v0 + vertexOffset, triangle.v1 + vertexOffset, triangle.v2 + vertexOffset);
-        }
-        vertexOffset += mesh.VertexCount ();
-    }
-};
-
-OV.EnumerateModelTrianglesWithNormals = function (model, onTriangle)
-{
-    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
-        let mesh = model.GetMesh (meshIndex);
-        for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
-            let triangle = mesh.GetTriangle (triangleIndex);
-            let v0 = mesh.GetVertex (triangle.v0);
-            let v1 = mesh.GetVertex (triangle.v1);
-            let v2 = mesh.GetVertex (triangle.v2);
-            let normal = OV.CalculateTriangleNormal (v0, v1, v2);
-            onTriangle (v0, v1, v2, normal);
-        }
-    }
-};

source/model/model.js

@@ -95,7 +95,7 @@ OV.Model = class
     {
         return this.meshes[index];
     }
-
+    
     Clear ()
     {
         this.name = '';

source/model/modelutils.js

@@ -171,3 +171,57 @@ OV.CreateMergedModel = function (model)
     mergedModel.AddMesh (mergedMesh);
     return mergedModel;
 };
+
+OV.EnumerateModelVerticesAndTriangles = function (model, callbacks)
+{
+    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
+        let mesh = model.GetMesh (meshIndex);
+        for (let vertexIndex = 0; vertexIndex < mesh.VertexCount (); vertexIndex++) {
+            let vertex = mesh.GetVertex (vertexIndex);
+            callbacks.onVertex (vertex.x, vertex.y, vertex.z);
+        }
+    }
+    let vertexOffset = 0;
+    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
+        let mesh = model.GetMesh (meshIndex);
+        for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
+            let triangle = mesh.GetTriangle (triangleIndex);
+            callbacks.onTriangle (triangle.v0 + vertexOffset, triangle.v1 + vertexOffset, triangle.v2 + vertexOffset);
+        }
+        vertexOffset += mesh.VertexCount ();
+    }
+};
+
+OV.EnumerateModelTriangles = function (model, onTriangle)
+{
+    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
+        let mesh = model.GetMesh (meshIndex);
+        for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
+            let triangle = mesh.GetTriangle (triangleIndex);
+            let v0 = mesh.GetVertex (triangle.v0);
+            let v1 = mesh.GetVertex (triangle.v1);
+            let v2 = mesh.GetVertex (triangle.v2);
+            onTriangle (v0, v1, v2);
+        }
+    }
+};
+
+OV.EnumerateModelTrianglesWithNormals = function (model, onTriangle)
+{
+    for (let meshIndex = 0; meshIndex < model.MeshCount (); meshIndex++) {
+        let mesh = model.GetMesh (meshIndex);
+        for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
+            let triangle = mesh.GetTriangle (triangleIndex);
+            let v0 = mesh.GetVertex (triangle.v0);
+            let v1 = mesh.GetVertex (triangle.v1);
+            let v2 = mesh.GetVertex (triangle.v2);
+            let normal = OV.CalculateTriangleNormal (v0, v1, v2);
+            onTriangle (v0, v1, v2, normal);
+        }
+    }
+};
+
+OV.IsModelClosed ()
+{
+    
+};

tools/config.json

@@ -35,7 +35,6 @@
 		"source/import/importer3ds.js",
 		"source/import/importergltf.js",
 		"source/import/importer.js",
-		"source/export/exporterutils.js",
 		"source/export/exporterbase.js",
 		"source/export/exporterobj.js",
 		"source/export/exporterstl.js",

website/embed.html

@@ -48,7 +48,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>

website/index.html

@@ -48,7 +48,6 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importer.js"></script>
-	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>