Skip to content

Commit 84ea547

Browse files
authored
Editor: Retain viewport color when rendering images/videos. (#32866)
1 parent 625541e commit 84ea547

4 files changed

Lines changed: 11 additions & 0 deletions

File tree

editor/js/Editor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ function Editor() {
134134

135135
this.viewportCamera = this.camera;
136136
this.viewportShading = 'default';
137+
this.viewportColor = new THREE.Color();
137138

138139
this.addCamera( this.camera );
139140

editor/js/Menubar.Render.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ class RenderImageDialog {
210210

211211
const renderer = new THREE.WebGLRenderer( { antialias: true, logarithmicDepthBuffer: true } );
212212
renderer.setSize( imageWidth.getValue(), imageHeight.getValue() );
213+
renderer.setClearColor( editor.viewportColor );
213214

214215
if ( project.shadows !== undefined ) renderer.shadowMap.enabled = project.shadows;
215216
if ( project.shadowType !== undefined ) renderer.shadowMap.type = project.shadowType;
@@ -414,6 +415,7 @@ class RenderVideoDialog {
414415
await player.load( editor.toJSON() );
415416
player.setPixelRatio( 1 );
416417
player.setSize( videoWidth.getValue(), videoHeight.getValue() );
418+
player.setClearColor( editor.viewportColor );
417419

418420
//
419421

editor/js/Viewport.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ function Viewport( editor ) {
385385

386386
}
387387

388+
renderer.getClearColor( editor.viewportColor );
389+
388390
renderer.setPixelRatio( window.devicePixelRatio );
389391
renderer.setSize( container.dom.offsetWidth, container.dom.offsetHeight );
390392

editor/js/libs/app.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ const APP = {
142142

143143
};
144144

145+
this.setClearColor = function ( color ) {
146+
147+
renderer.setClearColor( color );
148+
149+
};
150+
145151
this.setSize = function ( width, height ) {
146152

147153
this.width = width;

0 commit comments

Comments
 (0)