Skip to content

Commit

Permalink
Restructuring Hub
Browse files Browse the repository at this point in the history
-Removing colliders from primitive structures
-Adding basic colliders to cover area blocked off by primitives
-Adding mesh combiner script that CAN be used to combine some meshes
  • Loading branch information
mvorsteg committed Aug 2, 2023
1 parent 323b03f commit 996e9be
Show file tree
Hide file tree
Showing 20 changed files with 53,155 additions and 4,701 deletions.
839 changes: 213 additions & 626 deletions Assets/Hub/Building/Prefabs/CeilingArea.prefab

Large diffs are not rendered by default.

42 changes: 0 additions & 42 deletions Assets/Hub/Building/Prefabs/Elevator.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 6773657126210556421}
- component: {fileID: 526341079013686736}
- component: {fileID: 1841699245973278403}
- component: {fileID: 5152856988387776325}
m_Layer: 0
m_Name: frame2
m_TagString: Untagged
Expand Down Expand Up @@ -82,19 +81,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &5152856988387776325
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2206617365747865258}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4361449889455830142
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -236,7 +222,6 @@ GameObject:
- component: {fileID: 6170055696274240384}
- component: {fileID: 8434962144650752637}
- component: {fileID: 8594271677758730860}
- component: {fileID: 105864761862858241}
m_Layer: 0
m_Name: frame3
m_TagString: Untagged
Expand Down Expand Up @@ -307,19 +292,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &105864761862858241
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6205504287473286762}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6283942748749266183
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -331,7 +303,6 @@ GameObject:
- component: {fileID: 5985294421054641158}
- component: {fileID: 597540237340883548}
- component: {fileID: 3947411703763935365}
- component: {fileID: 7667967629153453084}
m_Layer: 0
m_Name: frame1
m_TagString: Untagged
Expand Down Expand Up @@ -402,19 +373,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &7667967629153453084
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6283942748749266183}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7369057058508625226
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 996e9be

Please sign in to comment.