-
-
Notifications
You must be signed in to change notification settings - Fork 137
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.
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
Directionnal adjacencies #1303
Merged
cosmiccoincidence
merged 97 commits into
RE-SS3D:develop
from
stilnat:Directionnal-adjacencies
Nov 13, 2023
Merged
Directionnal adjacencies #1303
Changes from 93 commits
Commits
Show all changes
97 commits
Select commit
Hold shift + click to select a range
9374d29
readd some tilehelper methods
stilnat a2ed930
readd door
stilnat 98f6d2f
add simple adjacency
stilnat 373abd0
add advanced connector
stilnat 501afeb
rename door script
stilnat 633cb53
making door connections work
stilnat 0374581
remove wrong method
stilnat 2318831
change a bit setup of map
stilnat 8e3e3e4
add wall connector
stilnat f19395b
expand interface and implement
stilnat 554990b
fixed advanced adjacency
stilnat 2279463
Merge branch 'develop' into integrate-doors-properly
stilnat 7da9a5c
fix multiadjcon
stilnat 386696e
add abstract horizontal connector class
stilnat b786888
fix airlock generic type
stilnat f9f2f88
trying to fix edge case for wall connector
stilnat f8256d6
fix edge case wall, fix advancedAdjacency
stilnat d525f8b
fix pipes
stilnat 6db61b2
change pipe tile layers
stilnat 9a3bf00
fix generic and specific type editablke in editor (should not)
stilnat f0c7b55
some doc and some cleanup
stilnat 385a822
fixing disposal pipes
stilnat cc6ff5e
make disposal pipe connect to disposal stuff
stilnat 5422a11
remove multiple mesh on disposal pipe
stilnat 05d84dc
fix position
stilnat 65ff6e9
fix some stuff for disposal
stilnat c430ba7
Partly make dinnerbooth work
stilnat 5351fca
no more than 2 connections for couches
stilnat 4982156
simplify Lin Lout rotation computation
stilnat 686e0f0
add some more helpers
stilnat 7f293b2
add list extension
stilnat 879674d
solve some direction resolving for directionnals
stilnat 2ce4a89
add atdirectionof method
stilnat 848c128
use neighbour instead of neighbour directions
stilnat fe700c0
same
stilnat b65681a
paradigm changes
stilnat 5f07e7c
little comment
stilnat 6596d63
huge refactor
stilnat 837b46e
some fix and update neighbours if itself get updated
stilnat c9723ac
add connection number
stilnat f878795
add condition for u shapes
stilnat 3f955cf
remove conditions and keep only neighbours with lt 2 connections
stilnat 67bad3b
add diagonal directions for lin lout
stilnat 4c1ba31
update comments
stilnat 8de3558
fixing more adjacencies
stilnat bb9b20a
add some helper method
stilnat 9d786d9
almost there
stilnat 6812760
works completely !
stilnat bea077f
everything works for real this time
stilnat 8d53afd
some refactoring and clean up and doc
stilnat d32abc4
add disposal furniture connector
stilnat 06b8708
little stuff for adjacencymap
stilnat 9422baa
method for PlacedTileObject
stilnat 0c788c9
updating IAdjacencyConnector and all that depends on it
stilnat 26dacb3
adding the disposal connector scripts to prefabs
stilnat 41b7ff3
add world origin for placed tile object.
stilnat c2792c7
update neighbour if itself is updated
stilnat ee2cf6c
make disposal pipe work
stilnat 79ef959
remove random using
stilnat 3a56f32
fix disposal pipes
stilnat b8fcf52
remove neighbour objects parameter from updateAllConnections
stilnat 6c2ba53
doc on the interface
stilnat 838f3bb
clean doc
stilnat caf3bc2
Merge branch 'develop' into integrate-doors-properly
stilnat 700b8c6
put back the right disposal pipes file
stilnat 11cc540
complete doc
stilnat ab131dc
update disposal pipes generic type
stilnat b7af0db
Merge branch 'develop' into integrate-doors-properly
stilnat 68a3caa
adapt code to multiple tile objects
stilnat f7d06e4
remove multi adjacency update some prefabs
stilnat d9f33f8
fix missing scripts
stilnat 178bb63
fix build
stilnat 76812b9
added x6 from steelwall for steelwall reinforced
stilnat b9d183b
fix plenum ?
stilnat 8f1825b
fix indentation
stilnat 5113da9
fix X6 for reinforced steel windows
stilnat 7b3a504
changed material of disposal pipes
stilnat 2f82921
Revert "fix indentation"
stilnat 3e432e8
Merge branch 'develop' into integrate-doors-properly
stilnat 1f47813
fix indentation
stilnat 47f79cc
Merge branch 'develop' into Directionnal-adjacencies
stilnat df31ad1
Merge branch 'integrate-doors-properly' into Directionnal-adjacencies
stilnat ed4fa83
fix errors introduced by merge
stilnat d8a3058
update doc
stilnat 0ec63d2
Merge branch 'develop' into Directionnal-adjacencies
stilnat 0672581
applied palette on dinerbooth fbx
stilnat 6e9eb9e
updated dinnerbooth asset
stilnat b2b2e1d
remove test scene
stilnat 7d48b30
add working client
stilnat ee8fc50
Merge branch 'develop' into Directionnal-adjacencies
stilnat 827485a
Merge branch 'develop' into Directionnal-adjacencies
stilnat 2b1badb
Merge branch 'develop' into Directionnal-adjacencies
stilnat 3ba1198
fix diagonal directionnals not working
stilnat 53be5a5
do some clean up
stilnat 62dc2d7
update doc
stilnat bae4aa7
rename with a single n
stilnat 89afc40
remove shadows and add collider
stilnat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
111 changes: 111 additions & 0 deletions
111
Assets/Art/Models/Furniture/Generic/Seats/DinerBooth.fbx.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!114 &11400000 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 0} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} | ||
| m_Name: DinnerBooth | ||
| m_EditorClassIdentifier: | ||
| nameString: DinnerBooth | ||
| prefab: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} | ||
| icon: {fileID: 0} | ||
| layer: 7 | ||
| genericType: 5 | ||
| specificType: 0 | ||
| width: 1 | ||
| height: 1 |
8 changes: 8 additions & 0 deletions
8
Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 142 additions & 0 deletions
142
Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1 &8085678556641831659 | ||
| GameObject: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| serializedVersion: 6 | ||
| m_Component: | ||
| - component: {fileID: 1750478436839435592} | ||
| - component: {fileID: 7418334817260183665} | ||
| - component: {fileID: 1740478804813226977} | ||
| - component: {fileID: 7950383285113202337} | ||
| - component: {fileID: 8031370004641457100} | ||
| m_Layer: 0 | ||
| m_Name: DinnerBooth | ||
| m_TagString: Untagged | ||
| m_Icon: {fileID: 0} | ||
| m_NavMeshLayer: 0 | ||
| m_StaticEditorFlags: 0 | ||
| m_IsActive: 1 | ||
| --- !u!4 &1750478436839435592 | ||
| Transform: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| m_LocalPosition: {x: 9.950995, y: 0.52496845, z: 0.5001033} | ||
| m_LocalScale: {x: 1, y: 1, z: 1} | ||
| m_ConstrainProportionsScale: 0 | ||
| m_Children: [] | ||
| m_Father: {fileID: 0} | ||
| m_RootOrder: 0 | ||
| m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| --- !u!33 &7418334817260183665 | ||
| MeshFilter: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Mesh: {fileID: 559316708432223863, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| --- !u!23 &1740478804813226977 | ||
| MeshRenderer: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_CastShadows: 1 | ||
| m_ReceiveShadows: 1 | ||
| m_DynamicOccludee: 1 | ||
| m_StaticShadowCaster: 0 | ||
| m_MotionVectors: 1 | ||
| m_LightProbeUsage: 1 | ||
| m_ReflectionProbeUsage: 1 | ||
| m_RayTracingMode: 2 | ||
| m_RayTraceProcedural: 0 | ||
| m_RenderingLayerMask: 1 | ||
| m_RendererPriority: 0 | ||
| m_Materials: | ||
| - {fileID: 2100000, guid: 695c4de41b9578049a93f19b1eef7213, type: 2} | ||
| m_StaticBatchInfo: | ||
| firstSubMesh: 0 | ||
| subMeshCount: 0 | ||
| m_StaticBatchRoot: {fileID: 0} | ||
| m_ProbeAnchor: {fileID: 0} | ||
| m_LightProbeVolumeOverride: {fileID: 0} | ||
| m_ScaleInLightmap: 1 | ||
| m_ReceiveGI: 1 | ||
| m_PreserveUVs: 0 | ||
| m_IgnoreNormalsForChartDetection: 0 | ||
| m_ImportantGI: 0 | ||
| m_StitchLightmapSeams: 1 | ||
| m_SelectedEditorRenderState: 3 | ||
| 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!114 &7950383285113202337 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 479fbe67c0de04b449f924bc5462ede3, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| _componentIndexCache: 0 | ||
| _addedNetworkObject: {fileID: 8031370004641457100} | ||
| _networkObjectCache: {fileID: 8031370004641457100} | ||
| AdjacencyResolver: | ||
| o: {fileID: 559316708432223863, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| uLeft: {fileID: -8315600635035084004, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| uRight: {fileID: -8218306467633424491, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| i: {fileID: -2434755278463371002, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| lIn: {fileID: -8550456321050019914, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| lOut: {fileID: -819412828331094011, guid: bcf01b0847ef6d843ae7613281a81df1, type: 3} | ||
| --- !u!114 &8031370004641457100 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8085678556641831659} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| <IsNested>k__BackingField: 0 | ||
| <ComponentIndex>k__BackingField: 0 | ||
| <PredictedSpawn>k__BackingField: {fileID: 0} | ||
| _networkBehaviours: | ||
| - {fileID: 7950383285113202337} | ||
| <ParentNetworkObject>k__BackingField: {fileID: 0} | ||
| <ChildNetworkObjects>k__BackingField: [] | ||
| SerializedTransformProperties: | ||
| Position: {x: 9.950995, y: 0.52496845, z: 0.5001033} | ||
| Rotation: {x: 0, y: 0, z: 0, w: 1} | ||
| LocalScale: {x: 1, y: 1, z: 1} | ||
| _isNetworked: 1 | ||
| _isGlobal: 0 | ||
| _initializeOrder: 0 | ||
| _defaultDespawnType: 0 | ||
| NetworkObserver: {fileID: 0} | ||
| <PrefabId>k__BackingField: 0 | ||
| <SpawnableCollectionId>k__BackingField: 0 | ||
| _scenePathHash: 0 | ||
| <SceneId>k__BackingField: 0 | ||
| <AssetPathHash>k__BackingField: 3148903556074791268 | ||
7 changes: 7 additions & 0 deletions
7
Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,5 +38,10 @@ public enum AdjacencyShape | |
| TSouthWestEast, | ||
| //Vertical | ||
| Vertical, | ||
| // Directional | ||
| LIn, | ||
| LOut, | ||
| ULeft, | ||
| URight, | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.