Revert "Don demo tweaks (#68)"

This reverts commit b2c304f.

Author: Max Carlson

Unity/SpaceCraft/Assets/Editor/Build.cs

@@ -92,8 +92,8 @@ public static void WebGL_Prod()
         }
         // --- End Force --- 
 
-        // Default prod output (match Development build location)
-        string buildPath = Path.Combine("..", "..", "WebSites", "SpaceCraft");
+        // Default prod output (existing behavior)
+        string buildPath = Path.Combine("Builds", "SpaceCraft");
         // Allow CI override via env var or CLI
         buildPath = ResolveOutputPath(buildPath);
         Debug.Log($"[Build] Output path: {buildPath}");

Unity/SpaceCraft/Assets/Resources/Prefabs/MagnetView.prefab

@@ -118,17 +118,11 @@ MonoBehaviour:
   magnetSoftness: 0
   magnetHoleRadius: 0
   magnetHoleStrength: 0
-  _scoreMin: 0.8
+  _scoreMin: 0
   _scoreMax: 1
   viewScale: 1
   viewScaleInitial: 0.01
   magnetMaterial: {fileID: 2100000, guid: 2610998a9e1a94c63a3d4e941db2602e, type: 2}
-  orbitForce: 0
-  orbitWidth: 4
-  orbitEjectStrength: 10
-  orbitEjectRadius: 10
-  orbitDeflectStrength: 2
-  orbitDeflectRadius: 7
 --- !u!1 &7411782117926916970
 GameObject:
   m_ObjectHideFlags: 0

Unity/SpaceCraft/Assets/Scripts/Core/InputManager.cs

@@ -128,11 +128,11 @@ public class InputManager : MonoBehaviour
     [ExposedParameter(
         "View Mode",
         Category = "View",
-        Description = "Current view mode (tab id): about, arrange, view, select, inspect",
-        Default = "arrange",
+        Description = "Current view mode: magnets, selection, manual, or attract",
+        Default = "magnets",
         Visible = true
     )]
-    public string viewMode = "arrange";
+    public string viewMode = "magnets";
 
     [ExposedParameter(
         "View Seek Position Speed", 
@@ -391,28 +391,24 @@ void FixedUpdate()
         ApplyContinuousThrust();
 
 
-        // Use tab ids only: about, arrange, view, select, inspect
-        string _mode = (viewMode ?? "").ToLowerInvariant();
+        switch (viewMode) {
 
-        switch (_mode) {
-
-            case "about":
+            case "attract":
                 viewSeekEnabled = true;
                 ViewSeekAttract();
                 break;
 
-            case "arrange":
+            case "magnets":
                 viewSeekEnabled = true;
                 ViewSeekMagnets();
                 break;
 
-            case "select":
-            case "inspect":
+            case "selection":
                 viewSeekEnabled = true;
                 ViewSeekSelection();
                 break;
 
-            case "view":
+            case "manual":
             default:
                 viewSeekEnabled = false;
                 break;
@@ -868,40 +864,29 @@ private void ApplyMagnetForces()
         ItemView[] allItems = FindObjectsByType<ItemView>(FindObjectsSortMode.None);
         if (allItems.Length == 0) return;
 
-        // Precompute, for each item, whether any magnet (other than the one applying force)
-        // would attract/affect it. This lets MagnetView modulate ejection using orbitDeflectStrength.
-        Dictionary<ItemView, bool> itemAffected = new Dictionary<ItemView, bool>(allItems.Length);
-        foreach (var itemView in allItems)
-        {
-            bool affected = false;
-            Vector3 pos = itemView.transform.position;
-            foreach (var m in allMagnets)
-            {
-                if (m == null || !m.magnetEnabled) continue;
-                if (m.WouldAttract(itemView, pos)) { affected = true; break; }
-            }
-            itemAffected[itemView] = affected;
-        }
-
         foreach (MagnetView magnet in allMagnets)
         {
             if (magnet == null || !magnet.magnetEnabled) continue;
+            
             foreach (ItemView itemView in allItems)
             {
                 if (itemView?.GetComponent<Rigidbody>() == null) continue;
+                
                 Rigidbody rb = itemView.GetComponent<Rigidbody>();
-                if (rb.isKinematic) continue;
-
-                bool affectedElsewhere = false;
-                if (itemAffected.TryGetValue(itemView, out bool v)) affectedElsewhere = v;
-                // If this magnet alone is affecting, we still pass the global flag;
-                // MagnetView will choose orbitDeflectStrength only for repulsion.
-                Vector3 magneticForce = magnet.CalculateMagneticForce(itemView, itemView.transform.position, affectedElsewhere);
-                if (magneticForce.magnitude > 0.001f)
-                {
-                    rb.AddForce(magneticForce, ForceMode.Force);
-                    if (rb.IsSleeping() && magneticForce.magnitude > 0.1f) rb.WakeUp();
-                }
+                    if (rb.isKinematic) continue;
+                    
+                    Vector3 magneticForce = magnet.CalculateMagneticForce(itemView, itemView.transform.position);
+                    
+                    if (magneticForce.magnitude > 0.001f)
+                    {
+                        rb.AddForce(magneticForce, ForceMode.Force);
+                        
+                        if (rb.IsSleeping() && magneticForce.magnitude > 0.1f)
+                        {
+                            rb.WakeUp();
+                        }
+                    }
+                    
                 if (rb.linearVelocity.magnitude > maxItemVelocity)
                 {
                     rb.linearVelocity = rb.linearVelocity.normalized * maxItemVelocity;

Unity/SpaceCraft/Assets/Scripts/Core/SpaceCraft.cs

@@ -1208,19 +1208,4 @@ public void PushCameraVelocity(string controllerId, string controllerName, float
     {
         inputManager.PushCameraVelocity(controllerId, controllerName, panXDelta, panYDelta);
     }
-
-    /// <summary>
-    /// Public API to push an item by id with a small delta in world units.
-    /// Exposed to JS via bridge.updateObject(this.spaceCraft, { "method:PushItem": [itemId, dx, dy] })
-    /// </summary>
-    public void PushItem(string itemId, float dx, float dy)
-    {
-        if (string.IsNullOrEmpty(itemId)) return;
-        var itemView = FindItemSafe(itemId);
-        if (itemView == null) return;
-        var rb = itemView.GetComponent<Rigidbody>();
-        if (rb == null) return;
-        Vector3 newPosition = itemView.transform.position + new Vector3(dx, 0f, dy);
-        rb.MovePosition(newPosition);
-    }
 }

Unity/SpaceCraft/Assets/Scripts/Views/MagnetView.cs

@@ -218,41 +218,17 @@ public string searchType
     )]
     [SerializeField] public float orbitEjectStrength = 10f;
 
-    [ExposedParameter(
-        "Orbit Deflect Strength",
-        Category = "Magnetic Field",
-        Description = "Reduced outward force applied to items already influenced by one or more magnets.", 
-        Default = 2f, 
-        Visible = true,
-        Min = 0f, 
-        Max = 100f, 
-        Step = 0.1f
-    )]
-    [SerializeField] public float orbitDeflectStrength = 2f;
-    
     [ExposedParameter(
         "Orbit Eject Radius",
         Category = "Magnetic Field",
         Description = "Outward force applied to items with scores below the minimum threshold.", 
-        Default = 10f, 
-        Visible = true,
-        Min = 0f, 
-        Max = 100f, 
-        Step = 0.1f
-    )]
-    [SerializeField] public float orbitEjectRadius= 10f;
-    
-    [ExposedParameter(
-        "Orbit Deflect Radius",
-        Category = "Magnetic Field",
-        Description = "Radius for reduced repulsion when item is influenced by other magnets.", 
-        Default = 7f, 
+        Default = 15f, 
         Visible = true,
         Min = 0f, 
         Max = 100f, 
         Step = 0.1f
     )]
-    [SerializeField] public float orbitDeflectRadius = 7f;
+    [SerializeField] public float orbitEjectRadius= 7f;
 
     [SerializeField] private float _scoreMin = 0.8f;
     [ExposedParameter(
@@ -459,16 +435,6 @@ public bool IsItemEligible(Item item)
     /// Apply magnetic force to an item based on distance and relevance
     /// </summary>
     public Vector3 CalculateMagneticForce(ItemView itemView, Vector3 itemPosition)
-    {
-        // Backwards-compat overload: default no deflection knowledge
-        return CalculateMagneticForce(itemView, itemPosition, false);
-    }
-
-    /// <summary>
-    /// Calculates magnetic force. If itemAffectedByOtherMagnets is true, repulsion inside eject radius
-    /// will use orbitDeflectStrength instead of orbitEjectStrength.
-    /// </summary>
-    public Vector3 CalculateMagneticForce(ItemView itemView, Vector3 itemPosition, bool itemAffectedByOtherMagnets)
     {
         if (!magnetEnabled || itemView?.Model == null) return Vector3.zero;
 
@@ -488,17 +454,15 @@ public Vector3 CalculateMagneticForce(ItemView itemView, Vector3 itemPosition, b
         // EJECTION LOGIC for items that don't meet the minimum score
         if (score < scoreMin)
         {
-            // Only apply ejection/deflection inside the appropriate radius
-            float radius = itemAffectedByOtherMagnets ? orbitDeflectRadius : orbitEjectRadius;
-            float strengthParam = itemAffectedByOtherMagnets ? orbitDeflectStrength : orbitEjectStrength;
-            if (strengthParam <= 0.001f || distance >= radius) return Vector3.zero;
+            // Only apply ejection inside the orbitEjectRadius
+            if (orbitEjectStrength <= 0.001f || distance >= orbitEjectRadius) return Vector3.zero;
 
             // Ejection force is strongest for items with score 0, and falls to 0 as score approaches scoreMin
             float scoreFactor = 1f - (score / Mathf.Max(scoreMin, 0.0001f));
             scoreFactor = Mathf.Clamp01(scoreFactor);
 
             // Have the ejection force fall off towards the edge of the ejection radius
-            float ejectU = distance / Mathf.Max(radius, 0.0001f); // 0 at center, 1 at edge
+            float ejectU = distance / Mathf.Max(orbitEjectRadius, 0.0001f); // 0 at center, 1 at eject edge
             float s = Mathf.Clamp01(magnetSoftness);
             float ejectEdgeWidth = 0.5f * s;
             float ejectEdgeFactor;
@@ -513,7 +477,7 @@ public Vector3 CalculateMagneticForce(ItemView itemView, Vector3 itemPosition, b
                 ejectEdgeFactor = (ejectU < 1f) ? 1f : 0f;
             }
 
-            float forceStrength = strengthParam * scoreFactor * ejectEdgeFactor;
+            float forceStrength = orbitEjectStrength * scoreFactor * ejectEdgeFactor;
 
             // Return outward force (away from magnet)
             return -toMagnet.normalized * forceStrength;
@@ -620,22 +584,6 @@ public Vector3 CalculateMagneticForce(ItemView itemView, Vector3 itemPosition, b
         return Vector3.zero;
     }
 
-    /// <summary>
-    /// Returns true if this magnet would attract or orbit the item (meets score threshold
-    /// and lies within the magnet's influence radius).
-    /// </summary>
-    public bool WouldAttract(ItemView itemView, Vector3 itemPosition)
-    {
-        if (!magnetEnabled || itemView?.Model == null) return false;
-        float score = CalculateItemScore(itemView.Model);
-        if (score < scoreMin || score > scoreMax) return false;
-        Vector3 toMagnet = transform.position - itemPosition;
-        float distance = toMagnet.magnitude;
-        float innerR = Mathf.Max(0f, magnetHoleRadius);
-        float outerR = Mathf.Max(innerR, magnetRadius);
-        return distance < outerR;
-    }
-
     // Cubic Hermite smoothstep
     private static float SmoothStep(float edge0, float edge1, float x)
     {

Unity/SpaceCraft/Assets/StreamingAssets/SpaceCraft/spacecraft.js

@@ -1093,47 +1093,6 @@ class SpaceCraftSim {
                 }
             })
 
-            // Push a single item by ID in simulator world space (from controller Select tab joystick)
-            .on('broadcast', { event: 'pushItem' }, (data) => {
-                try {
-                    const payload = data && data.payload || {};
-                    try { console.log('[Sim] pushItem event received', JSON.parse(JSON.stringify(payload))); } catch {}
-
-                    // Respect targeting if provided
-                    if (payload.targetSimulatorId && payload.targetSimulatorId !== this.identity.clientId) {
-                        try { console.log('[Sim] pushItem ignored: targeted for other simulator', { targetSimulatorId: payload.targetSimulatorId, myId: this.identity.clientId }); } catch {}
-                        return;
-                    }
-
-                    const itemId = payload.itemId;
-                    const dx = Number(payload.deltaX);
-                    const dy = Number(payload.deltaY);
-
-                    if (!itemId || !isFinite(dx) || !isFinite(dy)) {
-                        try { console.warn('[Sim] pushItem invalid payload', { itemId, dx, dy }); } catch {}
-                        return;
-                    }
-
-                    if (!this.spaceCraft) {
-                        try { console.warn('[Sim] pushItem aborted: this.spaceCraft is not ready'); } catch {}
-                        return;
-                    }
-
-                    // Prefer calling the exposed C# method via bridge updateObject (explicit)
-                    try { console.log('[Sim] pushItem invoking bridge.updateObject → method:PushItem', { itemId, dx, dy }); } catch {}
-                    try {
-                        bridge.updateObject(this.spaceCraft, {
-                            "method:PushItem": [itemId, dx, dy]
-                        });
-                        try { console.log('[Sim] pushItem dispatched to Unity'); } catch {}
-                    } catch (e) {
-                        try { console.error('[Sim] pushItem bridge call failed', e); } catch {}
-                    }
-                } catch (outer) {
-                    try { console.error('[Sim] pushItem handler error', outer); } catch {}
-                }
-            })
-
             .on('broadcast', { event: 'setViewMode' }, (data) => {
                 if (data.payload.targetSimulatorId && data.payload.targetSimulatorId !== this.identity.clientId) {
                     return;

WebSites/SpaceCraft/Build/SpaceCraft.data

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9b71d9c6fcc86c5939f58d2ff22949148cbd4f462044f18ae6c6ce53b9e174d
-size 10191020
+oid sha256:3483f278d8f9e6dccbba597fafd8a8889d577dbbcf0f97fe25884352d27be1a5
+size 10232378

WebSites/SpaceCraft/Build/SpaceCraft.framework.js

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c14990b35415a431a38356127f6d79104bd1de17d3119c01911a1569eeaf4c3a
-size 56758754
+oid sha256:3e02e84271a7445c890b5c81a24acab2c1cda71d9ab5321a618f11bc56e5abbc
+size 82677590