Skip to content

Commit 0ec5e8d

Browse files
kovacsvkovacsv
committedJan 22, 2022
Environment map background option when embedding the engine.
·
0.15.00.8.6
1 parent ba22d4d commit 0ec5e8d

File tree

4 files changed

+32
-41
lines changed

4 files changed

+32
-41
lines changed
 

‎sandbox/embed_selfhost_code.html

+14-12
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
// initialize the viewer with the parent element and some parameters
2929
let viewer = new OV.EmbeddedViewer (parentDiv, {
3030
camera : new OV.Camera (
31-
new OV.Coord3D (-1.5, -3.0, 2.0),
31+
new OV.Coord3D (-1.5, 2.0, 3.0),
3232
new OV.Coord3D (0.0, 0.0, 0.0),
33-
new OV.Coord3D (0.0, 0.0, 1.0)
33+
new OV.Coord3D (0.0, 1.0, 0.0)
3434
),
3535
backgroundColor : new OV.Color (255, 255, 255),
3636
defaultColor : new OV.Color (200, 200, 200),
@@ -39,20 +39,22 @@
3939
edgeColor : new OV.Color (0, 0, 0),
4040
edgeThreshold : 1
4141
},
42-
environmentMap : [
43-
'../website/assets/envmaps/fishermans_bastion/posx.jpg',
44-
'../website/assets/envmaps/fishermans_bastion/negx.jpg',
45-
'../website/assets/envmaps/fishermans_bastion/posy.jpg',
46-
'../website/assets/envmaps/fishermans_bastion/negy.jpg',
47-
'../website/assets/envmaps/fishermans_bastion/posz.jpg',
48-
'../website/assets/envmaps/fishermans_bastion/negz.jpg'
49-
]
42+
environmentSettings : {
43+
environmentMap : [
44+
'../website/assets/envmaps/fishermans_bastion/posx.jpg',
45+
'../website/assets/envmaps/fishermans_bastion/negx.jpg',
46+
'../website/assets/envmaps/fishermans_bastion/posy.jpg',
47+
'../website/assets/envmaps/fishermans_bastion/negy.jpg',
48+
'../website/assets/envmaps/fishermans_bastion/posz.jpg',
49+
'../website/assets/envmaps/fishermans_bastion/negz.jpg'
50+
],
51+
backgroundIsEnvMap : true
52+
}
5053
});
5154

5255
// load a model providing model urls
5356
viewer.LoadModelFromUrls ([
54-
'../../test/testfiles/obj/hundred_cubes.obj',
55-
'../../test/testfiles/obj/hundred_cubes.mtl'
57+
'../../test/testfiles/gltf/DamagedHelmet/glTF-Binary/DamagedHelmet.glb'
5658
]);
5759
});
5860
</script>

‎sandbox/embed_selfhost_externallibs.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<div class="online_3d_viewer"
3434
style="width: 360px; height: 240px;"
3535
model="../../test/testfiles/gltf/Box/glTF-Binary/Box.glb"
36-
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">
36+
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">
3737
</div>
3838
<div class="online_3d_viewer"
3939
style="width: 360px; height: 240px;"
4040
model="../../test/testfiles/gltf/Box/glTF-Draco/Box.gltf,../../test/testfiles/gltf/Box/glTF-Draco/Box.bin"
41-
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">
41+
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">
4242
</div>
4343
<div class="online_3d_viewer"
4444
style="width: 360px; height: 240px;"
@@ -47,7 +47,7 @@
4747
<div class="online_3d_viewer"
4848
style="width: 360px; height: 240px;"
4949
model="../../test/testfiles/gltf/DamagedHelmet/glTF-Binary/DamagedHelmet.glb"
50-
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">
50+
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">
5151
</div>
5252
<div class="online_3d_viewer"
5353
style="width: 360px; height: 240px;"

‎source/engine/viewer/embeddedviewer.js

+15-10
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ export class EmbeddedViewer
3838
);
3939
}
4040

41-
if (this.parameters.environmentMap) {
42-
// TODO
43-
this.viewer.SetEnvironmentMapSettings (this.parameters.environmentMap, false);
41+
if (this.parameters.environmentSettings) {
42+
let environmentMap = this.parameters.environmentSettings.environmentMap;
43+
let backgroundIsEnvMap = this.parameters.environmentSettings.backgroundIsEnvMap;
44+
this.viewer.SetEnvironmentMapSettings (environmentMap, backgroundIsEnvMap);
4445
}
4546

4647
window.addEventListener ('resize', () => {
@@ -160,12 +161,16 @@ export function Init3DViewerElements (onReady)
160161
edgeSettings = ParameterConverter.StringToEdgeSettings (edgeSettingsParams);
161162
}
162163

163-
let environmentMap = null;
164-
let environmentMapParams = element.getAttribute ('environmentmap');
165-
if (environmentMapParams) {
166-
let environmentMapParts = environmentMapParams.split (',');
167-
if (environmentMapParts.length === 6) {
168-
environmentMap = environmentMapParts;
164+
let environmentSettings = null;
165+
let environmentSettingsParams = element.getAttribute ('environmentsettings');
166+
if (environmentSettingsParams) {
167+
let environmentSettingsParts = environmentSettingsParams.split (',');
168+
if (environmentSettingsParts.length === 6) {
169+
// TODO: background is env map
170+
environmentSettings = {
171+
environmentMap : environmentSettingsParts,
172+
backgroundIsEnvMap : false
173+
};
169174
}
170175
}
171176

@@ -180,7 +185,7 @@ export function Init3DViewerElements (onReady)
180185
backgroundColor : backgroundColor,
181186
defaultColor : defaultColor,
182187
edgeSettings : edgeSettings,
183-
environmentMap : environmentMap
188+
environmentSettings : environmentSettings
184189
});
185190
}
186191

‎source/website/embed.js

-16
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,6 @@ export class Embed
2929
return;
3030
}
3131
TransformFileHostUrls (urls);
32-
// let envMapName = this.hashHandler.GetEnvironmentMapNameFromHash ();
33-
// if (envMapName === null) {
34-
// envMapName = 'fishermans_bastion';
35-
// }
36-
// let envMapPath = 'assets/envmaps/' + envMapName + '/';
37-
// let envMapTextures = [
38-
// envMapPath + 'posx.jpg',
39-
// envMapPath + 'negx.jpg',
40-
// envMapPath + 'posy.jpg',
41-
// envMapPath + 'negy.jpg',
42-
// envMapPath + 'posz.jpg',
43-
// envMapPath + 'negz.jpg'
44-
// ];
45-
// // TODO
46-
// this.viewer.SetEnvironmentMapSettings (envMapTextures, false);
47-
4832

4933
let envMapName = 'fishermans_bastion';
5034
let bgIsEnvMap = false;

0 commit comments

Comments
 (0)
Please sign in to comment.