Spaces:

awacke1
/

Happy-Valley-Game

Sleeping

App Files Files Community

awacke1 commited on Apr 5

Commit

046998c

verified ·

1 Parent(s): 80d0af3

Update index.html

Browse files

Files changed (1) hide show

index.html +163 -112

index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <style>
         body { margin: 0; overflow: hidden; }
         canvas { display: block; }
-        /* Removed Save Button - Triggered from Streamlit now */
     </style>
     </head>
 <body>
@@ -27,6 +27,9 @@
         const playerSpeed = 0.15;
         let newlyPlacedObjects = []; // Track objects added THIS session for saving
         // --- Access State from Streamlit ---
         const allInitialObjects = window.ALL_INITIAL_OBJECTS || [];
         const selectedObjectType = window.SELECTED_OBJECT_TYPE || "None";
@@ -59,12 +62,16 @@
             loadInitialObjects(); // Load ALL objects passed from Python
             // Event Listeners
             document.addEventListener('mousemove', onMouseMove, false);
             document.addEventListener('click', onDocumentClick, false);
             window.addEventListener('resize', onWindowResize, false);
             document.addEventListener('keydown', onKeyDown);
             document.addEventListener('keyup', onKeyUp);
             // Define global functions needed by Python/streamlit-js-eval
             window.teleportPlayer = teleportPlayer;
@@ -92,25 +99,17 @@
             directionalLight.shadow.camera.bottom = -100;
             directionalLight.shadow.bias = -0.001;
             scene.add(directionalLight);
-            // Optional shadow helper
-            // const shadowHelper = new THREE.CameraHelper(directionalLight.shadow.camera);
-            // scene.add(shadowHelper);
         }
-        function setupGround() {
-            // Ground needs to span the width of all loaded plots potentially
-            // Calculate width based on next offset (where the world ends visually for now)
-            const groundWidth = Math.max(plotWidth, nextPlotXOffset + plotWidth); // At least one plot wide, or cover all loaded + next slot
-            const groundDepth = 50; // Keep depth constant for now
             const groundGeometry = new THREE.PlaneGeometry(groundWidth, groundDepth);
             const groundMaterial = new THREE.MeshStandardMaterial({ color: 0x55aa55, roughness: 0.9, metalness: 0.1 });
             groundMesh = new THREE.Mesh(groundGeometry, groundMaterial);
             groundMesh.rotation.x = -Math.PI / 2;
             groundMesh.position.y = -0.05;
-             // Center the ground based on calculated width
-            groundMesh.position.x = (groundWidth / 2.0) - (plotWidth / 2.0) ; // Adjust so x=0 is near the start
             groundMesh.receiveShadow = true;
             scene.add(groundMesh);
             console.log(`Ground setup with width: ${groundWidth} centered near x=0`);
@@ -129,44 +128,113 @@
         function loadInitialObjects() {
             console.log(`Loading ${allInitialObjects.length} initial objects from Python.`);
             allInitialObjects.forEach(objData => {
-                let loadedObject = null;
-                // Need to deserialize object based on 'type' field from CSV
-                switch (objData.type) {
-                    case "Simple House": loadedObject = createSimpleHouse(); break;
-                    case "Tree": loadedObject = createTree(); break;
-                    case "Rock": loadedObject = createRock(); break;
-                    case "Fence Post": loadedObject = createFencePost(); break;
-                    // Add other types if needed
-                    default: console.warn("Unknown object type in loaded data:", objData.type); break;
-                }
-                if (loadedObject && objData.pos_x !== undefined) {
-                    // Position is already WORLD position (offset applied in Python)
-                    loadedObject.position.set(objData.pos_x, objData.pos_y, objData.pos_z);
-                    // Apply rotation (assuming Euler order is XYZ, adjust if different)
-                    if(objData.rot_x !== undefined){
-                         loadedObject.rotation.set(objData.rot_x, objData.rot_y, objData.rot_z, objData.rot_order || 'XYZ');
-                    }
-                    // Add unique ID if needed for later interaction
-                    loadedObject.userData.obj_id = objData.obj_id || null;
-                    scene.add(loadedObject);
-                    // DO NOT add to newlyPlacedObjects here - these are pre-existing
                 }
-            });
-             console.log("Finished loading initial objects.");
         }
         // --- Object Creation Functions (MUST add userData.type and obj_id) ---
         function createObjectBase(type) { // Helper to assign common data
              const obj = { userData: { type: type, obj_id: THREE.MathUtils.generateUUID() } };
              return obj;
         }
-         function createSimpleHouse() {
-            const base = createObjectBase("Simple House"); // Get base object with data
-            const group = new THREE.Group();
-            Object.assign(group, base); // Copy properties like userData
             const mainMaterial = new THREE.MeshStandardMaterial({ color: 0xffccaa, roughness: 0.8 });
             const roofMaterial = new THREE.MeshStandardMaterial({ color: 0xaa5533, roughness: 0.7 });
             const baseMesh = new THREE.Mesh(new THREE.BoxGeometry(2, 1.5, 2.5), mainMaterial);
@@ -175,11 +243,8 @@
             roof.position.y = 1.5 + 1 / 2; roof.rotation.y = Math.PI / 4; roof.castShadow = true; roof.receiveShadow = true; group.add(roof);
             return group;
          }
-         function createTree() {
-            const base = createObjectBase("Tree");
-            const group = new THREE.Group();
-             Object.assign(group, base);
             const trunkMaterial = new THREE.MeshStandardMaterial({ color: 0x8B4513, roughness: 0.9 });
             const leavesMaterial = new THREE.MeshStandardMaterial({ color: 0x228B22, roughness: 0.8 });
             const trunk = new THREE.Mesh(new THREE.CylinderGeometry(0.3, 0.4, 2, 8), trunkMaterial);
@@ -188,22 +253,18 @@
             leaves.position.y = 2 + 0.8; leaves.castShadow = true; leaves.receiveShadow = true; group.add(leaves);
             return group;
          }
-         function createRock() {
              const base = createObjectBase("Rock");
              const rockMaterial = new THREE.MeshStandardMaterial({ color: 0xaaaaaa, roughness: 0.8, metalness: 0.1 });
-             const rock = new THREE.Mesh(new THREE.IcosahedronGeometry(0.7, 0), rockMaterial);
-             Object.assign(rock, base); // Add userData
              rock.position.y = 0.7 / 2; rock.rotation.x = Math.random() * Math.PI; rock.rotation.y = Math.random() * Math.PI;
              rock.castShadow = true; rock.receiveShadow = true;
              return rock;
          }
-         function createFencePost() {
              const base = createObjectBase("Fence Post");
              const postMaterial = new THREE.MeshStandardMaterial({ color: 0xdeb887, roughness: 0.9 });
-             const post = new THREE.Mesh(new THREE.BoxGeometry(0.2, 1.5, 0.2), postMaterial);
-             Object.assign(post, base); // Add userData
              post.position.y = 1.5 / 2; post.castShadow = true; post.receiveShadow = true;
              return post;
          }
@@ -223,26 +284,29 @@
             if (intersects.length > 0) {
                 const intersectPoint = intersects[0].point;
-                let newObject = null;
-                switch (selectedObjectType) { // Use create functions
-                    case "Simple House": newObject = createSimpleHouse(); break;
-                    case "Tree": newObject = createTree(); break;
-                    case "Rock": newObject = createRock(); break;
-                    case "Fence Post": newObject = createFencePost(); break;
-                    default: return; // Don't place unknown types
                 }
-                if (newObject) {
                     // Position in WORLD coordinates where clicked
-                    newObject.position.copy(intersectPoint);
-                    // Adjust Y so base is on ground (mostly handled by create funcs)
-                    if (newObject.geometry && newObject.geometry.boundingBox) {
-                        // Optional fine tuning if needed
-                    }
-                    scene.add(newObject);
-                    newlyPlacedObjects.push(newObject); // Add to list for saving
-                    console.log(`Placed new ${selectedObjectType} at ${newObject.position.x.toFixed(2)}, ${newObject.position.z.toFixed(2)}. Total new: ${newlyPlacedObjects.length}`);
                 }
             }
         }
@@ -251,77 +315,64 @@
         function onKeyUp(event) { keysPressed[event.code] = false; }
         // --- Functions called by Python via streamlit-js-eval ---
-        function teleportPlayer(targetX) {
             console.log("JS teleportPlayer called with targetX:", targetX);
             if (playerMesh) {
-                // Teleport to start of the plot (targetX) plus a small offset
-                playerMesh.position.x = targetX + 2.0; // Start slightly inside the plot
-                playerMesh.position.z = 5.0; // Reset Z position too
-                // Snap camera instantly - adjust Y height if needed
-                 const offset = new THREE.Vector3(0, 15, 20); // Reset camera offset
                  const targetPosition = playerMesh.position.clone().add(offset);
                  camera.position.copy(targetPosition);
                  camera.lookAt(playerMesh.position);
                  console.log("Player teleported to:", playerMesh.position);
-            } else {
-                console.error("Player mesh not found for teleport.");
-            }
         }
-        function getSaveData() {
-             console.log(`JS getSaveData called. Found ${newlyPlacedObjects.length} new objects.`);
              const objectsToSave = newlyPlacedObjects.map(obj => {
-                 if (!obj.userData || !obj.userData.type) {
-                     console.warn("Skipping object with missing user data during save prep:", obj);
-                     return null; // Skip objects without type/id
-                 }
-                 // Send WORLD positions to Python, it will make them relative
-                 const rotation = {
-                     _x: obj.rotation.x,
-                     _y: obj.rotation.y,
-                     _z: obj.rotation.z,
-                     _order: obj.rotation.order
-                 };
                  return {
-                     obj_id: obj.userData.obj_id, // Send unique ID
                      type: obj.userData.type,
                      position: { x: obj.position.x, y: obj.position.y, z: obj.position.z },
                      rotation: rotation
                  };
-             }).filter(obj => obj !== null); // Remove nulls
              console.log("Prepared data for saving:", objectsToSave);
              return JSON.stringify(objectsToSave); // Return as JSON string
         }
-        function resetNewlyPlacedObjects() {
-             console.log(`JS resetNewlyPlacedObjects called. Clearing ${newlyPlacedObjects.length} objects.`);
-             newlyPlacedObjects = []; // Clear the array after successful save
         }
         // --- Animation Loop ---
         function updatePlayerMovement() { /* ... unchanged ... */
-            if (!playerMesh) return;
-            const moveDirection = new THREE.Vector3(0, 0, 0);
-            if (keysPressed['KeyW'] || keysPressed['ArrowUp']) moveDirection.z -= 1;
-            if (keysPressed['KeyS'] || keysPressed['ArrowDown']) moveDirection.z += 1;
-            if (keysPressed['KeyA'] || keysPressed['ArrowLeft']) moveDirection.x -= 1;
-            if (keysPressed['KeyD'] || keysPressed['ArrowRight']) moveDirection.x += 1;
-            if (moveDirection.lengthSq() > 0) {
-                moveDirection.normalize().multiplyScalar(playerSpeed);
-                 playerMesh.position.add(moveDirection);
-                 // Basic ground clamping
-                 playerMesh.position.y = Math.max(playerMesh.position.y, 0.4 + 0.8/2);
-            }
         }
         function updateCamera() { /* ... unchanged ... */
             if (!playerMesh) return;
             const offset = new THREE.Vector3(0, 15, 20);
             const targetPosition = playerMesh.position.clone().add(offset);
-            camera.position.lerp(targetPosition, 0.08); // Slightly slower lerp
             camera.lookAt(playerMesh.position);
         }

     <style>
         body { margin: 0; overflow: hidden; }
         canvas { display: block; }
+        /* No Save button needed here anymore */
     </style>
     </head>
 <body>
         const playerSpeed = 0.15;
         let newlyPlacedObjects = []; // Track objects added THIS session for saving
+        // --- Session Storage Key ---
+        const SESSION_STORAGE_KEY = 'unsavedWorldBuilderState';
         // --- Access State from Streamlit ---
         const allInitialObjects = window.ALL_INITIAL_OBJECTS || [];
         const selectedObjectType = window.SELECTED_OBJECT_TYPE || "None";
             loadInitialObjects(); // Load ALL objects passed from Python
+            // *** ADDED: Restore unsaved state from sessionStorage ***
+            restoreUnsavedState();
             // Event Listeners
             document.addEventListener('mousemove', onMouseMove, false);
             document.addEventListener('click', onDocumentClick, false);
             window.addEventListener('resize', onWindowResize, false);
             document.addEventListener('keydown', onKeyDown);
             document.addEventListener('keyup', onKeyUp);
+            // No save button listener needed here
             // Define global functions needed by Python/streamlit-js-eval
             window.teleportPlayer = teleportPlayer;
             directionalLight.shadow.camera.bottom = -100;
             directionalLight.shadow.bias = -0.001;
             scene.add(directionalLight);
         }
+        function setupGround() { /* ... unchanged ... */
+            const groundWidth = Math.max(plotWidth, nextPlotXOffset + plotWidth);
+            const groundDepth = 50;
             const groundGeometry = new THREE.PlaneGeometry(groundWidth, groundDepth);
             const groundMaterial = new THREE.MeshStandardMaterial({ color: 0x55aa55, roughness: 0.9, metalness: 0.1 });
             groundMesh = new THREE.Mesh(groundGeometry, groundMaterial);
             groundMesh.rotation.x = -Math.PI / 2;
             groundMesh.position.y = -0.05;
+            groundMesh.position.x = (groundWidth / 2.0) - (plotWidth / 2.0) ;
             groundMesh.receiveShadow = true;
             scene.add(groundMesh);
             console.log(`Ground setup with width: ${groundWidth} centered near x=0`);
         function loadInitialObjects() {
             console.log(`Loading ${allInitialObjects.length} initial objects from Python.`);
             allInitialObjects.forEach(objData => {
+                createAndPlaceObject(objData, false); // Use helper, false=don't add to newlyPlaced
+            });
+             console.log("Finished loading initial objects.");
+        }
+        // --- NEW: Helper to create/place objects from data ---
+        function createAndPlaceObject(objData, isNewObject) {
+             let loadedObject = null;
+             // Need to deserialize object based on 'type' field from CSV/Storage
+             switch (objData.type) {
+                 case "Simple House": loadedObject = createSimpleHouse(); break;
+                 case "Tree": loadedObject = createTree(); break;
+                 case "Rock": loadedObject = createRock(); break;
+                 case "Fence Post": loadedObject = createFencePost(); break;
+                 default: console.warn("Unknown object type in data:", objData.type); break;
+             }
+             if (loadedObject) {
+                 // Position depends on whether it's from initial load (world) or storage (world)
+                 // or potentially relative if storage format changes (keep world for now)
+                 if (objData.position && objData.position.x !== undefined) {
+                     loadedObject.position.set(objData.position.x, objData.position.y, objData.position.z);
+                 } else if (objData.pos_x !== undefined) { // Handle CSV loaded format too
+                      loadedObject.position.set(objData.pos_x, objData.pos_y, objData.pos_z);
+                 }
+                 // Apply rotation
+                 if (objData.rotation) { // Format from storage/newlyPlaced
+                     loadedObject.rotation.set(objData.rotation._x, objData.rotation._y, objData.rotation._z, objData.rotation._order || 'XYZ');
+                 } else if (objData.rot_x !== undefined) { // Format from CSV
+                     loadedObject.rotation.set(objData.rot_x, objData.rot_y, objData.rot_z, objData.rot_order || 'XYZ');
+                 }
+                 // Assign unique ID if it has one, else use the one generated by createObjectBase
+                 loadedObject.userData.obj_id = objData.obj_id || loadedObject.userData.obj_id;
+                 scene.add(loadedObject);
+                 if (isNewObject) {
+                      // Only add to this array if it's being placed now or restored from session
+                      newlyPlacedObjects.push(loadedObject);
+                 }
+                 return loadedObject; // Return the mesh/group
+            }
+            return null;
+        }
+        // --- NEW: Save/Load/Clear Unsaved State using sessionStorage ---
+        function saveUnsavedState() {
+            try {
+                const stateToSave = newlyPlacedObjects.map(obj => ({
+                     obj_id: obj.userData.obj_id,
+                     type: obj.userData.type,
+                     position: { x: obj.position.x, y: obj.position.y, z: obj.position.z },
+                     rotation: { _x: obj.rotation.x, _y: obj.rotation.y, _z: obj.rotation.z, _order: obj.rotation.order }
+                 }));
+                sessionStorage.setItem(SESSION_STORAGE_KEY, JSON.stringify(stateToSave));
+                console.log(`Saved ${stateToSave.length} unsaved objects to sessionStorage.`);
+            } catch (e) {
+                console.error("Error saving state to sessionStorage:", e);
+            }
+        }
+        function restoreUnsavedState() {
+             try {
+                const savedState = sessionStorage.getItem(SESSION_STORAGE_KEY);
+                if (savedState) {
+                    console.log("Found unsaved state in sessionStorage. Restoring...");
+                    const objectsToRestore = JSON.parse(savedState);
+                    if (Array.isArray(objectsToRestore)) {
+                         // Clear existing newlyPlaced array before restoring
+                         newlyPlacedObjects = [];
+                         let count = 0;
+                         objectsToRestore.forEach(objData => {
+                              // Create object, add to scene, AND add to newlyPlacedObjects array
+                              if(createAndPlaceObject(objData, true)) {
+                                 count++;
+                              }
+                         });
+                         console.log(`Restored ${count} objects.`);
+                    }
+                } else {
+                     console.log("No unsaved state found in sessionStorage.");
                 }
+            } catch (e) {
+                console.error("Error restoring state from sessionStorage:", e);
+                 // Clear potentially corrupted storage
+                 sessionStorage.removeItem(SESSION_STORAGE_KEY);
+            }
         }
+        function clearUnsavedState() {
+            sessionStorage.removeItem(SESSION_STORAGE_KEY);
+            newlyPlacedObjects = []; // Clear the array in memory too
+            console.log("Cleared unsaved state from memory and sessionStorage.");
+        }
         // --- Object Creation Functions (MUST add userData.type and obj_id) ---
         function createObjectBase(type) { // Helper to assign common data
              const obj = { userData: { type: type, obj_id: THREE.MathUtils.generateUUID() } };
              return obj;
         }
+         function createSimpleHouse() { /* ... unchanged, uses createObjectBase ... */
+            const base = createObjectBase("Simple House");
+            const group = new THREE.Group(); Object.assign(group, base);
             const mainMaterial = new THREE.MeshStandardMaterial({ color: 0xffccaa, roughness: 0.8 });
             const roofMaterial = new THREE.MeshStandardMaterial({ color: 0xaa5533, roughness: 0.7 });
             const baseMesh = new THREE.Mesh(new THREE.BoxGeometry(2, 1.5, 2.5), mainMaterial);
             roof.position.y = 1.5 + 1 / 2; roof.rotation.y = Math.PI / 4; roof.castShadow = true; roof.receiveShadow = true; group.add(roof);
             return group;
          }
+         function createTree() { /* ... unchanged, uses createObjectBase ... */
+            const base = createObjectBase("Tree"); const group = new THREE.Group(); Object.assign(group, base);
             const trunkMaterial = new THREE.MeshStandardMaterial({ color: 0x8B4513, roughness: 0.9 });
             const leavesMaterial = new THREE.MeshStandardMaterial({ color: 0x228B22, roughness: 0.8 });
             const trunk = new THREE.Mesh(new THREE.CylinderGeometry(0.3, 0.4, 2, 8), trunkMaterial);
             leaves.position.y = 2 + 0.8; leaves.castShadow = true; leaves.receiveShadow = true; group.add(leaves);
             return group;
          }
+         function createRock() { /* ... unchanged, uses createObjectBase ... */
              const base = createObjectBase("Rock");
              const rockMaterial = new THREE.MeshStandardMaterial({ color: 0xaaaaaa, roughness: 0.8, metalness: 0.1 });
+             const rock = new THREE.Mesh(new THREE.IcosahedronGeometry(0.7, 0), rockMaterial); Object.assign(rock, base);
              rock.position.y = 0.7 / 2; rock.rotation.x = Math.random() * Math.PI; rock.rotation.y = Math.random() * Math.PI;
              rock.castShadow = true; rock.receiveShadow = true;
              return rock;
          }
+         function createFencePost() { /* ... unchanged, uses createObjectBase ... */
              const base = createObjectBase("Fence Post");
              const postMaterial = new THREE.MeshStandardMaterial({ color: 0xdeb887, roughness: 0.9 });
+             const post = new THREE.Mesh(new THREE.BoxGeometry(0.2, 1.5, 0.2), postMaterial); Object.assign(post, base);
              post.position.y = 1.5 / 2; post.castShadow = true; post.receiveShadow = true;
              return post;
          }
             if (intersects.length > 0) {
                 const intersectPoint = intersects[0].point;
+                let newObjectToPlace = null; // Use a different name to avoid confusion
+                switch (selectedObjectType) {
+                    case "Simple House": newObjectToPlace = createSimpleHouse(); break;
+                    case "Tree": newObjectToPlace = createTree(); break;
+                    case "Rock": newObjectToPlace = createRock(); break;
+                    case "Fence Post": newObjectToPlace = createFencePost(); break;
+                    default: return;
                 }
+                if (newObjectToPlace) {
                     // Position in WORLD coordinates where clicked
+                    newObjectToPlace.position.copy(intersectPoint);
+                    // Adjust Y based on object's geometry center if needed
+                    // (Create functions mostly handle placing base at y=0)
+                    scene.add(newObjectToPlace);
+                    newlyPlacedObjects.push(newObjectToPlace); // Add to list for saving
+                    // *** ADDED: Save state to sessionStorage immediately after placing ***
+                    saveUnsavedState();
+                    console.log(`Placed new ${selectedObjectType}. Total unsaved: ${newlyPlacedObjects.length}`);
                 }
             }
         }
         function onKeyUp(event) { keysPressed[event.code] = false; }
         // --- Functions called by Python via streamlit-js-eval ---
+        function teleportPlayer(targetX) { /* ... unchanged ... */
             console.log("JS teleportPlayer called with targetX:", targetX);
             if (playerMesh) {
+                playerMesh.position.x = targetX + 2.0;
+                playerMesh.position.z = 5.0;
+                 const offset = new THREE.Vector3(0, 15, 20);
                  const targetPosition = playerMesh.position.clone().add(offset);
                  camera.position.copy(targetPosition);
                  camera.lookAt(playerMesh.position);
                  console.log("Player teleported to:", playerMesh.position);
+            } else { console.error("Player mesh not found for teleport."); }
         }
+        function getSaveData() { // Called by Python when save button is clicked
+             console.log(`JS getSaveData called. Returning ${newlyPlacedObjects.length} new objects.`);
+             // Prepare data in the format Python expects (world positions)
              const objectsToSave = newlyPlacedObjects.map(obj => {
+                 if (!obj.userData || !obj.userData.type) { return null; }
+                 const rotation = { _x: obj.rotation.x, _y: obj.rotation.y, _z: obj.rotation.z, _order: obj.rotation.order };
                  return {
+                     obj_id: obj.userData.obj_id,
                      type: obj.userData.type,
                      position: { x: obj.position.x, y: obj.position.y, z: obj.position.z },
                      rotation: rotation
                  };
+             }).filter(obj => obj !== null);
              console.log("Prepared data for saving:", objectsToSave);
              return JSON.stringify(objectsToSave); // Return as JSON string
         }
+        function resetNewlyPlacedObjects() { // Called by Python AFTER successful save
+             console.log(`JS resetNewlyPlacedObjects called.`);
+             clearUnsavedState(); // Clear memory array AND sessionStorage
         }
         // --- Animation Loop ---
         function updatePlayerMovement() { /* ... unchanged ... */
+             if (!playerMesh) return;
+             const moveDirection = new THREE.Vector3(0, 0, 0);
+             if (keysPressed['KeyW'] || keysPressed['ArrowUp']) moveDirection.z -= 1;
+             if (keysPressed['KeyS'] || keysPressed['ArrowDown']) moveDirection.z += 1;
+             if (keysPressed['KeyA'] || keysPressed['ArrowLeft']) moveDirection.x -= 1;
+             if (keysPressed['KeyD'] || keysPressed['ArrowRight']) moveDirection.x += 1;
+             if (moveDirection.lengthSq() > 0) {
+                 moveDirection.normalize().multiplyScalar(playerSpeed);
+                  playerMesh.position.add(moveDirection);
+                  playerMesh.position.y = Math.max(playerMesh.position.y, 0.4 + 0.8/2);
+             }
         }
         function updateCamera() { /* ... unchanged ... */
             if (!playerMesh) return;
             const offset = new THREE.Vector3(0, 15, 20);
             const targetPosition = playerMesh.position.clone().add(offset);
+            camera.position.lerp(targetPosition, 0.08);
             camera.lookAt(playerMesh.position);
         }