Revert "WebGPUReneder: add BundleGroup (mrdoob#29277)"

This reverts commit 701c101.
sunag · Aug 31, 2024 · 9377c17 · 9377c17
1 parent 8ca1d4d
commit 9377c17
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/examples/webgpu_performance_renderbundle.html b/examples/webgpu_performance_renderbundle.html
@@ -154,7 +154,8 @@
 
 		function initRegularMesh( count ) {
 
-			group = api.renderBundle ?  new THREE.BundleGroup() : new THREE.Group();
+			group = new THREE.Group();
+			group.static = api.renderBundle;
 
 			for ( let i = 0; i < count; i ++ ) {
 

diff --git a/src/Three.WebGPU.js b/src/Three.WebGPU.js
@@ -164,7 +164,6 @@ export * from './Three.Legacy.js';
 
 export * from './materials/nodes/NodeMaterials.js';
 export { default as WebGPURenderer } from './renderers/webgpu/WebGPURenderer.js';
-export { default as BundleGroup } from './renderers/common/BundleGroup.js';
 export { default as QuadMesh } from './renderers/common/QuadMesh.js';
 export { default as PMREMGenerator } from './renderers/common/extras/PMREMGenerator.js';
 export { default as PostProcessing } from './renderers/common/PostProcessing.js';

diff --git a/src/renderers/common/BundleGroup.js b/src/renderers/common/BundleGroup.js
diff --git a/src/renderers/common/Renderer.js b/src/renderers/common/Renderer.js
@@ -407,28 +407,28 @@ class Renderer {
 
 	_renderBundle( bundle, sceneRef, lightsNode ) {
 
-		const { bundleGroup, camera, renderList } = bundle;
+		const { object, camera, renderList } = bundle;
 
 		const renderContext = this._currentRenderContext;
 
 		//
 
-		const renderBundle = this._bundles.get( bundleGroup, camera );
+		const renderBundle = this._bundles.get( object, camera );
 		const renderBundleData = this.backend.get( renderBundle );
 
 		if ( renderBundleData.renderContexts === undefined ) renderBundleData.renderContexts = new Set();
 
 		//
 
-		const renderBundleNeedsUpdate = renderBundleData.renderContexts.has( renderContext ) === false || bundleGroup.needsUpdate === true;
+		const renderBundleNeedsUpdate = renderBundleData.renderContexts.has( renderContext ) === false || object.needsUpdate === true;
 
 		renderBundleData.renderContexts.add( renderContext );
 
 		if ( renderBundleNeedsUpdate ) {
 
 			this.backend.beginBundle( renderContext );
 
-			if ( renderBundleData.renderObjects === undefined || bundleGroup.needsUpdate === true ) {
+			if ( renderBundleData.renderObjects === undefined || object.needsUpdate === true ) {
 
 				renderBundleData.renderObjects = [];
 
@@ -446,7 +446,7 @@ class Renderer {
 
 			this.backend.finishBundle( renderContext, renderBundle );
 
-			bundleGroup.needsUpdate = false;
+			object.needsUpdate = false;
 
 		} else {
 
@@ -1360,7 +1360,7 @@ class Renderer {
 
 		}
 
-		if ( object.isBundleGroup === true && this.backend.beginBundle !== undefined ) {
+		if ( object.static === true && this.backend.beginBundle !== undefined ) {
 
 			const baseRenderList = renderList;
 
@@ -1370,7 +1370,7 @@ class Renderer {
 			renderList.begin();
 
 			baseRenderList.pushBundle( {
-				bundleGroup: object,
+				object,
 				camera,
 				renderList,
 			} );