Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename importer to engine.

Browse Source
This commit is contained in:
kovacsv 2021-07-22 21:18:37 +02:00
parent d992b42541
commit fb81e4ff5a
13 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandbox/embed_selfhost_errors.html
View File

@ -9,7 +9,7 @@
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -67,7 +67,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.Init3DViewerElements (); OV.Init3DViewerElements ();

4
sandbox/embed_selfhost_externallibs.html
View File

@ -9,7 +9,7 @@
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -67,7 +67,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.ExternalLibLocation = '../../libs'; OV.ExternalLibLocation = '../../libs';

4
sandbox/embed_selfhost_fullscreen.html
View File

@ -8,7 +8,7 @@
<title>Online 3D Viewer</title> <title>Online 3D Viewer</title>
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -66,7 +66,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.Init3DViewerElements (); OV.Init3DViewerElements ();

4
sandbox/embed_selfhost_manual.html
View File

@ -9,7 +9,7 @@
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -67,7 +67,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<style> <style>
div div

4
sandbox/embed_selfhost_multiple.html
View File

@ -9,7 +9,7 @@
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -67,7 +67,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.Init3DViewerElements (function (viewers) { OV.Init3DViewerElements (function (viewers) {

4
sandbox/embed_selfhost_single.html
View File

@ -8,7 +8,7 @@
<title>Online 3D Viewer</title> <title>Online 3D Viewer</title>
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -66,7 +66,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.Init3DViewerElements (); OV.Init3DViewerElements ();
</script> </script>

4
sandbox/embed_selfhost_single_scroll.html
View File

@ -8,7 +8,7 @@
<title>Online 3D Viewer</title> <title>Online 3D Viewer</title>
<script type="text/javascript" src="../../libs/three.min-129.js"></script> <script type="text/javascript" src="../../libs/three.min-129.js"></script>
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -66,7 +66,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<script type='text/javascript'> <script type='text/javascript'>
OV.Init3DViewerElements (); OV.Init3DViewerElements ();
</script> </script>

6
test/utils/importall.js
View File

@ -2,9 +2,9 @@ var path = require ('path');
var rewire = require ('rewire'); var rewire = require ('rewire');
var config = require ('../../tools/config.json') var config = require ('../../tools/config.json')
var importerFiles = config['importer_files']; var engineFiles = config['engine_files'];
var fileIndex, filePath; var fileIndex, filePath;
for (fileIndex = 0; fileIndex < importerFiles.length; fileIndex++) { for (fileIndex = 0; fileIndex < engineFiles.length; fileIndex++) {
filePath = importerFiles[fileIndex]; filePath = engineFiles[fileIndex];
rewire (path.join ('..', '..', filePath)); rewire (path.join ('..', '..', filePath));
} }

2
tools/config.json
View File

@ -3,7 +3,7 @@
"libs/jquery-3.5.1.min.js", "libs/jquery-3.5.1.min.js",
"libs/three.min-129.js" "libs/three.min-129.js"
], ],
"importer_files" : [ "engine_files" : [
"source/core/core.js", "source/core/core.js",
"source/core/taskrunner.js", "source/core/taskrunner.js",
"source/geometry/geometry.js", "source/geometry/geometry.js",

4
tools/create_package.py
View File

@ -69,7 +69,7 @@ def CreateDestinationDir (config, rootDir, websiteDir, version, testBuild):
htmlFilePath = os.path.join (websiteDir, htmlFileName) htmlFilePath = os.path.join (websiteDir, htmlFileName)
replacer = Tools.TokenReplacer (htmlFilePath, False) replacer = Tools.TokenReplacer (htmlFilePath, False)
replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None) replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None)
replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, version) replacer.ReplaceTokenFileLinks ('<!-- engine start -->', '<!-- engine end -->', importerFiles, version)
replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, version) replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, version)
externalScriptContent = '' externalScriptContent = ''
externalScriptContent += '<script type="text/javascript">' + replacer.eolChar externalScriptContent += '<script type="text/javascript">' + replacer.eolChar
@ -157,7 +157,7 @@ def Main (argv):
CreateDestinationDir (config, rootDir, websiteDir, version, testBuild) CreateDestinationDir (config, rootDir, websiteDir, version, testBuild)
PrintInfo ('Compress importer sources.') PrintInfo ('Compress importer sources.')
compressResult = CompressFiles (config['importer_files'], os.path.join (websiteDir, 'o3dv', 'o3dv.min.js')) compressResult = CompressFiles (config['engine_files'], os.path.join (websiteDir, 'o3dv', 'o3dv.min.js'))
if not compressResult: if not compressResult:
PrintError ('Compress importer sources failed.') PrintError ('Compress importer sources failed.')
return 1 return 1

8
tools/update_includes.py
View File

@ -27,10 +27,10 @@ def Main (argv):
htmlFilePath = os.path.join (rootDir, htmlFileName) htmlFilePath = os.path.join (rootDir, htmlFileName)
replacer = Tools.TokenReplacer (htmlFilePath, True) replacer = Tools.TokenReplacer (htmlFilePath, True)
libFiles = Tools.CreateFileList (config['lib_files'], 'libs/', '../libs/') libFiles = Tools.CreateFileList (config['lib_files'], 'libs/', '../libs/')
importerFiles = Tools.CreateFileList (config['importer_files'], 'source/', '../source/') importerFiles = Tools.CreateFileList (config['engine_files'], 'source/', '../source/')
websiteFiles = Tools.CreateFileList (config['website_files'], 'website/', '') websiteFiles = Tools.CreateFileList (config['website_files'], 'website/', '')
replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None) replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None)
replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, None) replacer.ReplaceTokenFileLinks ('<!-- engine start -->', '<!-- engine end -->', importerFiles, None)
replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, None) replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, None)
replacer.WriteToFile (htmlFilePath) replacer.WriteToFile (htmlFilePath)
@ -40,8 +40,8 @@ def Main (argv):
continue continue
htmlFilePath = os.path.join (sandboxFolder, htmlFileName) htmlFilePath = os.path.join (sandboxFolder, htmlFileName)
replacer = Tools.TokenReplacer (htmlFilePath, True) replacer = Tools.TokenReplacer (htmlFilePath, True)
importerFiles = Tools.CreateFileList (config['importer_files'], 'source/', '../source/') importerFiles = Tools.CreateFileList (config['engine_files'], 'source/', '../source/')
replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, None) replacer.ReplaceTokenFileLinks ('<!-- engine start -->', '<!-- engine end -->', importerFiles, None)
replacer.WriteToFile (htmlFilePath) replacer.WriteToFile (htmlFilePath)
return 0 return 0

4
website/embed.html
View File

@ -16,7 +16,7 @@
<script type="text/javascript" src="../libs/three.min-129.js"></script> <script type="text/javascript" src="../libs/three.min-129.js"></script>
<!-- libs end --> <!-- libs end -->
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -74,7 +74,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<!-- website start --> <!-- website start -->
<script type="text/javascript" src="o3dv/featureset.js"></script> <script type="text/javascript" src="o3dv/featureset.js"></script>

4
website/index.html
View File

@ -16,7 +16,7 @@
<!-- meta start --> <!-- meta start -->
<!-- meta end --> <!-- meta end -->
<!-- importer start --> <!-- engine start -->
<script type="text/javascript" src="../source/core/core.js"></script> <script type="text/javascript" src="../source/core/core.js"></script>
<script type="text/javascript" src="../source/core/taskrunner.js"></script> <script type="text/javascript" src="../source/core/taskrunner.js"></script>
<script type="text/javascript" src="../source/geometry/geometry.js"></script> <script type="text/javascript" src="../source/geometry/geometry.js"></script>
@ -74,7 +74,7 @@
<script type="text/javascript" src="../source/viewer/navigation.js"></script> <script type="text/javascript" src="../source/viewer/navigation.js"></script>
<script type="text/javascript" src="../source/viewer/viewer.js"></script> <script type="text/javascript" src="../source/viewer/viewer.js"></script>
<script type="text/javascript" src="../source/viewer/domviewer.js"></script> <script type="text/javascript" src="../source/viewer/domviewer.js"></script>
<!-- importer end --> <!-- engine end -->
<!-- website start --> <!-- website start -->
<script type="text/javascript" src="o3dv/featureset.js"></script> <script type="text/javascript" src="o3dv/featureset.js"></script>