iobroker.mywebui 1.42.3 → 1.42.5

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "mywebui",
-    "version": "1.42.0",
+    "version": "1.42.3",
     "titleLang": {
       "en": "mywebui",
       "de": "mywebui",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.mywebui",
-  "version": "1.42.3",
+  "version": "1.42.5",
   "description": "ioBroker mywebui - Custom edited mywebui by gokturk413 with 3D Editor",
   "type": "module",
   "main": "dist/backend/main.js",

package/www/dist/frontend/config/IobrokerWebui3DScreenEditor.js

@@ -219,16 +219,20 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
     updateSceneView() {
         if (!this.sceneData) return;
 
-        // Add assets to scene
-        for (const asset of this.sceneData.assets) {
-            if (asset.type === 'model' && asset.glbPath) {
-                this.loadAsset(asset);
+        // Add assets to scene (safe iteration)
+        if (Array.isArray(this.sceneData.assets)) {
+            for (const asset of this.sceneData.assets) {
+                if (asset.type === 'model' && asset.glbPath) {
+                    this.loadAsset(asset);
+                }
             }
         }
 
-        // Update lights
-        for (const light of this.sceneData.lights) {
-            this.addLightToScene(light);
+        // Update lights (safe iteration)
+        if (Array.isArray(this.sceneData.lights)) {
+            for (const light of this.sceneData.lights) {
+                this.addLightToScene(light);
+            }
         }
 
         // Update camera
@@ -316,9 +320,18 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
 
         for (const intersection of intersects) {
             const obj = intersection.object;
-            if (obj.userData.assetId) {
+            if (obj.userData.assetData) {
                 this.selectObject(obj);
-                break;
+                return;
+            }
+            // Try parent objects
+            let parent = obj.parent;
+            while (parent && parent !== this.scene) {
+                if (parent.userData.assetData) {
+                    this.selectObject(parent);
+                    return;
+                }
+                parent = parent.parent;
             }
         }
     }
@@ -326,15 +339,37 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
     selectObject(obj) {
         if (this.selectedObject === obj) return;
 
-        // Deselect previous
+        // Deselect previous (remove highlight)
         if (this.selectedObject) {
             this.selectedObject.userData.selected = false;
+            // Restore original material
+            this.selectedObject.traverse((child) => {
+                if (child.material && child.userData.originalMaterial) {
+                    child.material = child.userData.originalMaterial;
+                }
+            });
         }
 
-        // Select new
+        // Select new (add yellow highlight)
         this.selectedObject = obj;
         obj.userData.selected = true;
 
+        // Apply highlight material
+        obj.traverse((child) => {
+            if (child.material) {
+                child.userData.originalMaterial = child.material;
+                const hlMat = new this.THREE.MeshStandardMaterial({
+                    color: 0xffff00,
+                    emissive: 0xffff00,
+                    emissiveIntensity: 0.3,
+                    metalness: 0.3,
+                    roughness: 0.4
+                });
+                child.material = hlMat;
+            }
+        });
+
+        console.log('✅ Selected:', obj.userData.assetData.name);
         this.updatePropertyPanel();
     }
 
@@ -343,7 +378,7 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
         treeEl.innerHTML = '';
 
         // Assets
-        if (this.sceneData.assets && this.sceneData.assets.length > 0) {
+        if (Array.isArray(this.sceneData.assets) && this.sceneData.assets.length > 0) {
             const assetsDiv = document.createElement('div');
             assetsDiv.style.cssText = 'margin-bottom:10px;';
 
@@ -355,8 +390,10 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
             for (const asset of this.sceneData.assets) {
                 const itemDiv = document.createElement('div');
                 itemDiv.textContent = asset.name;
-                itemDiv.style.cssText = 'padding:5px;cursor:pointer;color:#aaa;margin-left:10px;';
-                itemDiv.addEventListener('click', () => console.log('Select asset:', asset.id));
+                itemDiv.style.cssText = 'padding:5px;cursor:pointer;color:#aaa;margin-left:10px;background:#2a2a1a;border-radius:3px;margin-bottom:3px;';
+                itemDiv.addEventListener('click', () => {
+                    this.selectAssetByName(asset.name);
+                });
                 assetsDiv.appendChild(itemDiv);
             }
 
@@ -364,7 +401,7 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
         }
 
         // Lights
-        if (this.sceneData.lights && this.sceneData.lights.length > 0) {
+        if (Array.isArray(this.sceneData.lights) && this.sceneData.lights.length > 0) {
             const lightsDiv = document.createElement('div');
             lightsDiv.style.cssText = 'margin-bottom:10px;';
 
@@ -394,6 +431,16 @@ export class IobrokerWebui3DScreenEditor extends BaseCustomWebComponentConstruct
         }
     }
 
+    selectAssetByName(assetName) {
+        // Find and select asset in scene tree
+        for (const obj of this.scene.children) {
+            if (obj.userData.assetData && obj.userData.assetData.name === assetName) {
+                this.selectObject(obj);
+                break;
+            }
+        }
+    }
+
     updatePropertyPanel() {
         const panelEl = this._getDomElement('propertyPanel');
         panelEl.innerHTML = '';

package/www/dist/frontend/config/IobrokerWebuiSolutionExplorer.js

@@ -8,6 +8,8 @@ import { Wunderbaum } from 'wunderbaum';
 //@ts-ignore
 import wunderbaumStyle from 'wunderbaum/dist/wunderbaum.css' with { type: 'css' };
 import { defaultNewStyle, defaultNewControlScript } from "./IobrokerWebuiScreenEditor.js";
+import { IobrokerWebui3DScreenEditor } from "./IobrokerWebui3DScreenEditor.js";
+import { IobrokerWebui3DScreenViewer } from "./IobrokerWebui3DScreenViewer.js";
 import { IobrokerWebuiIconsView } from "./IobrokerWebuiIconsView.js";
 import { IobrokerWebuiScreensView } from "./IobrokerWebuiScreensView.js";
 import { convertToXml, parseXml } from "../helper/XmlHelper.js";