Skip to content

Commit

Permalink
r164 (bis)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdoob committed Apr 26, 2024
1 parent 2cb20bb commit 76349d8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion examples/jsm/exporters/GLTFExporter.js
Expand Up @@ -24,9 +24,9 @@ import {
CompressedTexture,
Vector3,
Quaternion,
REVISION
} from 'three';
import { decompress } from './../utils/TextureUtils.js';
import { REVISION } from '../../../src/constants.js';


/**
Expand Down
Binary file modified examples/screenshots/webgpu_tsl_editor.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 4 additions & 6 deletions examples/webgpu_multiple_rendertargets_readback.html
Expand Up @@ -192,16 +192,18 @@

async function render( time ) {

const selection = options.selection;

torus.rotation.y = ( time / 1000 ) * .4;

// render scene into target
renderer.setRenderTarget( renderTarget );
renderer.setRenderTarget( selection === 'mrt' ? renderTarget : readbackTarget );
renderer.render( scene, camera );

// render post FX
renderer.setRenderTarget( null );

if ( options.selection === 'mrt' ) {
if ( selection === 'mrt' ) {

quadMesh.material = material;

Expand All @@ -219,10 +221,6 @@

async function readback() {

renderer.setRenderTarget( readbackTarget );
renderer.render( scene, camera );
renderer.setRenderTarget( null );

const width = readbackTarget.width;
const height = readbackTarget.height;

Expand Down
20 changes: 11 additions & 9 deletions playground/editors/PreviewEditor.js
Expand Up @@ -2,8 +2,9 @@ import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import { ViewHelper } from 'three/addons/helpers/ViewHelper.js';
import { Element, LabelElement, SelectInput } from 'flow';
import { BaseNodeEditor } from '../BaseNodeEditor.js';
import { MeshBasicNodeMaterial, float } from 'three/nodes';
import { WebGLRenderer, PerspectiveCamera, Scene, Mesh, DoubleSide, SphereGeometry, BoxGeometry, PlaneGeometry, TorusKnotGeometry } from 'three';
import { MeshBasicNodeMaterial, vec4 } from 'three/nodes';
import { PerspectiveCamera, Scene, Mesh, DoubleSide, SphereGeometry, BoxGeometry, PlaneGeometry, TorusKnotGeometry } from 'three';
import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
import { setInputAestheticsFromType } from '../DataTypeLib.js';

const sceneDict = {};
Expand Down Expand Up @@ -57,7 +58,7 @@ export class PreviewEditor extends BaseNodeEditor {
super( 'Preview', null, width );

const material = new MeshBasicNodeMaterial();
material.colorNode = float();
material.colorNode = vec4( 0, 0, 0, 1 );
material.side = DoubleSide;
material.transparent = true;

Expand All @@ -77,7 +78,7 @@ export class PreviewEditor extends BaseNodeEditor {

const inputElement = setInputAestheticsFromType( new LabelElement( 'Input' ), 'Color' ).onConnect( () => {

material.colorNode = inputElement.getLinkedObject() || float();
material.colorNode = inputElement.getLinkedObject() || vec4( 0, 0, 0, 1 );
material.dispose();

}, true );
Expand All @@ -89,9 +90,10 @@ export class PreviewEditor extends BaseNodeEditor {

previewElement.dom.addEventListener( 'wheel', e => e.stopPropagation() );

const renderer = new WebGLRenderer( {
const renderer = new WebGPURenderer( {
canvas,
alpha: true
alpha: true,
antialias: true
} );

renderer.autoClear = false;
Expand Down Expand Up @@ -140,7 +142,7 @@ export class PreviewEditor extends BaseNodeEditor {

}

update() {
async update() {

const { viewHelper, material, renderer, camera, sceneInput } = this;

Expand All @@ -159,8 +161,8 @@ export class PreviewEditor extends BaseNodeEditor {

}

renderer.clear();
renderer.render( scene, camera );
await renderer.clearAsync();
await renderer.renderAsync( scene, camera );

viewHelper.render( renderer );

Expand Down

0 comments on commit 76349d8

Please sign in to comment.