Update app.py

app.py

@@ -22,6 +22,81 @@ CSV_COLUMNS = [
     'rot_x', 'rot_y', 'rot_z', 'rot_order'
 ]
 
+# 🎨 Model categories and types
+MODEL_CATEGORIES = {
+    "None": ["None"],
+    "Buildings": [
+        "Simple House", 
+        "Cyberpunk Wall Panel", 
+        "Modular Hab Block", 
+        "MegaCorp Skyscraper",
+        "Castle Wall Section", 
+        "Wooden Door",
+        "House Roof Section",
+        "Concrete Bunker Wall",
+        "Damaged House Facade"
+    ],
+    "Nature": [
+        "Tree", 
+        "Rock", 
+        "Pine Tree", 
+        "Boulder",
+        "Alien Plant",
+        "Floating Rock Platform",
+        "Rubble Pile"
+    ],
+    "Props": [
+        "Fence Post", 
+        "Rooftop AC Unit", 
+        "Holographic Window Display",
+        "Jersey Barrier",
+        "Oil Drum",
+        "Canned Food",
+        "Treasure Chest",
+        "Wall Torch",
+        "Bone Pile"
+    ],
+    "Characters": [
+        "King Figure",
+        "Soldier Figure",
+        "Mage Figure",
+        "Zombie Figure",
+        "Survivor Figure",
+        "Dwarf Miner Figure",
+        "Undead Knight Figure",
+        "Hero Figure"
+    ],
+    "Vehicles": [
+        "Wooden Cart",
+        "Ballista",
+        "Siege Tower",
+        "Buggy Frame",
+        "Motorbike",
+        "Hover Bike", 
+        "APC",
+        "Sand Boat"
+    ],
+    "Weapons": [
+        "Makeshift Machete",
+        "Pistol Body",
+        "Scope Attachment",
+        "Laser Pistol",
+        "Energy Sword",
+        "Dwarven Axe",
+        "Magic Staff"
+    ],
+    "Effects": [
+        "Candle Flame",
+        "Dust Cloud",
+        "Blood Splat Decal",
+        "Burning Barrel Fire",
+        "Warp Tunnel Effect",
+        "Laser Beam",
+        "Gold Sparkle",
+        "Steam Vent"
+    ]
+}
+
 # 🗂️ Ensure directory for plots exists
 os.makedirs(SAVE_DIR, exist_ok=True)
 
@@ -132,8 +207,11 @@ game_state = get_game_state()
 
 # 🧠 Session state defaults
 st.session_state.setdefault('selected_object','None')
+st.session_state.setdefault('selected_category','None')
 st.session_state.setdefault('new_plot_name','')
 st.session_state.setdefault('js_save_data_result',None)
+st.session_state.setdefault('custom_scale', 1.0)
+st.session_state.setdefault('custom_rotation_y', 0)
 
 # 🔄 Load everything
 plots_metadata = load_plot_metadata()
@@ -144,6 +222,7 @@ for p in plots_metadata:
 # 🖥️ Sidebar UI
 with st.sidebar:
     st.title("🏗️ World Controls")
+    
     st.header("📍 Navigate Plots")
     cols = st.columns(2)
     i = 0
@@ -160,11 +239,59 @@ with st.sidebar:
 
     st.markdown("---")
     st.header("🌲 Place Objects")
-    opts = ["None","Simple House","Tree","Rock","Fence Post"]
-    idx = opts.index(st.session_state.selected_object) if st.session_state.selected_object in opts else 0
-    sel = st.selectbox("Select:", opts, index=idx, key="selected_object_widget")
-    if sel != st.session_state.selected_object:
-        st.session_state.selected_object = sel
+    
+    # 📂 Category selector
+    category_list = list(MODEL_CATEGORIES.keys())
+    selected_category = st.selectbox(
+        "Category:", 
+        category_list, 
+        index=category_list.index(st.session_state.selected_category) if st.session_state.selected_category in category_list else 0,
+        key="selected_category_widget"
+    )
+    
+    if selected_category != st.session_state.selected_category:
+        st.session_state.selected_category = selected_category
+        if st.session_state.selected_category != "None":
+            # Default to first item in the new category
+            st.session_state.selected_object = MODEL_CATEGORIES[selected_category][0]
+    
+    # 🖼️ Object selector within the category
+    if selected_category in MODEL_CATEGORIES:
+        object_list = MODEL_CATEGORIES[selected_category]
+        current_object = st.session_state.selected_object
+        if current_object not in object_list:
+            current_object = object_list[0]
+        
+        selected_object = st.selectbox(
+            "Select:", 
+            object_list, 
+            index=object_list.index(current_object) if current_object in object_list else 0,
+            key="selected_object_widget"
+        )
+        
+        if selected_object != st.session_state.selected_object:
+            st.session_state.selected_object = selected_object
+    
+    # ↕️ Scale slider (not shown for the None selection)
+    if st.session_state.selected_object != "None":
+        st.session_state.custom_scale = st.slider(
+            "Scale:", 
+            min_value=0.2, 
+            max_value=3.0, 
+            value=st.session_state.custom_scale,
+            step=0.1,
+            key="scale_slider"
+        )
+        
+        # 🔄 Rotation slider (Y-axis)
+        st.session_state.custom_rotation_y = st.slider(
+            "Rotation:", 
+            min_value=0, 
+            max_value=359, 
+            value=st.session_state.custom_rotation_y,
+            step=15,
+            key="rotation_slider"
+        )
 
     st.markdown("---")
     st.header("💾 Save Work")
@@ -172,6 +299,15 @@ with st.sidebar:
         from streamlit_js_eval import streamlit_js_eval
         streamlit_js_eval(js_code="getSaveDataAndPosition();", key="js_save_processor")
         st.rerun()
+    
+    # 📝 New plot naming
+    with st.expander("Create Named Plot"):
+        st.text_input("New Plot Name:", key="new_plot_name")
+        if st.button("Create at Current Position"):
+            if st.session_state.new_plot_name.strip():
+                from streamlit_js_eval import streamlit_js_eval
+                streamlit_js_eval(js_code="getSaveDataForNamedPlot();", key="named_plot_processor")
+                st.rerun()
 
 # 📨 Handle incoming save data
 raw = st.session_state.get("js_save_processor")
@@ -200,6 +336,35 @@ if raw:
     st.session_state.js_save_processor=None
     if ok: st.rerun()
 
+# 📨 Handle named plot data
+named_raw = st.session_state.get("named_plot_processor")
+if named_raw:
+    st.info("📬 Got data for named plot!")
+    ok=False
+    try:
+        pay = json.loads(named_raw) if isinstance(named_raw,str) else named_raw
+        pos, objs = pay.get('playerPosition'), pay.get('objectsToSave')
+        if isinstance(objs,list) and pos and st.session_state.new_plot_name.strip():
+            gx, gz = math.floor(pos['x']/PLOT_WIDTH), math.floor(pos['z']/PLOT_DEPTH)
+            name = st.session_state.new_plot_name.strip().replace(' ', '_')
+            fn = f"plot_X{gx}_Z{gz}_{name}.csv"
+            if save_plot_data(fn, objs, gx*PLOT_WIDTH, gz*PLOT_DEPTH):
+                load_plot_metadata.clear()
+                try:
+                    from streamlit_js_eval import streamlit_js_eval
+                    streamlit_js_eval(js_code="resetNewlyPlacedObjects();", key="reset_js")
+                except:
+                    pass
+                game_state.update_state(objs)
+                ok=True
+                st.session_state.new_plot_name = ""
+        if not ok:
+            st.error("❌ Named plot save error")
+    except Exception as e:
+        st.error(f"Named plot err: {e}")
+    st.session_state.named_plot_processor=None
+    if ok: st.rerun()
+
 # 🏠 Main view
 st.header("🌍 Infinite Shared 3D World")
 st.caption("➡️ Explore, click to build, 💾 to save!")
@@ -209,6 +374,8 @@ state = {
     "ALL_INITIAL_OBJECTS": all_initial_objects,
     "PLOTS_METADATA": plots_metadata,
     "SELECTED_OBJECT_TYPE": st.session_state.selected_object,
+    "CUSTOM_SCALE": st.session_state.custom_scale,
+    "CUSTOM_ROTATION_Y": st.session_state.custom_rotation_y * (math.pi / 180),  # Convert to radians
     "PLOT_WIDTH": PLOT_WIDTH,
     "PLOT_DEPTH": PLOT_DEPTH,
     "GAME_STATE": game_state.get_state()
@@ -222,13 +389,17 @@ try:
     window.ALL_INITIAL_OBJECTS = {json.dumps(state['ALL_INITIAL_OBJECTS'])};
     window.PLOTS_METADATA   = {json.dumps(state['PLOTS_METADATA'])};
     window.SELECTED_OBJECT_TYPE = {json.dumps(state['SELECTED_OBJECT_TYPE'])};
+    window.CUSTOM_SCALE = {json.dumps(state['CUSTOM_SCALE'])};
+    window.CUSTOM_ROTATION_Y = {json.dumps(state['CUSTOM_ROTATION_Y'])};
     window.PLOT_WIDTH = {json.dumps(state['PLOT_WIDTH'])};
     window.PLOT_DEPTH = {json.dumps(state['PLOT_DEPTH'])};
     window.GAME_STATE = {json.dumps(state['GAME_STATE'])};
     console.log('👍 State injected!', {{
         objs: window.ALL_INITIAL_OBJECTS.length,
         plots: window.PLOTS_METADATA.length,
-        gs: window.GAME_STATE.length
+        gs: window.GAME_STATE.length,
+        scale: window.CUSTOM_SCALE,
+        rotation: window.CUSTOM_ROTATION_Y
     }});
 </script>
 """
@@ -237,4 +408,4 @@ try:
 except FileNotFoundError:
     st.error("❌ index.html missing!")
 except Exception as e:
-    st.error(f"😱 HTML inject failed: {e}")
+    st.error(f"😱 HTML inject failed: {e}")