Skip to content

fix: Global rendering fixes #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Thomlam merged 6 commits into from
Oct 27, 2024
Merged

fix: Global rendering fixes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adb99bf
fix: Update corridor displays + additions of colliders to avoid glitc…
AyakorK Oct 27, 2024
d0c3d0e
fix: Add a door transition lock
AyakorK Oct 27, 2024
d854bc7
feat: Add collision to the walls in the room
AyakorK Oct 27, 2024
72f19fd
fix: Fix collisions of the hole
AyakorK Oct 27, 2024
37cfe42
fix: Fix glitched hitboxes
AyakorK Oct 27, 2024
b970968
fix: Destory arrows when going to an other room
AyakorK Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 203 additions & 21 deletions Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 9, z: 0}
second:
serializedVersion: 2
m_TileIndex: 16
m_TileSpriteIndex: 17
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 4, y: 9, z: 0}
second:
serializedVersion: 2
Expand Down Expand Up @@ -208,8 +198,8 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 60cbf27344bd3fe48bc9ae68477794b8, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 6
m_Data: {fileID: 11400000, guid: 75b0240c1f3808e4abf908e466dd5efc, type: 2}
m_TileSpriteArray:
Expand Down Expand Up @@ -247,10 +237,10 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 6
m_Data: {fileID: 1081869314, guid: 80736b4b310b5c7499649999bfd03add, type: 3}
- m_RefCount: 1
m_Data: {fileID: 702271426, guid: 80736b4b310b5c7499649999bfd03add, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
- m_RefCount: 7
- m_RefCount: 6
m_Data:
e00: 1
e01: 0
Expand All @@ -269,7 +259,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 7
- m_RefCount: 6
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
Expand Down Expand Up @@ -333,8 +323,8 @@ TilemapRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -365692393
m_SortingLayer: 1
m_SortingLayerID: -1234118259
m_SortingLayer: 2
m_SortingOrder: 2
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -653,6 +643,10 @@ GameObject:
- component: {fileID: 9040346777258161643}
- component: {fileID: 3679327291748454262}
- component: {fileID: 6821910620919403267}
- component: {fileID: 4961666462818913969}
- component: {fileID: 7872246779378419752}
- component: {fileID: 5883328970668218702}
- component: {fileID: 9041205108107242711}
m_Layer: 0
m_Name: Walls
m_TagString: Wall
Expand Down Expand Up @@ -1285,8 +1279,8 @@ TilemapRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1791178601
m_SortingLayer: 4
m_SortingLayerID: -1234118259
m_SortingLayer: 2
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1332,6 +1326,186 @@ TilemapCollider2D:
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0
m_UseDelaunayMesh: 0
--- !u!61 &4961666462818913969
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6168419598805709018}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -2.5, y: 4.5}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5, y: 14}
m_EdgeRadius: 0
--- !u!61 &7872246779378419752
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6168419598805709018}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 9.5, y: 4.5}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5, y: 14}
m_EdgeRadius: 0
--- !u!61 &5883328970668218702
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6168419598805709018}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 3.5, y: -2}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 9, y: 4}
m_EdgeRadius: 0
--- !u!61 &9041205108107242711
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6168419598805709018}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 3.5, y: 12}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 9, y: 4}
m_EdgeRadius: 0
Comment on lines +1329 to +1508
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Oct 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Optimiser les colliders en utilisant un CompositeCollider2D

Au lieu d'ajouter plusieurs BoxCollider2D au même GameObject, envisagez d'utiliser un CompositeCollider2D. Cela permettra de combiner les colliders en une seule forme, améliorant ainsi les performances et la maintenabilité du code.

--- !u!1 &6369746937129949933
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2241,6 +2415,14 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3022020511561805294}
m_Modifications:
- target: {fileID: 1831068373782692773, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3}
propertyPath: m_SortingLayer
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1831068373782692773, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3}
propertyPath: m_SortingLayerID
value: -1234118259
objectReference: {fileID: 0}
- target: {fileID: 3423160260848129340, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3}
propertyPath: newRoomPrefab
value:
Expand Down Expand Up @@ -2295,7 +2477,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8481200938870355337, guid: 7c74a234ff40ec9449b23765de7189b9, type: 3}
propertyPath: m_TagString
value: Untagged
value: Door
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down
Loading