Skip to content

Commit

Permalink
Improve piping and atmospherics (#552)
Browse files Browse the repository at this point in the history
* Migrate pipe code to allow multiple pipes per tile

* Add layer selection to the atmos editor

* Further work on pipes

* Improve pipe gizmos

* Increase gizmos

* Add 4 layer manifold

* Improve manifolds

* Add three layer manifold

* Remove commented code

* Add scrubbers and vents

* Add internal mode to vent

* Add internal mode for the vent

* Implement gas filter

* Start on scrubber logic

* Add range to scrubber

* vent animation

* Implement scrubber further and add interactions

* Improve scrubber and vent

* Remove small amount of gas when going inactive

* Small scrubber fix

* change max mole transfer

* Improve gizmos

* Finally get these stupid gizmos to work...

* Fix gizmos and add stop animation

* Draw new gizmos for all settings and some cleanup

* Smooth the scrubber and vent animation
  • Loading branch information
henkhooft authored Sep 3, 2020
1 parent 0eec5c4 commit 04e1f12
Show file tree
Hide file tree
Showing 78 changed files with 3,297 additions and 202 deletions.
Binary file added Assets/Art/Models/Structures/Pipes/Scrubber.fbx
Binary file not shown.
102 changes: 102 additions & 0 deletions Assets/Art/Models/Structures/Pipes/Scrubber.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Art/Models/Structures/Pipes/Vent.fbx
Binary file not shown.
102 changes: 102 additions & 0 deletions Assets/Art/Models/Structures/Pipes/Vent.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: -4998431523760016775}
- component: {fileID: 840758331285195934}
- component: {fileID: 3397851465445616214}
- component: {fileID: 7512257876715568575}
m_Layer: 0
m_Name: Pipe - Under L2
m_TagString: Untagged
Expand Down Expand Up @@ -132,3 +133,17 @@ MonoBehaviour:
DisplayName: Atmospheric Pipe
Text:
MaxDistance: 0
--- !u!114 &7512257876715568575
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2802364579275783218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fb7ede8181b28b4082944d5e44dd86e, type: 3}
m_Name:
m_EditorClassIdentifier:
layer: 1
volume: 1
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2fb7ede8181b28b4082944d5e44dd86e, type: 3}
m_Name:
m_EditorClassIdentifier:
layer: 2
volume: 1
--- !u!114 &8044363620118605159
MonoBehaviour:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: -4998431523760016775}
- component: {fileID: 840758331285195934}
- component: {fileID: -4121827069175738176}
- component: {fileID: 7576599040857772993}
m_Layer: 0
m_Name: Pipe - Under L4
m_TagString: Untagged
Expand Down Expand Up @@ -132,3 +133,17 @@ MonoBehaviour:
DisplayName: Atmospheric Pipe
Text:
MaxDistance: 0
--- !u!114 &7576599040857772993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2802364579275783218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fb7ede8181b28b4082944d5e44dd86e, type: 3}
m_Name:
m_EditorClassIdentifier:
layer: 3
volume: 1
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ GameObject:
- component: {fileID: 5937939672719015625}
- component: {fileID: 4012921308355476879}
- component: {fileID: 8936394620877737717}
- component: {fileID: 6406515006924486677}
- component: {fileID: 7650047217586248362}
- component: {fileID: 8054511455686520210}
- component: {fileID: 5079598720285918506}
m_Layer: 0
m_Name: 3 Layer Manifold
m_TagString: Untagged
Expand Down Expand Up @@ -100,19 +100,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &6406515006924486677
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6937106039017095358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fb7ede8181b28b4082944d5e44dd86e, type: 3}
m_Name:
m_EditorClassIdentifier:
volume: 1
--- !u!64 &7650047217586248362
MeshCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -142,3 +129,18 @@ MonoBehaviour:
DisplayName: Atmospheric Pipe Layer Manifold
Text:
MaxDistance: 0
--- !u!114 &5079598720285918506
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6937106039017095358}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f2325e25557c9e9428c2f0d4a6e3a1b9, type: 3}
m_Name:
m_EditorClassIdentifier:
layer: 1
volume: 0.1
manifoldType: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%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: 4c19744d19c6b14409c8e0a535f90136, type: 3}
m_Name: 3LayerManifold
m_EditorClassIdentifier:
id: 3_layer_manifold
genericType: pipe
prefab: {fileID: 6937106039017095358, guid: 38905c1e96f82d8408d029a917a46a0f, type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ GameObject:
- component: {fileID: 2382204943904143396}
- component: {fileID: 4960790609789451106}
- component: {fileID: 1111533559529162776}
- component: {fileID: 3134510946630319864}
- component: {fileID: 1820275602808757319}
- component: {fileID: -3158576899531344565}
- component: {fileID: 5542861277348029082}
m_Layer: 0
m_Name: 4 Layer Manifold
m_TagString: Untagged
Expand Down Expand Up @@ -100,19 +100,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &3134510946630319864
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381773157775214163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fb7ede8181b28b4082944d5e44dd86e, type: 3}
m_Name:
m_EditorClassIdentifier:
volume: 1
--- !u!64 &1820275602808757319
MeshCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -142,3 +129,17 @@ MonoBehaviour:
DisplayName: Atmospheric Pipe Layer Manifold
Text:
MaxDistance: 0
--- !u!114 &5542861277348029082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381773157775214163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f2325e25557c9e9428c2f0d4a6e3a1b9, type: 3}
m_Name:
m_EditorClassIdentifier:
layer: 3
volume: 0.1
Loading

0 comments on commit 04e1f12

Please sign in to comment.