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

Fixed Splats in Scene Flickering When Adding or Removing #87

Merged
merged 2 commits into from
Mar 27, 2024
Merged
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions src/renderers/webgl/programs/RenderProgram.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Color32 } from "../../../math/Color32";
import { ObjectAddedEvent, ObjectChangedEvent, ObjectRemovedEvent } from "../../../events/Events";
import { Splat } from "../../../splats/Splat";
import { WebGLRenderer } from "../../WebGLRenderer";
import { Scene } from "../../../core/Scene"

const vertexShaderSource = /* glsl */ `#version 300 es
precision highp float;
Expand Down Expand Up @@ -303,7 +304,7 @@ class RenderProgram extends ShaderProgram {
e.object.addEventListener("objectChanged", handleObjectChanged);
}

this.dispose();
resetSplatData();
};

const handleObjectRemoved = (event: Event) => {
Expand All @@ -313,7 +314,7 @@ class RenderProgram extends ShaderProgram {
e.object.removeEventListener("objectChanged", handleObjectChanged);
}

this.dispose();
resetSplatData();
};

const handleObjectChanged = (event: Event) => {
Expand All @@ -324,6 +325,14 @@ class RenderProgram extends ShaderProgram {
}
};

const resetSplatData = () => {
this._renderData?.dispose();
this._renderData = new RenderData(this._scene as Scene);

this._worker?.terminate();
createWorker();
};

this._render = () => {
if (!this._scene || !this._camera || !this.renderData) {
console.error("Cannot render without scene and camera");
Expand Down Expand Up @@ -478,7 +487,7 @@ class RenderProgram extends ShaderProgram {
gl.vertexAttribIPointer(indexAttribute, 1, gl.INT, 0, 0);
gl.vertexAttribDivisor(indexAttribute, 1);

gl.drawArraysInstanced(gl.TRIANGLE_FAN, 0, 4, this.renderData.vertexCount);
gl.drawArraysInstanced(gl.TRIANGLE_FAN, 0, 4, this.depthIndex.length);
};

this._dispose = () => {
Expand Down
Loading