Skip to content

Editor: Store background in IndexedDB #22023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2021
Merged

Editor: Store background in IndexedDB #22023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0000ef5
ObjectLoader: Clean up
mrdoob Jun 19, 2021
f78ac45
Object3D: Clean up
mrdoob Jun 19, 2021
1d68aa0
Editor: Store background in IndexedDB
mrdoob Jun 19, 2021
4f1f9e7
Editor: Simplified background handling.
mrdoob Jun 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/js/Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Editor.prototype = {
this.scene.uuid = scene.uuid;
this.scene.name = scene.name;

this.scene.background = ( scene.background !== null ) ? scene.background.clone() : null;
Copy link
Owner Author

@mrdoob mrdoob Jun 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember why we were cloning scene.background.

Copy link
Collaborator

@Mugen87 Mugen87 Jun 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe because scene.fog is cloned, too^^?

It seems the line was added like that right from the beginning: 750973b#diff-c7a0a223e819b2c4e36644546146290d9d14f241cf78daa5438faf335a2aff35R124

Copy link
Collaborator

@Mugen87 Mugen87 Jun 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you have changed the code, it makes sense to align:

three.js/editor/js/Editor.js

Line 136 in 8d30d74

if ( scene.fog !== null ) this.scene.fog = scene.fog.clone();

Copy link
Owner Author

@mrdoob mrdoob Jun 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! 64c6990

this.scene.background = scene.background;

if ( scene.fog !== null ) this.scene.fog = scene.fog.clone();

Expand Down
23 changes: 16 additions & 7 deletions editor/js/Sidebar.Scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import * as THREE from '../../build/three.module.js';

import { UIPanel, UIBreak, UIRow, UIColor, UISelect, UIText, UINumber } from './libs/ui.js';
import { UIOutliner, UITexture } from './libs/ui.three.js';

Expand Down Expand Up @@ -166,7 +168,6 @@ function SidebarScene( editor ) {
refreshBackgroundUI();

} );
backgroundType.setValue( 'Color' );

backgroundRow.add( new UIText( strings.getKey( 'sidebar/scene/background' ) ).setWidth( '90px' ) );
backgroundRow.add( backgroundType );
Expand Down Expand Up @@ -376,18 +377,26 @@ function SidebarScene( editor ) {

backgroundType.setValue( 'Color' );
backgroundColor.setHexValue( scene.background.getHex() );
backgroundTexture.setValue( null );
backgroundEquirectangularTexture.setValue( null );

}
} else if ( scene.background.isTexture ) {

if ( scene.background.mapping === THREE.EquirectangularReflectionMapping ) {

backgroundType.setValue( 'Equirectangular' );
backgroundEquirectangularTexture.setValue( scene.background );

} else {

// TODO: Add Texture/EquirectangularTexture support
backgroundType.setValue( 'Texture' );
backgroundTexture.setValue( scene.background );

}

}

} else {

backgroundType.setValue( 'None' );
backgroundTexture.setValue( null );
backgroundEquirectangularTexture.setValue( null );

}

Expand Down
7 changes: 2 additions & 5 deletions editor/js/Viewport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,8 @@ function Viewport( editor ) {

if ( backgroundEquirectangularTexture ) {

var renderTarget = new THREE.WebGLCubeRenderTarget( backgroundEquirectangularTexture.image.width );
renderTarget.fromEquirectangularTexture( renderer, backgroundEquirectangularTexture );
renderTarget.toJSON = function () { return null }; // TODO Remove hack

scene.background = renderTarget.texture;
backgroundEquirectangularTexture.mapping = THREE.EquirectangularReflectionMapping;
scene.background = backgroundEquirectangularTexture;

}

Expand Down
20 changes: 13 additions & 7 deletions src/core/Object3D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,21 +701,27 @@ class Object3D extends EventDispatcher {

if ( this.isScene ) {

if ( this.background && this.background.isColor ) {
if ( this.background ) {

object.background = this.background.toJSON();
if ( this.background.isColor ) {

} else if ( this.background && this.background.isTexture ) {
object.background = this.background.toJSON();

object.background = this.background.toJSON( meta ).uuid;
} else if ( this.background.isTexture ) {

object.background = this.background.toJSON( meta ).uuid;

}

}

if ( this.environment && this.environment.isTexture ) object.environment = this.environment.toJSON( meta ).uuid;
if ( this.environment && this.environment.isTexture ) {

}
object.environment = this.environment.toJSON( meta ).uuid;

}

if ( this.isMesh || this.isLine || this.isPoints ) {
} else if ( this.isMesh || this.isLine || this.isPoints ) {

object.geometry = serialize( meta.geometries, this.geometry );

Expand Down
6 changes: 3 additions & 3 deletions src/loaders/ObjectLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class ObjectLoader extends Loader {
const textures = this.parseTextures( json.textures, images );
const materials = this.parseMaterials( json.materials, textures );

const object = this.parseObject( json.object, geometries, materials, animations, textures );
const object = this.parseObject( json.object, geometries, materials, textures, animations );
const skeletons = this.parseSkeletons( json.skeletons, object );

this.bindSkeletons( object, skeletons );
Expand Down Expand Up @@ -784,7 +784,7 @@ class ObjectLoader extends Loader {

}

parseObject( data, geometries, materials, animations, textures ) {
parseObject( data, geometries, materials, textures, animations ) {

let object;

Expand Down Expand Up @@ -1087,7 +1087,7 @@ class ObjectLoader extends Loader {

for ( let i = 0; i < children.length; i ++ ) {

object.add( this.parseObject( children[ i ], geometries, materials, animations, textures ) );
object.add( this.parseObject( children[ i ], geometries, materials, textures, animations ) );

}

Expand Down