File size: 13,204 Bytes
41c1a97
 
 
 
 
 
 
f32aedf
 
dfe769e
41c1a97
 
 
f32aedf
 
41c1a97
 
 
 
 
 
 
f32aedf
41c1a97
f32aedf
41c1a97
f32aedf
80d0af3
f32aedf
80d0af3
 
f32aedf
80d0af3
 
f32aedf
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
41c1a97
 
 
 
f32aedf
dfe769e
f32aedf
41c1a97
f32aedf
80d0af3
 
 
dfe769e
41c1a97
 
f32aedf
41c1a97
f32aedf
41c1a97
 
 
 
 
 
f32aedf
41c1a97
 
 
 
f32aedf
 
41c1a97
 
dfe769e
 
 
 
41c1a97
dfe769e
 
 
f32aedf
dfe769e
 
 
41c1a97
 
 
f32aedf
 
dfe769e
f32aedf
 
dfe769e
41c1a97
 
 
 
f32aedf
 
 
41c1a97
 
 
 
 
 
f32aedf
41c1a97
 
f32aedf
 
 
41c1a97
 
f32aedf
 
41c1a97
 
 
7825ef7
f32aedf
7825ef7
 
 
 
 
 
f32aedf
 
dfe769e
7825ef7
f32aedf
 
 
 
 
7825ef7
f32aedf
80d0af3
f32aedf
 
 
80d0af3
 
f32aedf
7825ef7
 
 
 
 
 
f32aedf
7825ef7
f32aedf
7825ef7
 
 
f32aedf
7825ef7
 
 
 
f32aedf
 
 
 
 
 
 
7825ef7
f32aedf
 
dfe769e
7825ef7
f32aedf
7825ef7
dfe769e
7825ef7
f32aedf
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
7825ef7
f32aedf
7825ef7
f32aedf
 
7825ef7
 
f32aedf
 
7825ef7
 
 
dfe769e
f32aedf
dfe769e
f32aedf
dfe769e
 
7825ef7
 
 
f32aedf
 
7825ef7
 
 
f32aedf
7825ef7
 
 
 
 
f32aedf
7825ef7
 
f32aedf
 
7825ef7
 
f32aedf
7825ef7
 
 
f32aedf
7825ef7
f32aedf
7825ef7
 
 
 
 
f32aedf
7825ef7
 
f32aedf
7825ef7
 
 
 
 
f32aedf
7825ef7
 
f32aedf
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
# app.py
import streamlit as st
import streamlit.components.v1 as components
import os
import json
import pandas as pd
import uuid
import math # For floor function
# from PIL import Image, ImageDraw # No longer needed for minimap
from streamlit_js_eval import streamlit_js_eval # For JS communication

# --- Constants ---
SAVE_DIR = "saved_worlds"
PLOT_WIDTH = 50.0 # Width of each plot in 3D space
PLOT_DEPTH = 50.0 # Depth of each plot (can be same as width)
CSV_COLUMNS = ['obj_id', 'type', 'pos_x', 'pos_y', 'pos_z', 'rot_x', 'rot_y', 'rot_z', 'rot_order']

# --- Ensure Save Directory Exists ---
os.makedirs(SAVE_DIR, exist_ok=True)

# --- Helper Functions ---

@st.cache_data(ttl=3600) # Cache plot list
def load_plot_metadata():
    """Scans save dir for plot_X*_Z*.csv, sorts, calculates metadata."""
    plots = []
    plot_files = []
    try:
        plot_files = [f for f in os.listdir(SAVE_DIR) if f.endswith(".csv") and f.startswith("plot_X")]
    except FileNotFoundError:
        st.error(f"Save directory '{SAVE_DIR}' not found.")
        return []
    except Exception as e:
        st.error(f"Error listing save directory '{SAVE_DIR}': {e}")
        return []

    # Parse filenames to get grid coordinates
    parsed_plots = []
    for filename in plot_files:
        try:
            parts = filename[:-4].split('_') # Remove .csv
            grid_x = int(parts[1][1:]) # Extract number after X
            grid_z = int(parts[2][1:]) # Extract number after Z
            # Extract name if present (parts after Z coordinate)
            plot_name = " ".join(parts[3:]) if len(parts) > 3 else f"Plot ({grid_x},{grid_z})"

            parsed_plots.append({
                'id': filename[:-4], # Use filename base as unique ID
                'filename': filename,
                'grid_x': grid_x,
                'grid_z': grid_z,
                'name': plot_name,
                'x_offset': grid_x * PLOT_WIDTH,
                'z_offset': grid_z * PLOT_DEPTH # Use PLOT_DEPTH for Z offset
            })
        except (IndexError, ValueError):
            st.warning(f"Could not parse grid coordinates from filename: {filename}. Skipping.")
            continue

    # Sort primarily by X, then by Z
    parsed_plots.sort(key=lambda p: (p['grid_x'], p['grid_z']))

    return parsed_plots

def load_plot_objects(filename, x_offset, z_offset):
    """Loads objects from a CSV, applying the plot's world offsets."""
    file_path = os.path.join(SAVE_DIR, filename)
    objects = []
    try:
        df = pd.read_csv(file_path)
        # Check required columns
        if not all(col in df.columns for col in ['type', 'pos_x', 'pos_y', 'pos_z']):
             st.warning(f"CSV '{filename}' missing essential columns. Skipping.")
             return []
        # Add defaults for optional columns
        df['obj_id'] = df.get('obj_id', pd.Series([str(uuid.uuid4()) for _ in range(len(df))]))
        for col, default in [('rot_x', 0.0), ('rot_y', 0.0), ('rot_z', 0.0), ('rot_order', 'XYZ')]:
             if col not in df.columns: df[col] = default

        for _, row in df.iterrows():
            obj_data = row.to_dict()
            # Apply world offset
            obj_data['pos_x'] += x_offset
            obj_data['pos_z'] += z_offset # Apply Z offset too
            objects.append(obj_data)
        return objects
    except FileNotFoundError:
        st.error(f"File not found during object load: {filename}")
        return []
    except pd.errors.EmptyDataError:
         return [] # Empty file is valid
    except Exception as e:
        st.error(f"Error loading objects from {filename}: {e}")
        return []

def save_plot_data(filename, objects_data_list, plot_x_offset, plot_z_offset):
    """Saves object data list to a CSV, making positions relative to plot origin."""
    file_path = os.path.join(SAVE_DIR, filename)
    relative_objects = []
    if not isinstance(objects_data_list, list):
        st.error("Invalid data format received for saving (expected a list).")
        return False

    for obj in objects_data_list:
        pos = obj.get('position', {})
        rot = obj.get('rotation', {})
        obj_type = obj.get('type', 'Unknown')
        obj_id = obj.get('obj_id', str(uuid.uuid4()))

        if not all(k in pos for k in ['x', 'y', 'z']) or obj_type == 'Unknown':
            print(f"Skipping malformed object during save prep: {obj}")
            continue

        relative_obj = {
            'obj_id': obj_id, 'type': obj_type,
            'pos_x': pos.get('x', 0.0) - plot_x_offset, # Make relative X
            'pos_y': pos.get('y', 0.0),
            'pos_z': pos.get('z', 0.0) - plot_z_offset, # Make relative Z
            'rot_x': rot.get('_x', 0.0), 'rot_y': rot.get('_y', 0.0), 'rot_z': rot.get('_z', 0.0),
            'rot_order': rot.get('_order', 'XYZ')
        }
        relative_objects.append(relative_obj)

    try:
        df = pd.DataFrame(relative_objects, columns=CSV_COLUMNS)
        df.to_csv(file_path, index=False)
        st.success(f"Saved {len(relative_objects)} objects to {filename}")
        return True
    except Exception as e:
        st.error(f"Failed to save plot data to {filename}: {e}")
        return False

# --- Page Config ---
st.set_page_config( page_title="Infinite World Builder", layout="wide")

# --- Initialize Session State ---
if 'selected_object' not in st.session_state: st.session_state.selected_object = 'None'
if 'new_plot_name' not in st.session_state: st.session_state.new_plot_name = "" # No longer used for filename
if 'js_save_data_result' not in st.session_state: st.session_state.js_save_data_result = None

# --- Load Plot Metadata ---
# This is now the source of truth for saved plots
plots_metadata = load_plot_metadata()

# --- Load ALL Objects for Rendering ---
all_initial_objects = []
for plot in plots_metadata:
    all_initial_objects.extend(load_plot_objects(plot['filename'], plot['x_offset'], plot['z_offset']))

# --- Sidebar ---
with st.sidebar:
    st.title("🏗️ World Controls")

    st.header("Navigation (Plots)")
    st.caption("Click to teleport player to a plot.")
    max_cols = 2 # Adjust columns for potentially more buttons
    cols = st.columns(max_cols)
    col_idx = 0
    # Sort buttons by grid coords for logical layout
    sorted_plots_for_nav = sorted(plots_metadata, key=lambda p: (p['grid_x'], p['grid_z']))
    for plot in sorted_plots_for_nav:
        button_label = f"➡️ {plot.get('name', plot['id'])} ({plot['grid_x']},{plot['grid_z']})"
        if cols[col_idx].button(button_label, key=f"nav_{plot['id']}"):
            target_x = plot['x_offset']
            target_z = plot['z_offset'] # Use Z offset too
            try:
                # Tell JS where to teleport (center of plot approx)
                js_code = f"teleportPlayer({target_x + PLOT_WIDTH/2}, {target_z + PLOT_DEPTH/2});"
                streamlit_js_eval(js_code=js_code, key=f"teleport_{plot['id']}")
            except Exception as e:
                 st.error(f"Failed to send teleport command: {e}")
        col_idx = (col_idx + 1) % max_cols

    st.markdown("---")

    # --- Object Placement ---
    st.header("Place Objects")
    object_types = ["None", "Simple House", "Tree", "Rock", "Fence Post"]
    current_object_index = object_types.index(st.session_state.selected_object) if st.session_state.selected_object in object_types else 0
    selected_object_type_widget = st.selectbox(
        "Select Object:", options=object_types, index=current_object_index, key="selected_object_widget"
    )
    if selected_object_type_widget != st.session_state.selected_object:
         st.session_state.selected_object = selected_object_type_widget
         # Rerun will happen, JS reloads state via sessionStorage, Python injects new selection

    st.markdown("---")

    # --- Saving ---
    st.header("Save Work")
    st.caption("Saves newly placed objects to the plot the player is currently in. If it's a new area, a new plot file is created.")
    if st.button("💾 Save Current Work", key="save_button"):
        # Trigger JS to get data AND player position
        js_get_data_code = "getSaveDataAndPosition();" # JS function needs update
        streamlit_js_eval(js_code=js_get_data_code, key="js_save_processor")
        st.rerun() # Rerun to process result


# --- Process Save Data ---
save_data_from_js = st.session_state.get("js_save_processor", None)

if save_data_from_js is not None:
    st.info("Received save data from client...")
    save_processed_successfully = False
    try:
        # Expecting { playerPosition: {x,y,z}, objectsToSave: [...] }
        payload = json.loads(save_data_from_js) if isinstance(save_data_from_js, str) else save_data_from_js

        if isinstance(payload, dict) and 'playerPosition' in payload and 'objectsToSave' in payload:
            player_pos = payload['playerPosition']
            objects_to_save = payload['objectsToSave']

            if isinstance(objects_to_save, list): # Allow saving empty list (clears new objects)
                # Determine target plot based on player position
                target_grid_x = math.floor(player_pos.get('x', 0.0) / PLOT_WIDTH)
                target_grid_z = math.floor(player_pos.get('z', 0.0) / PLOT_DEPTH) # Use Z pos too

                target_filename = f"plot_X{target_grid_x}_Z{target_grid_z}.csv"
                target_plot_x_offset = target_grid_x * PLOT_WIDTH
                target_plot_z_offset = target_grid_z * PLOT_DEPTH

                st.write(f"Attempting to save plot: {target_filename} (Player at: x={player_pos.get('x', 0):.1f}, z={player_pos.get('z', 0):.1f})")

                # Check if this plot already exists in metadata (for logging/future logic)
                is_new_plot_file = not os.path.exists(os.path.join(SAVE_DIR, target_filename))

                save_ok = save_plot_data(target_filename, objects_to_save, target_plot_x_offset, target_plot_z_offset)

                if save_ok:
                    load_plot_metadata.clear() # Clear cache to force reload metadata
                    try: # Tell JS to clear its unsaved state
                         streamlit_js_eval(js_code="resetNewlyPlacedObjects();", key="reset_js_state")
                    except Exception as js_e:
                         st.warning(f"Could not reset JS state after save: {js_e}")

                    if is_new_plot_file:
                        st.success(f"New plot created and saved: {target_filename}")
                    else:
                        st.success(f"Updated existing plot: {target_filename}")
                    save_processed_successfully = True
                else:
                    st.error(f"Failed to save plot data to file: {target_filename}")
            else:
                st.error("Invalid 'objectsToSave' format received (expected list).")
        else:
            st.error("Invalid save payload structure received from client.")
            print("Received payload:", payload) # Log for debugging

    except json.JSONDecodeError:
        st.error("Failed to decode save data from client.")
        print("Received raw data:", save_data_from_js)
    except Exception as e:
        st.error(f"Error processing save: {e}")
        st.exception(e)

    # Clear the trigger data from session state
    st.session_state.js_save_processor = None
    # Rerun after processing to reflect changes
    if save_processed_successfully:
        st.rerun()


# --- Main Area ---
st.header("Infinite Shared 3D World")
st.caption("Move to empty areas to expand the world. Use sidebar 'Save' to save work to current plot.")

# --- Load and Prepare HTML ---
html_file_path = 'index.html'
html_content_with_state = None

try:
    with open(html_file_path, 'r', encoding='utf-8') as f:
        html_template = f.read()

    # --- Inject Python state into JavaScript ---
    js_injection_script = f"""
<script>
    window.ALL_INITIAL_OBJECTS = {json.dumps(all_initial_objects)};
    window.PLOTS_METADATA = {json.dumps(plots_metadata)}; // Send plot info to JS
    window.SELECTED_OBJECT_TYPE = {json.dumps(st.session_state.selected_object)};
    window.PLOT_WIDTH = {json.dumps(PLOT_WIDTH)};
    window.PLOT_DEPTH = {json.dumps(PLOT_DEPTH)};
    console.log("Streamlit State Injected:", {{
        selectedObject: window.SELECTED_OBJECT_TYPE,
        initialObjectsCount: window.ALL_INITIAL_OBJECTS ? window.ALL_INITIAL_OBJECTS.length : 0,
        plotCount: window.PLOTS_METADATA ? window.PLOTS_METADATA.length : 0,
        plotWidth: window.PLOT_WIDTH,
        plotDepth: window.PLOT_DEPTH
    }});
</script>
"""
    html_content_with_state = html_template.replace('</head>', js_injection_script + '\n</head>', 1)

    # --- Embed HTML Component ---
    components.html(
        html_content_with_state,
        height=750,
        scrolling=False
    )

except FileNotFoundError:
    st.error(f"CRITICAL ERROR: Could not find the file '{html_file_path}'.")
    st.warning(f"Make sure `{html_file_path}` is in the same directory as `app.py` and `{SAVE_DIR}` exists.")
except Exception as e:
    st.error(f"An critical error occurred during HTML preparation or component rendering: {e}")
    st.exception(e)