Skip to content
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

Feat/gpu instancing/roads indirect #3165

Closed
wants to merge 17 commits into from
Closed

Feat/gpu instancing/roads indirect #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9518465
add scripts
popuz Jan 20, 2025
f8454d5
assign data monoBehaviour to prefabs
popuz Jan 20, 2025
5f25777
shader channge
popuz Jan 20, 2025
2ac5a06
swap Unity standard shader to DCL/Scene in some MeshRenderers
popuz Jan 20, 2025
351c068
small clean-up
popuz Jan 20, 2025
9d52656
wip on Roads debug (only one instance rendered)
popuz Jan 20, 2025
4fd7070
wip on fixing roads layout
popuz Jan 20, 2025
909f7d4
fixed roads layout 🟢
popuz Jan 20, 2025
a7b3da5
Modified the Scene Shader for Per Instance Buffer
GBirch33 Jan 16, 2025
20e006f
extracted instancing to a Service
popuz Jan 20, 2025
d0b8125
fixed fountain being disabled
popuz Jan 21, 2025
d99fa62
finally fixed offset issue with matrices collection
popuz Jan 21, 2025
31d0fb4
collection of matrices on road prefab basis
popuz Jan 22, 2025
e33318d
full Roads Layout instancing data collection into RoadConfig
popuz Jan 22, 2025
abdb831
batches optimization
popuz Jan 22, 2025
a9ecd23
scene clean-up
popuz Jan 22, 2025
3749bcc
adjusted PerInstance map to match Indirect shader
popuz Jan 23, 2025
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
3 changes: 2 additions & 1 deletion Explorer/Assets/DCL/Roads/DCL.Roads.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"references": [
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:9e24947de15b9834991c9d8411ea37cf"
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:84651a3751eca9349aac36a66bba901b"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Corner_0.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6440150890663514947}
- component: {fileID: -3050293953787146782}
m_Layer: 0
m_Name: Corner_0
m_TagString: Untagged
Expand All @@ -64,6 +65,21 @@ Transform:
- {fileID: 2903636937266556486}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3050293953787146782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041678399592302828}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &6907255391070348972
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Corner_A.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5136586154982074077}
- component: {fileID: 7889939065100972625}
m_Layer: 0
m_Name: Corner_A
m_TagString: Untagged
Expand All @@ -98,6 +99,21 @@ Transform:
- {fileID: 6672601111736859163}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7889939065100972625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4164420976981478098}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1001 &4166536358434357706
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Corner_B.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 565536397885786969}
- component: {fileID: -6855693551115979158}
m_Layer: 0
m_Name: Corner_B
m_TagString: Untagged
Expand All @@ -98,6 +99,21 @@ Transform:
- {fileID: 330439183587803024}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-6855693551115979158
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7291628814181324542}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1001 &5810266302359712198
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Corner_C.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4510835287947887023}
- component: {fileID: 3463580500437864801}
m_Layer: 0
m_Name: Corner_C
m_TagString: Untagged
Expand All @@ -64,6 +65,21 @@ Transform:
- {fileID: 3315466359099605778}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3463580500437864801
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8254747105106238315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &9082414149019158573
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Corner_D.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 776309100159872635}
- component: {fileID: -7438395634968403335}
m_Layer: 0
m_Name: Corner_D
m_TagString: Untagged
Expand All @@ -32,6 +33,21 @@ Transform:
- {fileID: 4624589554074490817}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-7438395634968403335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1094293652796049500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &8180920719214761154
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Crossroads_0.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6581700148817771512}
- component: {fileID: 6789490919386125816}
m_Layer: 0
m_Name: Crossroads_0
m_TagString: Untagged
Expand All @@ -64,6 +65,21 @@ Transform:
- {fileID: 2001548707764443314}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6789490919386125816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3484431227248238708}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &4505348893820414906
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Crossroads_00.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 665413209195246219}
- component: {fileID: -6258933035522267983}
m_Layer: 0
m_Name: Crossroads_00
m_TagString: Untagged
Expand All @@ -65,6 +66,21 @@ Transform:
- {fileID: 7439529389721046028}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-6258933035522267983
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6900689515745376657}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &7321193561568709749
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Crossroads_A.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8765381493019287729}
- component: {fileID: -5513794536797016255}
m_Layer: 0
m_Name: Crossroads_A
m_TagString: Untagged
Expand All @@ -32,6 +33,21 @@ Transform:
- {fileID: 2108134533306466068}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-5513794536797016255
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2877811544905806271}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &6385097290424826319
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/Crossroads_C.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3064401601711283838}
- component: {fileID: -1817531525731358306}
m_Layer: 0
m_Name: Crossroads_C
m_TagString: Untagged
Expand All @@ -32,6 +33,21 @@ Transform:
- {fileID: 5188202175510969090}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-1817531525731358306
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410590488054678628}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &6730082838768189721
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/DeadEnd_0.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9180813775253343479}
- component: {fileID: -8017937278801849956}
m_Layer: 0
m_Name: DeadEnd_0
m_TagString: Untagged
Expand All @@ -64,6 +65,21 @@ Transform:
- {fileID: 2238086286035470076}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-8017937278801849956
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8602209338358536449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &8723299826916119946
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/DeadEnd_A.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5233686229829927346}
- component: {fileID: 4677780365293587933}
m_Layer: 0
m_Name: DeadEnd_A
m_TagString: Untagged
Expand All @@ -32,6 +33,21 @@ Transform:
- {fileID: 8787409447878338104}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4677780365293587933
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 108353055667934767}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &1254340000971511155
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/DeadEnd_C.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6462727477412694801}
- component: {fileID: -508191165912973958}
m_Layer: 0
m_Name: DeadEnd_C
m_TagString: Untagged
Expand All @@ -100,6 +101,21 @@ Transform:
- {fileID: 5024027450065642368}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-508191165912973958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5453666885138851512}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1001 &3641974035382158614
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
16 changes: 16 additions & 0 deletions Explorer/Assets/DCL/Roads/Data/RoadAssets/DeadEnd_E.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3235089088588010897}
- component: {fileID: -7880135222108810313}
m_Layer: 0
m_Name: DeadEnd_E
m_TagString: Untagged
Expand All @@ -32,6 +33,21 @@ Transform:
- {fileID: 892825230240685654}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-7880135222108810313
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1564496547667286571}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2a93533cfb4b48c5866cdd42852bb92c, type: 3}
m_Name:
m_EditorClassIdentifier:
PrefabInstance:
Meshes: []
LODGroups: []
--- !u!1 &4218487497617500724
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading
Loading