diff --git a/tools/build.py b/tools/build.py
index 570a501..a23dc20 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -64,7 +64,8 @@ def CreateDestinationDir (config, rootDir, websiteDir, version, testBuild):
shutil.copytree (os.path.join (rootDir, 'website', 'o3dv', 'css', 'O3DVIcons'), os.path.join (websiteDir, 'o3dv', 'O3DVIcons'))
shutil.copytree (os.path.join (rootDir, 'website', 'info'), os.path.join (websiteDir, 'info'))
- libFiles = config['lib_files']
+ websiteLibFiles = config['website_lib_files']
+ embedLibFiles = config['embed_lib_files']
importerFiles = ['o3dv/o3dv.min.js']
websiteFiles = [
'o3dv/o3dv.website.min.css',
@@ -80,7 +81,8 @@ def CreateDestinationDir (config, rootDir, websiteDir, version, testBuild):
for htmlFileName in htmlFileNames:
htmlFilePath = os.path.join (websiteDir, htmlFileName)
replacer = Tools.TokenReplacer (htmlFilePath, False)
- replacer.ReplaceTokenFileLinks ('', '', libFiles, None)
+ replacer.ReplaceTokenFileLinks ('', '', websiteLibFiles, version)
+ replacer.ReplaceTokenFileLinks ('', '', embedLibFiles, version)
replacer.ReplaceTokenFileLinks ('', '', importerFiles, version)
replacer.ReplaceTokenFileLinks ('', '', websiteFiles, version)
externalScriptContent = ''
diff --git a/tools/config.json b/tools/config.json
index e619c2e..2142f9d 100644
--- a/tools/config.json
+++ b/tools/config.json
@@ -1,9 +1,4 @@
{
- "lib_files" : [
- "libs/pickr.monolith.min.css",
- "libs/pickr.es5.min.js",
- "libs/three.min.js"
- ],
"engine_files" : [
"source/core/core.js",
"source/core/taskrunner.js",
@@ -107,5 +102,13 @@
"website/o3dv/css/sidebar.css",
"website/o3dv/css/website.css",
"website/o3dv/css/embed.css"
+ ],
+ "website_lib_files" : [
+ "libs/pickr.monolith.min.css",
+ "libs/pickr.es5.min.js",
+ "libs/three.min.js"
+ ],
+ "embed_lib_files" : [
+ "libs/three.min.js"
]
}
diff --git a/tools/update.py b/tools/update.py
index 435b124..f43fe89 100644
--- a/tools/update.py
+++ b/tools/update.py
@@ -14,7 +14,7 @@ def Main (argv):
toolsDir = os.path.dirname (os.path.abspath (__file__))
rootDir = os.path.dirname (toolsDir)
os.chdir (rootDir)
-
+
config = None
with open (os.path.join (toolsDir, 'config.json')) as configJson:
config = json.load (configJson)
@@ -26,12 +26,14 @@ def Main (argv):
for htmlFileName in websiteFiles:
htmlFilePath = os.path.join (rootDir, htmlFileName)
replacer = Tools.TokenReplacer (htmlFilePath, True)
- libFiles = Tools.CreateFileList (config['lib_files'], 'libs/', '../libs/')
+ websiteLibFiles = Tools.CreateFileList (config['website_lib_files'], 'libs/', '../libs/')
+ embedLibFiles = Tools.CreateFileList (config['embed_lib_files'], 'libs/', '../libs/')
importerFiles = Tools.CreateFileList (config['engine_files'], 'source/', '../source/')
websiteCssFiles = Tools.CreateFileList (config['website_files_css'], 'website/', '')
websiteJsFiles = Tools.CreateFileList (config['website_files_js'], 'website/', '')
websiteFiles = websiteCssFiles + websiteJsFiles
- replacer.ReplaceTokenFileLinks ('', '', libFiles, None)
+ replacer.ReplaceTokenFileLinks ('', '', websiteLibFiles, None)
+ replacer.ReplaceTokenFileLinks ('', '', embedLibFiles, None)
replacer.ReplaceTokenFileLinks ('', '', importerFiles, None)
replacer.ReplaceTokenFileLinks ('', '', websiteFiles, None)
replacer.WriteToFile (htmlFilePath)
@@ -45,7 +47,7 @@ def Main (argv):
importerFiles = Tools.CreateFileList (config['engine_files'], 'source/', '../source/')
replacer.ReplaceTokenFileLinks ('', '', importerFiles, None)
replacer.WriteToFile (htmlFilePath)
-
+
return 0
sys.exit (Main (sys.argv))
diff --git a/website/assets/images/3dviewer_net_logo_social.png b/website/assets/images/3dviewer_net_logo_social.png
new file mode 100644
index 0000000..28c694e
Binary files /dev/null and b/website/assets/images/3dviewer_net_logo_social.png differ
diff --git a/website/embed.html b/website/embed.html
index ba68718..e25aabd 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -11,11 +11,9 @@
-
-
-
+
-
+
diff --git a/website/index.html b/website/index.html
index 8c38927..dac0c6c 100644
--- a/website/index.html
+++ b/website/index.html
@@ -8,11 +8,11 @@
Online 3D Viewer
-
+
-
+
diff --git a/website/o3dv/js/website.js b/website/o3dv/js/website.js
index 6f32036..8966ec5 100644
--- a/website/o3dv/js/website.js
+++ b/website/o3dv/js/website.js
@@ -1,5 +1,6 @@
OV.WebsiteUIState =
{
+ Undefined : 0,
Intro : 1,
Model : 2,
Loading : 3
@@ -21,6 +22,7 @@ OV.Website = class
this.modelLoader = new OV.ThreeModelLoader ();
this.themeHandler = new OV.ThemeHandler ();
this.highlightColor = new THREE.Color (0x8ec9f0);
+ this.uiState = OV.WebsiteUIState.Undefined;
this.model = null;
this.dialog = null;
}
@@ -85,7 +87,9 @@ OV.Website = class
OnSmallWidthChanged ()
{
- this.UpdatePanelsVisibility ();
+ if (this.uiState === OV.WebsiteUIState.Model) {
+ this.UpdatePanelsVisibility ();
+ }
}
HasLoadedModel ()
@@ -101,16 +105,21 @@ OV.Website = class
root.style.setProperty ('--ov_only_on_model_display', show ? 'inherit' : 'none');
}
- if (uiState === OV.WebsiteUIState.Intro) {
+ if (this.uiState === uiState) {
+ return;
+ }
+
+ this.uiState = uiState;
+ if (this.uiState === OV.WebsiteUIState.Intro) {
OV.ShowDomElement (this.parameters.introDiv);
OV.HideDomElement (this.parameters.mainDiv);
ShowOnlyOnModelElements (false);
- } else if (uiState === OV.WebsiteUIState.Model) {
+ } else if (this.uiState === OV.WebsiteUIState.Model) {
OV.HideDomElement (this.parameters.introDiv);
OV.ShowDomElement (this.parameters.mainDiv);
ShowOnlyOnModelElements (true);
this.UpdatePanelsVisibility ();
- } else if (uiState === OV.WebsiteUIState.Loading) {
+ } else if (this.uiState === OV.WebsiteUIState.Loading) {
OV.HideDomElement (this.parameters.introDiv);
OV.HideDomElement (this.parameters.mainDiv);
ShowOnlyOnModelElements (false);