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

Environment map background option when embedding the engine.

Browse Source
This commit is contained in:
kovacsv 2022-01-22 16:28:31 +01:00
parent ba22d4d510
commit 0ec5e8d814
4 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sandbox/embed_selfhost_code.html
View File

@ -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'
]);
});
</script>

6
sandbox/embed_selfhost_externallibs.html
View File

@ -33,12 +33,12 @@
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"
model="../../test/testfiles/gltf/Box/glTF-Binary/Box.glb"
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="../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">
</div>
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"
model="../../test/testfiles/gltf/Box/glTF-Draco/Box.gltf,../../test/testfiles/gltf/Box/glTF-Draco/Box.bin"
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="../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">
</div>
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"
@ -47,7 +47,7 @@
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"
model="../../test/testfiles/gltf/DamagedHelmet/glTF-Binary/DamagedHelmet.glb"
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="../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">
</div>
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"

25
source/engine/viewer/embeddedviewer.js
View File

@ -38,9 +38,10 @@ export class EmbeddedViewer
);
}
if (this.parameters.environmentMap) {
// TODO
this.viewer.SetEnvironmentMapSettings (this.parameters.environmentMap, false);
if (this.parameters.environmentSettings) {
let environmentMap = this.parameters.environmentSettings.environmentMap;
let backgroundIsEnvMap = this.parameters.environmentSettings.backgroundIsEnvMap;
this.viewer.SetEnvironmentMapSettings (environmentMap, backgroundIsEnvMap);
}
window.addEventListener ('resize', () => {
@ -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
});
}

16
source/website/embed.js
View File

@ -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;