Skip to content
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.

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

Playground: Fix PreviewEditor #28223

Merged
merged 2 commits into from Apr 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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