Merge pull request #52 from mpewsey/cell-updates

Major refactor to improve overall usage
mpewsey · Jun 11, 2024 · c9dc859 · c9dc859
2 parents 3cc9bd9 + a9ff774
commit c9dc859
Show file tree

Hide file tree

Showing 916 changed files with 27,368 additions and 23,228 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,12 +15,12 @@ jobs:
 
       - uses: mpewsey/doxygen-action@v1.9.2
         with:
-          working-directory: 'Docs~/'
+          working-directory: 'Docs/'
           doxyfile-path: 'Doxyfile'
 
       - name: Deploy
         uses: mpewsey/actions-gh-pages@v3
         if: ${{ github.ref == 'refs/heads/main' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./Docs~/output/html
+          publish_dir: ./Docs/output/html
diff --git a/.gitignore b/.gitignore
@@ -10,11 +10,10 @@
 /[Ll]ogs/
 /[Mm]emoryCaptures/
 /[Uu]ser[Ss]ettings/
+/[Tt]ests/
 
-Samples.meta
-Samples~.meta
-
-/[Dd]ocs~/output/
+/[Dd]ocs/output/
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/[Ww]indows/
 .DS_Store
 
 # Asset meta data should only be ignored when the corresponding asset is also ignored
@@ -64,4 +63,6 @@ sysinfo.txt
 
 # Crashlytics generated file
 crashlytics-build.properties
-
+Assets/AddressableAssetsData/Windows.meta
+Assets/AddressableAssetsData/link.xml
+Assets/AddressableAssetsData/link.xml.meta
diff --git a/.vsconfig b/.vsconfig
@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}
diff --git a/NewSamples.meta → Assets/2DRooms.meta b/NewSamples.meta → Assets/2DRooms.meta
diff --git a/Prefabs/Collectable.asset → Assets/2DRooms/Collectable2D.asset b/Prefabs/Collectable.asset → Assets/2DRooms/Collectable2D.asset
@@ -10,6 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d9d10b1a4c97b984e88c5a03496ee98a, type: 3}
-  m_Name: Collectable
+  m_Name: Collectable2D
   m_EditorClassIdentifier: 
-  _id: 2016096964
+  _editId: 0
+  _id: 1731410826
diff --git a/Prefabs/Collectable.asset.meta → Assets/2DRooms/Collectable2D.asset.meta b/Prefabs/Collectable.asset.meta → Assets/2DRooms/Collectable2D.asset.meta
diff --git a/Prefabs/DefaultCollectableGroup.asset → Assets/2DRooms/CollectableGroup2D.asset b/Prefabs/DefaultCollectableGroup.asset → Assets/2DRooms/CollectableGroup2D.asset
@@ -10,9 +10,9 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4149ce2c1e78c5946918af4a1d019eb2, type: 3}
-  m_Name: DefaultCollectableGroup
+  m_Name: CollectableGroup2D
   m_EditorClassIdentifier: 
-  _name: Default
+  _name: Collectable Group 2D
   _collectables:
-  - _collectable: {fileID: 11400000, guid: 56652bebc78c62f4c9bc0a7fd5f51c94, type: 2}
-    _quantity: 10
+  - _collectable: {fileID: 11400000, guid: 7ee12d58af84cf949a1327f8be2b4c22, type: 2}
+    _quantity: 8
diff --git a/Prefabs/DefaultCollectableGroup.asset.meta → Assets/2DRooms/CollectableGroup2D.asset.meta b/Prefabs/DefaultCollectableGroup.asset.meta → Assets/2DRooms/CollectableGroup2D.asset.meta
diff --git a/Prefabs/SavePoint.prefab → Assets/2DRooms/CollectableSpot2D.prefab b/Prefabs/SavePoint.prefab → Assets/2DRooms/CollectableSpot2D.prefab
@@ -1,116 +1,126 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &3312757205111967825
+--- !u!1 &107466498597800815
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3893523413539554156}
-  - component: {fileID: 1375439146387358390}
+  - component: {fileID: 4256615437459120315}
+  - component: {fileID: 3739054015503249019}
+  - component: {fileID: 8282728641796533203}
   m_Layer: 0
-  m_Name: SavePoint
+  m_Name: CollectableSpot2D
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3893523413539554156
+--- !u!4 &4256615437459120315
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3312757205111967825}
+  m_GameObject: {fileID: 107466498597800815}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7182570361962324706}
+  - {fileID: 6540787314756230747}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1375439146387358390
+--- !u!114 &3739054015503249019
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3312757205111967825}
+  m_GameObject: {fileID: 107466498597800815}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4a97d12ba5f9bfc42a1a96c0c8597418, type: 3}
+  m_Script: {fileID: 11500000, guid: 99390a133d16ac543b2646eacf59e1cf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   _autoAssignCell: 1
-  _cell: {fileID: 0}
-  _name: SavePoint
---- !u!1 &7531836234771559325
+  _cellIndex: {x: 0, y: 0}
+  _room: {fileID: 0}
+  _onInitialize:
+    m_PersistentCalls:
+      m_Calls: []
+  _editId: 0
+  _id: -1
+  _group: {fileID: 11400000, guid: 262a3f4b914e56e4b909fc781607e294, type: 2}
+  _weight: 1
+--- !u!114 &8282728641796533203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 107466498597800815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 384a7ca9bbb93e14ba056a172ba8f692, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &4794135016424930495
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7182570361962324706}
-  - component: {fileID: 3240065470735773177}
-  - component: {fileID: 538656597988202285}
-  - component: {fileID: 9210160454389162756}
+  - component: {fileID: 6540787314756230747}
+  - component: {fileID: 5044051659454575191}
   m_Layer: 0
-  m_Name: Sphere
+  m_Name: Sprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7182570361962324706
+--- !u!4 &6540787314756230747
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7531836234771559325}
+  m_GameObject: {fileID: 4794135016424930495}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.5}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3893523413539554156}
-  m_RootOrder: 0
+  m_Father: {fileID: 4256615437459120315}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3240065470735773177
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7531836234771559325}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &538656597988202285
-MeshRenderer:
+--- !u!212 &5044051659454575191
+SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7531836234771559325}
+  m_GameObject: {fileID: 4794135016424930495}
   m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
+  m_RayTracingMode: 0
   m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 2eb219ed7a4a2304c97e818c06a00445, type: 2}
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -123,25 +133,22 @@ MeshRenderer:
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
   m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
+  m_SelectedEditorRenderState: 0
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &9210160454389162756
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7531836234771559325}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
+  m_SortingOrder: 100
+  m_Sprite: {fileID: 200880072, guid: 80fd5c4f4ef1e8c4fac8df33ddc3f6cc, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
diff --git a/Prefabs/SavePoint.prefab.meta → Assets/2DRooms/CollectableSpot2D.prefab.meta b/Prefabs/SavePoint.prefab.meta → Assets/2DRooms/CollectableSpot2D.prefab.meta