Replace environment map.

This commit is contained in:
kovacsv 2021-10-30 13:00:52 +02:00
parent 56d825281a
commit 303d832a70
18 changed files with 47 additions and 21 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 176 KiB

View File

@ -96,12 +96,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">
environmentmap="../website/assets/envmaps/forest/posx.jpg,../website/assets/envmaps/forest/negx.jpg,../website/assets/envmaps/forest/posy.jpg,../website/assets/envmaps/forest/negy.jpg,../website/assets/envmaps/forest/posz.jpg,../website/assets/envmaps/forest/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">
environmentmap="../website/assets/envmaps/forest/posx.jpg,../website/assets/envmaps/forest/negx.jpg,../website/assets/envmaps/forest/posy.jpg,../website/assets/envmaps/forest/negy.jpg,../website/assets/envmaps/forest/posz.jpg,../website/assets/envmaps/forest/negz.jpg">
</div>
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"
@ -110,7 +110,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">
environmentmap="../website/assets/envmaps/forest/posx.jpg,../website/assets/envmaps/forest/negx.jpg,../website/assets/envmaps/forest/posy.jpg,../website/assets/envmaps/forest/negy.jpg,../website/assets/envmaps/forest/posz.jpg,../website/assets/envmaps/forest/negz.jpg">
</div>
<div class="online_3d_viewer"
style="width: 360px; height: 240px;"

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,13 @@
Author
======
This is the work of Emil Persson, aka Humus.
http://www.humus.name
License
=======
This work is licensed under a Creative Commons Attribution 3.0 Unported License.
http://creativecommons.org/licenses/by/3.0/

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -0,0 +1,13 @@
Author
======
This is the work of Emil Persson, aka Humus.
http://www.humus.name
License
=======
This work is licensed under a Creative Commons Attribution 3.0 Unported License.
http://creativecommons.org/licenses/by/3.0/

View File

@ -28,7 +28,7 @@ OV.Embed = class
let defaultColor = this.hashHandler.GetDefaultColorFromHash ();
if (defaultColor !== null) {
settings.defaultColor = defaultColor;
}
}
this.modelLoader.LoadFromUrlList (urls, settings);
let hashParameters = OV.CreateModelUrlParameters (urls);
let websiteUrl = this.parameters.websiteLinkDiv.attr ('href') + '#' + hashParameters;
@ -60,19 +60,19 @@ OV.Embed = class
} else {
this.viewer.SetUpVector (importResult.upVector, false);
}
this.viewer.FitSphereToWindow (boundingSphere, false);
}
this.viewer.FitSphereToWindow (boundingSphere, false);
}
InitViewer (canvas)
{
this.viewer.Init (canvas.get (0));
this.viewer.SetEnvironmentMap ([
'assets/envmaps/fishermans_bastion/posx.jpg',
'assets/envmaps/fishermans_bastion/negx.jpg',
'assets/envmaps/fishermans_bastion/posy.jpg',
'assets/envmaps/fishermans_bastion/negy.jpg',
'assets/envmaps/fishermans_bastion/posz.jpg',
'assets/envmaps/fishermans_bastion/negz.jpg'
'assets/envmaps/forest/posx.jpg',
'assets/envmaps/forest/negx.jpg',
'assets/envmaps/forest/posy.jpg',
'assets/envmaps/forest/negy.jpg',
'assets/envmaps/forest/posz.jpg',
'assets/envmaps/forest/negz.jpg'
]);
}
@ -81,7 +81,7 @@ OV.Embed = class
OV.InitModelLoader (this.modelLoader, {
onStart : () =>
{
},
onFinish : (importResult, threeObject) =>
{
@ -93,8 +93,8 @@ OV.Embed = class
},
onError : (importError) =>
{
}
});
}
}
};

View File

@ -344,12 +344,12 @@ OV.Website = class
this.viewer.Init (canvas.get (0));
this.viewer.SetBackgroundColor (this.settings.backgroundColor);
this.viewer.SetEnvironmentMap ([
'assets/envmaps/fishermans_bastion/posx.jpg',
'assets/envmaps/fishermans_bastion/negx.jpg',
'assets/envmaps/fishermans_bastion/posy.jpg',
'assets/envmaps/fishermans_bastion/negy.jpg',
'assets/envmaps/fishermans_bastion/posz.jpg',
'assets/envmaps/fishermans_bastion/negz.jpg'
'assets/envmaps/forest/posx.jpg',
'assets/envmaps/forest/negx.jpg',
'assets/envmaps/forest/posy.jpg',
'assets/envmaps/forest/negy.jpg',
'assets/envmaps/forest/posz.jpg',
'assets/envmaps/forest/negz.jpg'
]);
this.SetUIState (OV.WebsiteUIState.Intro);
}