Update index.html

index.html

@@ -34,7 +34,7 @@
         let selectedObjectType = window.SELECTED_OBJECT_TYPE || "None";
         const plotWidth = window.PLOT_WIDTH || 50.0;
         const plotDepth = window.PLOT_DEPTH || 50.0;
-        const worldState = window.WORLD_STATE || { objects: {}, players: {} };
+        const worldState = window.WORLD_STATE || { objects: {}, players: {}, action_history: [] };
 
         // Materials
         const groundMaterial = new THREE.MeshStandardMaterial({ color: 0x55aa55, roughness: 0.9, metalness: 0.1, side: THREE.DoubleSide });
@@ -51,6 +51,12 @@
             'light': new THREE.MeshBasicMaterial({ color: 0xFFFF88 })
         };
 
+        const VALID_OBJECT_TYPES = [
+            "Tree", "Rock", "Simple House", "Pine Tree", "Brick Wall", "Sphere", "Cube",
+            "Cylinder", "Cone", "Torus", "Mushroom", "Cactus", "Campfire", "Star", "Gem",
+            "Tower", "Barrier", "Fountain", "Lantern", "Sign Post"
+        ];
+
         function init() {
             scene = new THREE.Scene();
             scene.background = new THREE.Color(0xabcdef);
@@ -129,14 +135,30 @@
         function loadWorldState() {
             clearWorldObjects();
             const objects = worldState.objects || {};
+            console.log(`Loading ${Object.keys(objects).length} objects from WORLD_STATE`);
             for (const obj_id in objects) {
-                createAndPlaceObject(objects[obj_id], false);
+                const objData = objects[obj_id];
+                if (!objData || !objData.obj_id || !objData.type || !VALID_OBJECT_TYPES.includes(objData.type) || !objData.position) {
+                    console.warn(`Skipping invalid object: ${obj_id}`, objData);
+                    continue;
+                }
+                const mesh = createAndPlaceObject(objData, false);
+                if (!mesh) {
+                    console.warn(`Failed to create mesh for object: ${obj_id}`, objData);
+                }
             }
             const players = worldState.players || {};
+            console.log(`Loading ${Object.keys(players).length} players from WORLD_STATE`);
             for (const username in players) {
                 const pos = players[username].position;
-                createPlayerMarker(username, pos);
+                if (pos && typeof pos.x === 'number' && typeof pos.y === 'number' && typeof pos.z === 'number') {
+                    createPlayerMarker(username, pos);
+                } else {
+                    console.warn(`Invalid player position for ${username}:`, pos);
+                }
             }
+            const actionHistory = worldState.action_history || [];
+            console.log(`Loaded ${actionHistory.length} action history entries`);
         }
 
         function clearWorldObjects() {
@@ -160,10 +182,11 @@
             marker.userData.isPlayerMarker = true;
             marker.userData.username = username;
             scene.add(marker);
+            console.log(`Created player marker for ${username} at`, position);
         }
 
         function createAndPlaceObject(objData, isNewlyPlacedLocally) {
-            if (!objData || !objData.obj_id || !objData.type) {
+            if (!objData || !objData.obj_id || !objData.type || !objData.position) {
                 console.warn("Invalid object data:", objData);
                 return null;
             }
@@ -176,10 +199,15 @@
                     mesh.position.set(objData.position.x, objData.position.y, objData.position.z);
                 }
                 if (objData.rotation && (
-                    Math.abs(mesh.rotation.x - objData.rotation._x) > 0.01 ||
-                    Math.abs(mesh.rotation.y - objData.rotation._y) > 0.01 ||
-                    Math.abs(mesh.rotation.z - objData.rotation._z) > 0.01 )) {
-                    mesh.rotation.set(objData.rotation._x, objData.rotation._y, objData.rotation._z, objData.rotation._order || 'XYZ');
+                    Math.abs(mesh.rotation.x - (objData.rotation._x || 0)) > 0.01 ||
+                    Math.abs(mesh.rotation.y - (objData.rotation._y || 0)) > 0.01 ||
+                    Math.abs(mesh.rotation.z - (objData.rotation._z || 0)) > 0.01 )) {
+                    mesh.rotation.set(
+                        objData.rotation._x || 0,
+                        objData.rotation._y || 0,
+                        objData.rotation._z || 0,
+                        objData.rotation._order || 'XYZ'
+                    );
                 }
             } else {
                 mesh = createPrimitiveMesh(objData.type);
@@ -189,16 +217,26 @@
                 mesh.userData.type = objData.type;
                 mesh.position.set(objData.position.x, objData.position.y, objData.position.z);
                 if (objData.rotation) {
-                    mesh.rotation.set(objData.rotation._x, objData.rotation._y, objData.rotation._z, objData.rotation._order || 'XYZ');
+                    mesh.rotation.set(
+                        objData.rotation._x || 0,
+                        objData.rotation._y || 0,
+                        objData.rotation._z || 0,
+                        objData.rotation._order || 'XYZ'
+                    );
                 }
                 scene.add(mesh);
                 worldObjects.set(objData.obj_id, mesh);
-                console.log(`Created new object ${objData.obj_id} (${objData.type})`);
+                console.log(`Created new object ${objData.obj_id} (${objData.type}) at`, objData.position);
             }
             return mesh;
         }
 
         function createPrimitiveMesh(type) {
+            if (!VALID_OBJECT_TYPES.includes(type)) {
+                console.warn(`Invalid object type for mesh creation: ${type}`);
+                return null;
+            }
+
             let mesh = null;
             let geometry, material, material2;
 
@@ -462,7 +500,7 @@
                         mesh.receiveShadow = true;
                         break;
                     default:
-                        console.warn("Unknown primitive type for mesh creation:", type);
+                        console.warn("Unexpected object type:", type);
                         return null;
                 }
             } catch (e) {
@@ -515,12 +553,13 @@
 
                     console.log(`Placing ${selectedObjectType} (${newObjData.obj_id}) at`, newObjData.position);
 
-                    createAndPlaceObject(newObjData, true);
-
-                    window.parent.postMessage({
-                        type: 'place_object',
-                        payload: { username: myUsername, object_data: newObjData }
-                    }, '*');
+                    const mesh = createAndPlaceObject(newObjData, true);
+                    if (mesh) {
+                        window.parent.postMessage({
+                            type: 'place_object',
+                            payload: { username: myUsername, object_data: newObjData }
+                        }, '*');
+                    }
                 } else {
                     // Move player
                     const newPosition = {
@@ -585,7 +624,10 @@
         window.addEventListener('message', (event) => {
             const data = event.data;
             if (data.type === 'place_object') {
-                createAndPlaceObject(data.payload.object_data, false);
+                const mesh = createAndPlaceObject(data.payload.object_data, false);
+                if (!mesh) {
+                    console.warn(`Failed to place object from message:`, data.payload.object_data);
+                }
             } else if (data.type === 'delete_object') {
                 removeObjectById(data.payload.obj_id);
             } else if (data.type === 'move_player') {
@@ -594,6 +636,7 @@
                 scene.children.forEach(child => {
                     if (child.userData.isPlayerMarker && child.userData.username === username) {
                         child.position.set(position.x, position.y + 0.5, position.z);
+                        console.log(`Updated player marker for ${username} to`, position);
                     }
                 });
             }