Refator

Assets/Prefabs/objTstOrient1.fbx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:959a865e2418cffdf1faef58350bcb513b950811e1a7fa83a194e5f38d5dfe77
+size 12684

Assets/Prefabs/objTstOrient1.fbx.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 4f1c004b5acbc994ab56e557d1e7a39c
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Inventory/InventoryManager.cs

@@ -12,7 +12,7 @@ public class InventoryManager : MonoBehaviour
     public int depthCount = 3; // Depth into the bag
 
     [Header("Grid Settings (Visual)")]
-    public Vector3 gridOffset = new Vector3(0f, 0.9f, 0.35f);
+    public Vector3 gridOffset = new Vector3(0f, 0.25f, 0.35f);
     public Vector3 gridScale = new Vector3(1.75f, 1.75f, 1f);
     public float cellSize = 0.15f;
     public float gridSpacing = 0.05f;
@@ -140,7 +140,7 @@ public class InventoryManager : MonoBehaviour
         foreach (var col in colliders) col.enabled = false;
 
         // 4. Scale: intentionally left at Vector3.one (set in step 2). Items keep their true
-        // authored world size a footprint of N slots should measure exactly N * cellSize,
+        // authored world size - a footprint of N slots should measure exactly N * cellSize,
         // never be scaled up/down to visually "fit". Only rotation (swap state) and position
         // (grid slot) change.
 
@@ -156,17 +156,20 @@ public class InventoryManager : MonoBehaviour
 
         itemObj.transform.localPosition = new Vector3(xPos, yPos, zPos);
 
-        // 6. Rotation based on swapState
+        // 6. Rotation based on swapState.
+        // Model convention: Z = face axis, Y = up axis, X = side axis.
+        // State1 (bulk moves onto X / horizontal): roll -90 deg around Z.
+        // State2 (bulk moves onto Z / depth): pitch -90 deg around X.
         switch (itemData.swapState)
         {
             case 0:
                 itemObj.transform.localRotation = Quaternion.Euler(0, 0, 0);
                 break;
             case 1:
-                itemObj.transform.localRotation = Quaternion.Euler(0, 0, 90f);
+                itemObj.transform.localRotation = Quaternion.Euler(0, 0, -90f);
                 break;
             case 2:
-                itemObj.transform.localRotation = Quaternion.Euler(0, 90f, 0);
+                itemObj.transform.localRotation = Quaternion.Euler(-90f, 0, 0);
                 break;
         }
     }

Assets/Scripts/Inventory/Inventoryplacer.cs

@@ -54,30 +54,25 @@ public class InventoryPlacer
         if (hasExisting)
         {
             ItemData lastCopy = existingStack[existingStack.Count - 1];
-
-            // Only worth locking lastCopy to State2 if that lock could actually create usable room
-            // for the new duplicate (beneath or behind). If not - e.g. depth is fully exhausted and
-            // the freed Y-space wouldn't be reachable either - leave lastCopy exactly as it is and
-            // go straight to a fresh search. Locking with no payoff just needlessly rotates an item
-            // that will never receive a neighbor.
-            if (WouldLockingCreateUsableRoom(lastCopy, item))
+            bool wasAlreadyLocked = lastCopy.swapState == 2;
+
+            // Try to lock lastCopy to State2 - this is what USUALLY frees the most room (shrinks its
+            // Y footprint, banking the freed space into depth). But locking can legitimately fail
+            // (e.g. its State2 footprint would run out of depth bounds) - in that case lastCopy simply
+            // stays exactly as it already sits, and we still try to slot the duplicate in beneath/behind
+            // it using whatever footprint it currently has. Locking is an optimization, not a
+            // precondition - the duplicate can still find room next to an unlocked lastCopy.
+            bool locked = LockLastCopyAtStateTwo(lastCopy);
+            if (locked && !wasAlreadyLocked) reflowed?.Add(lastCopy);
+
+            if (TryPlaceBeneathLockedCopy(lastCopy, item) || TryPlaceBehindStack(lastCopy, item))
             {
-                bool wasAlreadyLocked = lastCopy.swapState == 2;
-
-                if (LockLastCopyAtStateTwo(lastCopy))
-                {
-                    if (!wasAlreadyLocked) reflowed?.Add(lastCopy);
-
-                    if (TryPlaceBeneathLockedCopy(lastCopy, item) || TryPlaceBehindStack(lastCopy, item))
-                    {
-                        RegisterPlacement(item);
-                        return true;
-                    }
-                }
-
-                // Either lastCopy couldn't lock at state 2 here, or there's no room beneath/behind it -
-                // this duplicate can't stack against lastCopy. Fall back to a fully fresh search below.
+                RegisterPlacement(item);
+                return true;
             }
+
+            // No room beneath or behind lastCopy in whatever state it ended up in - this duplicate
+            // can't stack against lastCopy. Fall back to a fully fresh search below.
         }
 
         if (TryPlaceFresh(item))
@@ -89,53 +84,6 @@ public class InventoryPlacer
         return false;
     }
 
-    /// <summary>
-    /// Lookahead check: would locking lastCopy to State2 (or leaving it, if already locked) actually
-    /// open up room for newItem, either beneath it in the same column or behind it in another Z lane?
-    /// Does NOT mutate the grid - simulates the post-lock footprint/position mathematically.
-    /// Prevents needlessly rotating lastCopy into State2 when there's no depth left to exploit it.
-    /// </summary>
-    private bool WouldLockingCreateUsableRoom(ItemData lastCopy, ItemData newItem)
-    {
-        Vector3Int lockedOrigin = lastCopy.gridPosition;
-        Vector3Int lockedFootprint = lastCopy.swapState == 2 ? lastCopy.currentFootprint : lastCopy.FootprintAtState(2);
-
-        int lineIndex = lockedOrigin.x;
-        int depthLane = lockedOrigin.z;
-        int startY = lockedOrigin.y + lockedFootprint.y;
-
-        // Room beneath, in the same column/lane?
-        if (CanFitAnyStateAtColumn(newItem, lineIndex, depthLane, startY, grid.rowCount))
-            return true;
-
-        // Room behind, in any other Z lane available to this itemID?
-        for (int z = 1; z < grid.depthCount; z++)
-        {
-            if (!grid.DepthLaneAvailableFor(lineIndex, z, newItem.itemID)) continue;
-            if (CanFitAnyStateAtColumn(newItem, lineIndex, z, 0, grid.rowCount))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>Read-only version of TryStatesAtColumn's search - checks fit without occupying.</summary>
-    private bool CanFitAnyStateAtColumn(ItemData item, int x, int z, int startY, int rowLimit)
-    {
-        bool cube = IsCube(item);
-        for (int y = startY; y < rowLimit; y++)
-        {
-            int maxState = cube ? 0 : 2;
-            for (int state = 0; state <= maxState; state++)
-            {
-                Vector3Int footprint = item.FootprintAtState(state);
-                if (grid.IsRegionFreeForItem(new Vector3Int(x, y, z), footprint, item.itemID))
-                    return true;
-            }
-        }
-        return false;
-    }
-
     /// <summary>Removes an item from the grid and placement bookkeeping (e.g. item dropped/consumed).</summary>
     public void Remove(ItemData item)
     {