From dddd7a22e0c9f10d3dd09b6b49ff9970743378bb Mon Sep 17 00:00:00 2001 From: kovacsv Date: Sun, 28 Nov 2021 17:20:42 +0100 Subject: [PATCH] Separate needed lib files for website and embedded page. --- tools/build.py | 6 ++++-- tools/config.json | 13 ++++++++----- tools/update.py | 10 ++++++---- .../assets/images/3dviewer_net_logo_social.png | Bin 0 -> 29584 bytes website/embed.html | 6 ++---- website/index.html | 4 ++-- website/o3dv/js/website.js | 17 +++++++++++++---- 7 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 website/assets/images/3dviewer_net_logo_social.png 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 0000000000000000000000000000000000000000..28c694e14fa86aa7ff08fc918b1f1c4f020135f6 GIT binary patch literal 29584 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ⅇA(pYj8x`craux%u8J>vuPhZ|N^h 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 literal 0 HcmV?d00001 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);