diff --git a/docs/Class_Camera.html b/docs/Class_Camera.html index e3eccf5..f89d368 100644 --- a/docs/Class_Camera.html +++ b/docs/Class_Camera.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Class_EdgeSettings.html b/docs/Class_EdgeSettings.html index 0888a9a..8b5c43e 100644 --- a/docs/Class_EdgeSettings.html +++ b/docs/Class_EdgeSettings.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Class_EmbeddedViewer.html b/docs/Class_EmbeddedViewer.html index dc6caef..a458d89 100644 --- a/docs/Class_EmbeddedViewer.html +++ b/docs/Class_EmbeddedViewer.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Class_EnvironmentSettings.html b/docs/Class_EnvironmentSettings.html index 363d70d..32b5f5a 100644 --- a/docs/Class_EnvironmentSettings.html +++ b/docs/Class_EnvironmentSettings.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Class_InputFile.html b/docs/Class_InputFile.html index 9ca394c..23c493e 100644 --- a/docs/Class_InputFile.html +++ b/docs/Class_InputFile.html @@ -46,9 +46,9 @@
Functions
- - + +
@@ -81,7 +81,9 @@
data -* +string +| +File
If the file source is url, this must be the url string. If the file source is file, this must be a File object.
diff --git a/docs/Class_RGBAColor.html b/docs/Class_RGBAColor.html index 38e692a..349aee1 100644 --- a/docs/Class_RGBAColor.html +++ b/docs/Class_RGBAColor.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Class_RGBColor.html b/docs/Class_RGBColor.html index 14bbad2..3ec4b97 100644 --- a/docs/Class_RGBColor.html +++ b/docs/Class_RGBColor.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Enum_CameraMode.html b/docs/Enum_CameraMode.html index d15a603..d421ad0 100644 --- a/docs/Enum_CameraMode.html +++ b/docs/Enum_CameraMode.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Enum_FileSource.html b/docs/Enum_FileSource.html index b101317..a289789 100644 --- a/docs/Enum_FileSource.html +++ b/docs/Enum_FileSource.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Function_Init3DViewerElements.html b/docs/Function_Init3DViewerElements.html index 31a8489..3f871c4 100644 --- a/docs/Function_Init3DViewerElements.html +++ b/docs/Function_Init3DViewerElements.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Function_Init3DViewerElementFromFileList.html b/docs/Function_Init3DViewerFromFileList.html similarity index 87% rename from docs/Function_Init3DViewerElementFromFileList.html rename to docs/Function_Init3DViewerFromFileList.html index ae04e68..8f669db 100644 --- a/docs/Function_Init3DViewerElementFromFileList.html +++ b/docs/Function_Init3DViewerFromFileList.html @@ -6,7 +6,7 @@ - Online 3D Viewer - Init3DViewerElementFromFileList + Online 3D Viewer - Init3DViewerFromFileList @@ -46,9 +46,9 @@
Functions
- - + +
@@ -59,9 +59,9 @@
-

Init3DViewerElementFromFileList

+

Init3DViewerFromFileList

-
Init3DViewerElementFromFileList (parentElement, models, parameters)
+
Init3DViewerFromFileList (parentElement, models, parameters)
Description
Loads the model specified by File objects.
Parameters
@@ -93,7 +93,7 @@
- + diff --git a/docs/Function_Init3DViewerElementFromUrlList.html b/docs/Function_Init3DViewerFromUrlList.html similarity index 87% rename from docs/Function_Init3DViewerElementFromUrlList.html rename to docs/Function_Init3DViewerFromUrlList.html index 8666a44..ed04e97 100644 --- a/docs/Function_Init3DViewerElementFromUrlList.html +++ b/docs/Function_Init3DViewerFromUrlList.html @@ -6,7 +6,7 @@ - Online 3D Viewer - Init3DViewerElementFromUrlList + Online 3D Viewer - Init3DViewerFromUrlList @@ -46,9 +46,9 @@
Functions
- - + +
@@ -59,9 +59,9 @@
-

Init3DViewerElementFromUrlList

+

Init3DViewerFromUrlList

-
Init3DViewerElementFromUrlList (parentElement, modelUrls, parameters)
+
Init3DViewerFromUrlList (parentElement, modelUrls, parameters)
Description
Loads the model specified by urls.
Parameters
@@ -93,7 +93,7 @@
- + diff --git a/docs/Function_SetExternalLibLocation.html b/docs/Function_SetExternalLibLocation.html index b3d6143..0e96e5d 100644 --- a/docs/Function_SetExternalLibLocation.html +++ b/docs/Function_SetExternalLibLocation.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Page_ContributionGuidelines.html b/docs/Page_ContributionGuidelines.html index 6e8ea70..f54d433 100644 --- a/docs/Page_ContributionGuidelines.html +++ b/docs/Page_ContributionGuidelines.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Page_EnvironmentSetup.html b/docs/Page_EnvironmentSetup.html index 2a1b6af..cda733d 100644 --- a/docs/Page_EnvironmentSetup.html +++ b/docs/Page_EnvironmentSetup.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Page_Installation.html b/docs/Page_Installation.html index 2ee3a5b..fdcbd40 100644 --- a/docs/Page_Installation.html +++ b/docs/Page_Installation.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/Page_MigrationGuide.html b/docs/Page_MigrationGuide.html index 0ecfe97..d34e814 100644 --- a/docs/Page_MigrationGuide.html +++ b/docs/Page_MigrationGuide.html @@ -46,9 +46,9 @@
Functions
- - + +
@@ -67,8 +67,8 @@

0.8.21

diff --git a/docs/Page_Usage.html b/docs/Page_Usage.html index fa0a1db..006c3d3 100644 --- a/docs/Page_Usage.html +++ b/docs/Page_Usage.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/index.html b/docs/index.html index 7ef0e97..20c1f1a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -46,9 +46,9 @@
Functions
- - + +
diff --git a/docs/source/MigrationGuide.html b/docs/source/MigrationGuide.html index dcc928e..46cfa45 100644 --- a/docs/source/MigrationGuide.html +++ b/docs/source/MigrationGuide.html @@ -5,6 +5,6 @@

0.8.21

diff --git a/docs/static/script.js b/docs/static/script.js index 4856eff..924739c 100644 --- a/docs/static/script.js +++ b/docs/static/script.js @@ -12,7 +12,7 @@ function Resize () navToggleDiv.style.display = 'block'; navDiv.style.display = 'none'; } else { - let navWidth = '320px'; + let navWidth = '300px'; navDiv.style.width = navWidth; mainDiv.style.marginLeft = navWidth; diff --git a/sandbox/embed_selfhost_manual.html b/sandbox/embed_selfhost_manual.html index 2862134..57dd153 100644 --- a/sandbox/embed_selfhost_manual.html +++ b/sandbox/embed_selfhost_manual.html @@ -30,7 +30,7 @@ '../../test/testfiles/3ds/cube_four_instances.3ds', '../../test/testfiles/3ds/texture.png' ]; - OV.Init3DViewerElementFromUrlList (container, modelUrls); + OV.Init3DViewerFromUrlList (container, modelUrls); } { let container = document.createElement ('div'); @@ -41,7 +41,7 @@ '../../test/testfiles/obj/hundred_cubes.obj', '../../test/testfiles/obj/hundred_cubes.mtl' ]; - OV.Init3DViewerElementFromUrlList (container, modelUrls); + OV.Init3DViewerFromUrlList (container, modelUrls); } { let container = document.createElement ('div'); @@ -52,7 +52,7 @@ '../../test/testfiles/obj/hundred_cubes.obj?param1=value1¶m2=value2', '../../test/testfiles/obj/hundred_cubes.mtl?param1=value1¶m2=value2' ]; - OV.Init3DViewerElementFromUrlList (container, modelUrls); + OV.Init3DViewerFromUrlList (container, modelUrls); } diff --git a/source/engine/import/importerfiles.js b/source/engine/import/importerfiles.js index cb8c033..dc1b9f0 100644 --- a/source/engine/import/importerfiles.js +++ b/source/engine/import/importerfiles.js @@ -9,7 +9,7 @@ export class InputFile /** * @param {string} name Name of the file. * @param {FileSource} source Source of the file. - * @param {*} data If the file source is url, this must be the url string. If the file source + * @param {string|File} data If the file source is url, this must be the url string. If the file source * is file, this must be a {@link File} object. */ constructor (name, source, data) diff --git a/source/engine/main.js b/source/engine/main.js index a830233..fcb3435 100644 --- a/source/engine/main.js +++ b/source/engine/main.js @@ -66,7 +66,7 @@ import { ThreeModelLoader } from './threejs/threemodelloader.js'; import { HasHighpDriverIssue, GetShadingType, ConvertThreeColorToColor, ConvertColorToThreeColor, ConvertThreeGeometryToMesh, DisposeThreeObjects, ShadingType } from './threejs/threeutils.js'; import { Camera, CameraIsEqual3D, CameraMode } from './viewer/camera.js'; import { GetIntegerFromStyle, GetDomElementExternalWidth, GetDomElementExternalHeight, GetDomElementInnerDimensions, GetDomElementClientCoordinates, CreateDomElement, AddDomElement, AddDiv, ClearDomElement, InsertDomElementBefore, InsertDomElementAfter, ShowDomElement, IsDomElementVisible, SetDomElementWidth, SetDomElementHeight, GetDomElementOuterWidth, GetDomElementOuterHeight, SetDomElementOuterWidth, SetDomElementOuterHeight, CreateDiv } from './viewer/domutils.js'; -import { EmbeddedViewer, Init3DViewerElementFromUrlList, Init3DViewerElementFromFileList, Init3DViewerElements } from './viewer/embeddedviewer.js'; +import { EmbeddedViewer, Init3DViewerFromUrlList, Init3DViewerFromFileList, Init3DViewerElements } from './viewer/embeddedviewer.js'; import { MouseInteraction, TouchInteraction, ClickDetector, Navigation, NavigationType } from './viewer/navigation.js'; import { EnvironmentSettings, ShadingModel } from './viewer/shadingmodel.js'; import { CameraValidator, UpVector, Viewer, GetDefaultCamera, TraverseThreeObject, GetShadingTypeOfObject } from './viewer/viewer.js'; @@ -313,8 +313,8 @@ export { SetDomElementOuterHeight, CreateDiv, EmbeddedViewer, - Init3DViewerElementFromUrlList, - Init3DViewerElementFromFileList, + Init3DViewerFromUrlList, + Init3DViewerFromFileList, Init3DViewerElements, MouseInteraction, TouchInteraction, diff --git a/source/engine/viewer/embeddedviewer.js b/source/engine/viewer/embeddedviewer.js index 83213e6..d9ba4c2 100644 --- a/source/engine/viewer/embeddedviewer.js +++ b/source/engine/viewer/embeddedviewer.js @@ -220,7 +220,7 @@ export class EmbeddedViewer * @param {object} parameters See {@link EmbeddedViewer} constructor for details. * @returns {EmbeddedViewer} */ -export function Init3DViewerElementFromUrlList (parentElement, modelUrls, parameters) +export function Init3DViewerFromUrlList (parentElement, modelUrls, parameters) { let viewer = new EmbeddedViewer (parentElement, parameters); viewer.LoadModelFromUrlList (modelUrls); @@ -234,7 +234,7 @@ export function Init3DViewerElementFromUrlList (parentElement, modelUrls, parame * @param {object} parameters See {@link EmbeddedViewer} constructor for details. * @returns {EmbeddedViewer} */ -export function Init3DViewerElementFromFileList (parentElement, models, parameters) +export function Init3DViewerFromFileList (parentElement, models, parameters) { let viewer = new EmbeddedViewer (parentElement, parameters); viewer.LoadModelFromFileList (models); @@ -301,7 +301,7 @@ export function Init3DViewerElements (onReady) modelUrls = ParameterConverter.StringToModelUrls (modelParams); } - return Init3DViewerElementFromUrlList (element, modelUrls, { + return Init3DViewerFromUrlList (element, modelUrls, { camera : camera, cameraMode : cameraMode, backgroundColor : backgroundColor,