Delay load rhino3dm so it will be loaded only if it's needed.

sandbox/embed_selfhost_fullscreen.html

@@ -53,6 +53,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>

sandbox/embed_selfhost_multiple.html

@@ -54,6 +54,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>

sandbox/embed_selfhost_single.html

@@ -53,6 +53,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>

sandbox/embed_selfhost_single_scroll.html

@@ -53,6 +53,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>

source/external/externallibs.js

@@ -0,0 +1,15 @@
+OV.ExternalLibLocation = null;
+
+OV.LoadExternalLibrary = function (libName, callbacks)
+{
+    if (OV.ExternalLibLocation === null) {
+        callbacks.error ();
+        return;
+    }
+    let scriptElement = document.createElement ('script');
+    scriptElement.type = 'text/javascript';
+    scriptElement.src = OV.ExternalLibLocation + '/' + libName;
+    scriptElement.onload = callbacks.success;
+    scriptElement.onerror = callbacks.error;
+    document.head.appendChild (scriptElement);
+};

source/external/rhinoimporter.js

@@ -39,10 +39,17 @@ OV.Importer3dm = class extends OV.ImporterBase
     {
 		if (this.rhino === null) {
 			let obj = this;
-			rhino3dm ().then (function (rhino) {
+			OV.LoadExternalLibrary ('rhino3dm.min.js', {
-				obj.rhino = rhino;
+				success : function () {
-				obj.ImportRhinoContent (fileContent);
+					rhino3dm ().then (function (rhino) {
-				onFinish ();
+						obj.rhino = rhino;
+						obj.ImportRhinoContent (fileContent);
+						onFinish ();
+					});
+				},
+				error : function () {
+					onFinish ();
+				}
 			});
 		} else {
 			this.ImportRhinoContent (fileContent);

tools/config.json

@@ -1,8 +1,7 @@
 {
 	"lib_files" : [
 		"libs/jquery-3.5.1.min.js",
-		"libs/three.min-129.js",
+		"libs/three.min-129.js"
-		"libs/rhino3dm.min.js"
 	],
 	"importer_files" : [
 		"source/core/core.js",
@@ -49,6 +48,7 @@
 		"source/export/exporteroff.js",
 		"source/export/exportergltf.js",
 		"source/export/exporter.js",
+		"source/external/externallibs.js",
 		"source/external/rhinoimporter.js",
 		"source/external/rhinoexporter.js",
 		"source/external/threeutils.js",

tools/create_package.py

@@ -71,6 +71,11 @@ def CreateDestinationDir (config, rootDir, websiteDir, version, testBuild):
 		replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None)
 		replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, version)
 		replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, version)
+		externalScriptContent = ''
+		externalScriptContent += '<script type="text/javascript">' + replacer.eolChar
+		externalScriptContent += '    OV.ExternalLibLocation = \'libs\';' + replacer.eolChar
+		externalScriptContent += '</script>'
+		replacer.ReplaceTokenContent ('<!-- externals start -->', '<!-- externals end -->', externalScriptContent)
 		metaFile = os.path.join (rootDir, 'tools', 'website_meta_data.txt')
 		if os.path.exists (metaFile):
 			metaContent = Tools.GetFileContent (metaFile)

tools/lib/tools_lib.py

@@ -57,7 +57,10 @@ class TokenReplacer:
 	def ReplaceContent (self, begToken, endToken, begPosition, endPosition, linePrefix, newContent):
 		if self.keepToken:
 			newContent = linePrefix + begToken + self.eolChar + newContent + self.eolChar + linePrefix + endToken
-		self.fileContent = self.fileContent.replace (self.fileContent[begPosition : endPosition], newContent)
+		self.ReplaceString (self.fileContent[begPosition : endPosition], newContent)
+
+	def ReplaceString (self, oldString, newString):
+		self.fileContent = self.fileContent.replace (oldString, newString)
 
 	def GetTokenBegPosition (self, begToken):	
 		begPosition = self.fileContent.find (begToken)

website/embed.html

@@ -14,7 +14,6 @@
 	<!-- libs start -->
 	<script type="text/javascript" src="../libs/jquery-3.5.1.min.js"></script>
 	<script type="text/javascript" src="../libs/three.min-129.js"></script>
-	<script type="text/javascript" src="../libs/rhino3dm.min.js"></script>
 	<!-- libs end -->
 	
 	<!-- importer start -->
@@ -62,6 +61,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>
@@ -99,7 +99,13 @@
 	<!-- analytics start -->
 	<!-- analytics end -->
 
-	<script type='text/javascript'>
+	<!-- externals start -->
+	<script type="text/javascript">
+		OV.ExternalLibLocation = '../libs';
+	</script>
+	<!-- externals end -->
+
+	<script type="text/javascript">
 		$(window).on ('load', function () {
 			let embed = new OV.Embed ({
 				viewerDiv : $('#embed_viewer'),

website/index.html

@@ -11,7 +11,6 @@
 	<!-- libs start -->
 	<script type="text/javascript" src="../libs/jquery-3.5.1.min.js"></script>
 	<script type="text/javascript" src="../libs/three.min-129.js"></script>
-	<script type="text/javascript" src="../libs/rhino3dm.min.js"></script>
 	<!-- libs end -->
 	
 	<!-- meta start -->
@@ -62,6 +61,7 @@
 	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
 	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/externallibs.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoimporter.js"></script>
 	<script type="text/javascript" src="../source/external/rhinoexporter.js"></script>
 	<script type="text/javascript" src="../source/external/threeutils.js"></script>
@@ -96,7 +96,13 @@
 	<script type="text/javascript" src="o3dv/embed.js"></script>
 	<!-- website end -->
 
-	<script type='text/javascript'>
+	<!-- externals start -->
+	<script type="text/javascript">
+		OV.ExternalLibLocation = '../libs';
+	</script>
+	<!-- externals end -->
+
+	<script type="text/javascript">
 		$(window).on ('load', function () {
 			let website = new OV.Website ({
 				headerDiv : $('#header'),