Mr.doob 10 hónapja
szülő
commit
67839100b2
2 módosított fájl, 17 hozzáadás és 32 törlés
  1. 15 30
      devtools/bridge.js
  2. 2 2
      devtools/content-script.js

+ 15 - 30
devtools/bridge.js

@@ -12,12 +12,9 @@ if (!window.__THREE_DEVTOOLS__) {
 			this._ready = false;
 			this._ready = false;
 			this._backlog = [];
 			this._backlog = [];
 			this.objects = new Map();
 			this.objects = new Map();
-			
-			// console.log('DevTools: Creating ThreeDevToolsTarget');
 		}
 		}
 
 
 		addEventListener(type, listener, options) {
 		addEventListener(type, listener, options) {
-			// console.log('DevTools: Adding listener for:', type);
 			super.addEventListener(type, listener, options);
 			super.addEventListener(type, listener, options);
 
 
 			// If this is the first listener for a type, and we have backlogged events,
 			// If this is the first listener for a type, and we have backlogged events,
@@ -28,18 +25,15 @@ if (!window.__THREE_DEVTOOLS__) {
 		}
 		}
 
 
 		dispatchEvent(event) {
 		dispatchEvent(event) {
-			console.log('DevTools: Dispatching event:', event.type);
 			if (this._ready || event.type === 'devtools-ready') {
 			if (this._ready || event.type === 'devtools-ready') {
 				if (event.type === 'devtools-ready') {
 				if (event.type === 'devtools-ready') {
 					this._ready = true;
 					this._ready = true;
-					console.log('DevTools: Processing backlog:', this._backlog.length, 'events');
 					const backlog = this._backlog;
 					const backlog = this._backlog;
 					this._backlog = [];
 					this._backlog = [];
 					backlog.forEach(e => super.dispatchEvent(e));
 					backlog.forEach(e => super.dispatchEvent(e));
 				}
 				}
 				return super.dispatchEvent(event);
 				return super.dispatchEvent(event);
 			} else {
 			} else {
-				console.log('DevTools: Backlogging event:', event.type);
 				this._backlog.push(event);
 				this._backlog.push(event);
 				return false; // Return false to indicate synchronous handling
 				return false; // Return false to indicate synchronous handling
 			}
 			}
@@ -170,7 +164,7 @@ if (!window.__THREE_DEVTOOLS__) {
 			}
 			}
 
 
 			// Get descriptive name for the object
 			// Get descriptive name for the object
-			let descriptiveName;
+			let name = obj.name || obj.type || obj.constructor.name;
 			if (obj.isMesh) {
 			if (obj.isMesh) {
 				const geoType = obj.geometry ? obj.geometry.type : 'Unknown';
 				const geoType = obj.geometry ? obj.geometry.type : 'Unknown';
 				const matType = obj.material ? 
 				const matType = obj.material ? 
@@ -178,19 +172,13 @@ if (!window.__THREE_DEVTOOLS__) {
 						obj.material.map(m => m.type).join(', ') : 
 						obj.material.map(m => m.type).join(', ') : 
 						obj.material.type) : 
 						obj.material.type) : 
 					'Unknown';
 					'Unknown';
-				descriptiveName = `${obj.type || 'Mesh'} <span class="object-details">${geoType} ${matType}</span>`;
-			} else if (obj.isLight) {
-				descriptiveName = `${obj.type || 'Light'}`;
-			} else if (obj.isCamera) {
-				descriptiveName = `${obj.type || 'Camera'}`;
-			} else {
-				descriptiveName = obj.type || obj.constructor.name;
+				name = `${name} <span class="object-details">${geoType} ${matType}</span>`;
 			}
 			}
 
 
 			const data = {
 			const data = {
 				uuid: obj.uuid,
 				uuid: obj.uuid,
 				type: obj.type || obj.constructor.name,
 				type: obj.type || obj.constructor.name,
-				name: descriptiveName,
+				name: name,
 				visible: obj.visible !== undefined ? obj.visible : true,
 				visible: obj.visible !== undefined ? obj.visible : true,
 				isScene: obj.isScene === true,
 				isScene: obj.isScene === true,
 				isObject3D: obj.isObject3D === true,
 				isObject3D: obj.isObject3D === true,
@@ -202,7 +190,6 @@ if (!window.__THREE_DEVTOOLS__) {
 				children: obj.children ? obj.children.map(child => child.uuid) : []
 				children: obj.children ? obj.children.map(child => child.uuid) : []
 			};
 			};
 			
 			
-			// console.log('DevTools: Object data:', data);
 			return data;
 			return data;
 		} catch (error) {
 		} catch (error) {
 			console.warn('DevTools: Error getting object data:', error);
 			console.warn('DevTools: Error getting object data:', error);
@@ -417,7 +404,6 @@ if (!window.__THREE_DEVTOOLS__) {
 
 
 	// Watch for readyState changes
 	// Watch for readyState changes
 	document.addEventListener('readystatechange', () => {
 	document.addEventListener('readystatechange', () => {
-		// console.log('DevTools: Document readyState changed to:', document.readyState);
 		if (document.readyState === 'loading') {
 		if (document.readyState === 'loading') {
 			devTools.reset();
 			devTools.reset();
 		}
 		}
@@ -439,7 +425,6 @@ if (!window.__THREE_DEVTOOLS__) {
 
 
 		// Handle traverse request
 		// Handle traverse request
 		if (message.name === 'traverse' && message.uuid) {
 		if (message.name === 'traverse' && message.uuid) {
-			// Find the scene in our objects
 			const scene = Array.from(devTools.objects.values())
 			const scene = Array.from(devTools.objects.values())
 				.find(obj => obj.uuid === message.uuid && obj.isScene);
 				.find(obj => obj.uuid === message.uuid && obj.isScene);
 			
 			
@@ -532,25 +517,25 @@ if (!window.__THREE_DEVTOOLS__) {
 		const obj = devTools.objects.get(uuid);
 		const obj = devTools.objects.get(uuid);
 		if (!obj) return;
 		if (!obj) return;
 		
 		
-			obj.visible = visible;
+		obj.visible = visible;
 		console.log('DevTools: Setting visibility of', obj.type || obj.constructor.name, 'to', visible);
 		console.log('DevTools: Setting visibility of', obj.type || obj.constructor.name, 'to', visible);
 		
 		
 		// Find the actual Three.js object using our observed scenes
 		// Find the actual Three.js object using our observed scenes
 		if (observedScenes.length > 0) {
 		if (observedScenes.length > 0) {
 			for (const scene of observedScenes) {
 			for (const scene of observedScenes) {
-					let found = false;
+				let found = false;
 				scene.traverse((object) => {
 				scene.traverse((object) => {
-						if (object.uuid === uuid) {
-							object.visible = visible;
-							// If it's a light, update its helper visibility too
-							if (object.isLight && object.helper) {
-								object.helper.visible = visible;
-							}
-							found = true;
-						console.log('DevTools: Updated visibility in scene object');
+					if (object.uuid === uuid) {
+						object.visible = visible;
+						// If it's a light, update its helper visibility too
+						if (object.isLight && object.helper) {
+							object.helper.visible = visible;
 						}
 						}
-					});
-					if (found) break;
+						found = true;
+						console.log('DevTools: Updated visibility in scene object');
+					}
+				});
+				if (found) break;
 			}
 			}
 		} else {
 		} else {
 			console.warn('DevTools: No observed scenes found for visibility toggle');
 			console.warn('DevTools: No observed scenes found for visibility toggle');

+ 2 - 2
devtools/content-script.js

@@ -60,7 +60,7 @@ const observer = new MutationObserver( mutations => {
 					} catch ( e ) {
 					} catch ( e ) {
 
 
 						// Ignore cross-origin iframe errors
 						// Ignore cross-origin iframe errors
-						console.log( 'DevTools: Could not inject into iframe:', e );
+						// console.log( 'DevTools: Could not inject into iframe:', e );
 
 
 					}
 					}
 
 
@@ -174,7 +174,7 @@ function handleDevtoolsMessage( message, sender, sendResponse ) {
 	// Forward traverse requests to both main page and iframes
 	// Forward traverse requests to both main page and iframes
 	if ( message.name === 'traverse' || message.name === 'reload-scene' || message.name === 'visibility' ) {
 	if ( message.name === 'traverse' || message.name === 'reload-scene' || message.name === 'visibility' ) {
 
 
-		console.log( 'Content script: Forwarding message to page:', message );
+		// console.log( 'Content script: Forwarding message to page:', message );
 		window.postMessage( message, '*' );
 		window.postMessage( message, '*' );
 
 
 		// Also try to forward to all iframes
 		// Also try to forward to all iframes

粤ICP备19079148号