diff --git a/sandbox/embed_selfhost_code.html b/sandbox/embed_selfhost_code.html
index 0feb9e4..98ffe46 100644
--- a/sandbox/embed_selfhost_code.html
+++ b/sandbox/embed_selfhost_code.html
@@ -28,9 +28,9 @@
// initialize the viewer with the parent element and some parameters
let viewer = new OV.EmbeddedViewer (parentDiv, {
camera : new OV.Camera (
- new OV.Coord3D (-1.5, -3.0, 2.0),
+ new OV.Coord3D (-1.5, 2.0, 3.0),
new OV.Coord3D (0.0, 0.0, 0.0),
- new OV.Coord3D (0.0, 0.0, 1.0)
+ new OV.Coord3D (0.0, 1.0, 0.0)
),
backgroundColor : new OV.Color (255, 255, 255),
defaultColor : new OV.Color (200, 200, 200),
@@ -39,20 +39,22 @@
edgeColor : new OV.Color (0, 0, 0),
edgeThreshold : 1
},
- environmentMap : [
- '../website/assets/envmaps/fishermans_bastion/posx.jpg',
- '../website/assets/envmaps/fishermans_bastion/negx.jpg',
- '../website/assets/envmaps/fishermans_bastion/posy.jpg',
- '../website/assets/envmaps/fishermans_bastion/negy.jpg',
- '../website/assets/envmaps/fishermans_bastion/posz.jpg',
- '../website/assets/envmaps/fishermans_bastion/negz.jpg'
- ]
+ environmentSettings : {
+ environmentMap : [
+ '../website/assets/envmaps/fishermans_bastion/posx.jpg',
+ '../website/assets/envmaps/fishermans_bastion/negx.jpg',
+ '../website/assets/envmaps/fishermans_bastion/posy.jpg',
+ '../website/assets/envmaps/fishermans_bastion/negy.jpg',
+ '../website/assets/envmaps/fishermans_bastion/posz.jpg',
+ '../website/assets/envmaps/fishermans_bastion/negz.jpg'
+ ],
+ backgroundIsEnvMap : true
+ }
});
// load a model providing model urls
viewer.LoadModelFromUrls ([
- '../../test/testfiles/obj/hundred_cubes.obj',
- '../../test/testfiles/obj/hundred_cubes.mtl'
+ '../../test/testfiles/gltf/DamagedHelmet/glTF-Binary/DamagedHelmet.glb'
]);
});
diff --git a/sandbox/embed_selfhost_externallibs.html b/sandbox/embed_selfhost_externallibs.html
index e5f6360..98058c9 100644
--- a/sandbox/embed_selfhost_externallibs.html
+++ b/sandbox/embed_selfhost_externallibs.html
@@ -33,12 +33,12 @@
+ environmentsettings="../website/assets/envmaps/fishermans_bastion/posx.jpg,../website/assets/envmaps/fishermans_bastion/negx.jpg,../website/assets/envmaps/fishermans_bastion/posy.jpg,../website/assets/envmaps/fishermans_bastion/negy.jpg,../website/assets/envmaps/fishermans_bastion/posz.jpg,../website/assets/envmaps/fishermans_bastion/negz.jpg">
+ environmentsettings="../website/assets/envmaps/fishermans_bastion/posx.jpg,../website/assets/envmaps/fishermans_bastion/negx.jpg,../website/assets/envmaps/fishermans_bastion/posy.jpg,../website/assets/envmaps/fishermans_bastion/negy.jpg,../website/assets/envmaps/fishermans_bastion/posz.jpg,../website/assets/envmaps/fishermans_bastion/negz.jpg">
+ environmentsettings="../website/assets/envmaps/fishermans_bastion/posx.jpg,../website/assets/envmaps/fishermans_bastion/negx.jpg,../website/assets/envmaps/fishermans_bastion/posy.jpg,../website/assets/envmaps/fishermans_bastion/negy.jpg,../website/assets/envmaps/fishermans_bastion/posz.jpg,../website/assets/envmaps/fishermans_bastion/negz.jpg">
{
@@ -160,12 +161,16 @@ export function Init3DViewerElements (onReady)
edgeSettings = ParameterConverter.StringToEdgeSettings (edgeSettingsParams);
}
- let environmentMap = null;
- let environmentMapParams = element.getAttribute ('environmentmap');
- if (environmentMapParams) {
- let environmentMapParts = environmentMapParams.split (',');
- if (environmentMapParts.length === 6) {
- environmentMap = environmentMapParts;
+ let environmentSettings = null;
+ let environmentSettingsParams = element.getAttribute ('environmentsettings');
+ if (environmentSettingsParams) {
+ let environmentSettingsParts = environmentSettingsParams.split (',');
+ if (environmentSettingsParts.length === 6) {
+ // TODO: background is env map
+ environmentSettings = {
+ environmentMap : environmentSettingsParts,
+ backgroundIsEnvMap : false
+ };
}
}
@@ -180,7 +185,7 @@ export function Init3DViewerElements (onReady)
backgroundColor : backgroundColor,
defaultColor : defaultColor,
edgeSettings : edgeSettings,
- environmentMap : environmentMap
+ environmentSettings : environmentSettings
});
}
diff --git a/source/website/embed.js b/source/website/embed.js
index 1af5a27..be1342b 100644
--- a/source/website/embed.js
+++ b/source/website/embed.js
@@ -29,22 +29,6 @@ export class Embed
return;
}
TransformFileHostUrls (urls);
- // let envMapName = this.hashHandler.GetEnvironmentMapNameFromHash ();
- // if (envMapName === null) {
- // envMapName = 'fishermans_bastion';
- // }
- // let envMapPath = 'assets/envmaps/' + envMapName + '/';
- // let envMapTextures = [
- // envMapPath + 'posx.jpg',
- // envMapPath + 'negx.jpg',
- // envMapPath + 'posy.jpg',
- // envMapPath + 'negy.jpg',
- // envMapPath + 'posz.jpg',
- // envMapPath + 'negz.jpg'
- // ];
- // // TODO
- // this.viewer.SetEnvironmentMapSettings (envMapTextures, false);
-
let envMapName = 'fishermans_bastion';
let bgIsEnvMap = false;