-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Parameterized terrain generation, network settings, improved simulate…
…d movement
- Loading branch information
Showing
51 changed files
with
951 additions
and
267 deletions.
There are no files selected for viewing
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,24 @@ | ||
| %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: c8dc7565f1544ab096b804d358a1a4e4, type: 3} | ||
| m_Name: AbsoluteFlatDirtLayer 1 | ||
| m_EditorClassIdentifier: | ||
| layerType: 0 | ||
| layerName: Flat dirt base layer | ||
| index: 300 | ||
| blockType: 2 | ||
| frequency: 50 | ||
| exponent: 1 | ||
| minHeight: 1 | ||
| maxHeight: 1 | ||
| chance: 0 | ||
| structureType: 0 |
8 changes: 8 additions & 0 deletions
8
Assets/Config/TerrainLayers/AbsoluteFlatDirtLayer 1.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
| 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: 7b69780cebfd45bbb2739f006efc413f, type: 3} | ||
| m_Name: ConfigBank | ||
| m_EditorClassIdentifier: | ||
| configs: | ||
| - {fileID: 11400000, guid: bf78fd0d717835f4ebfb0ab97738fcc3, type: 2} | ||
| - {fileID: 11400000, guid: 3c9c4f78892f3d61ca2921df917af494, type: 2} |
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 |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: ac255652e50945d8a4e0ec00804a4230, type: 3} | ||
| m_Name: FlatTerrainLayers | ||
| m_EditorClassIdentifier: | ||
| configName: Flat | ||
| layers: | ||
| - {fileID: 11400000, guid: 04e8d21d759b887479e8717cf913597d, type: 2} | ||
| areaColumnHeight: 1 |
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
File renamed without changes.
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
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,101 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1 &3194879136077857405 | ||
| GameObject: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| serializedVersion: 6 | ||
| m_Component: | ||
| - component: {fileID: 5635330251713189791} | ||
| - component: {fileID: -4002439177456399829} | ||
| - component: {fileID: 7020423471914046309} | ||
| - component: {fileID: 5368163881853221015} | ||
| - component: {fileID: 6978896562413794302} | ||
| m_Layer: 0 | ||
| m_Name: TerrainConfiguration | ||
| m_TagString: Untagged | ||
| m_Icon: {fileID: 0} | ||
| m_NavMeshLayer: 0 | ||
| m_StaticEditorFlags: 0 | ||
| m_IsActive: 1 | ||
| --- !u!4 &5635330251713189791 | ||
| Transform: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 3194879136077857405} | ||
| serializedVersion: 2 | ||
| m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| m_LocalScale: {x: 1, y: 1, z: 1} | ||
| m_ConstrainProportionsScale: 0 | ||
| m_Children: [] | ||
| m_Father: {fileID: 0} | ||
| m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| --- !u!114 &-4002439177456399829 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 3194879136077857405} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: f67a4f72a6704fae9e46fe4aaa8b1eb4, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| --- !u!114 &7020423471914046309 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 3194879136077857405} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: c16549610bfe4458aa9389201d072bb6, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| --- !u!114 &5368163881853221015 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 3194879136077857405} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 7c79d771cedb4794bf100ce60df5f764, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| DefaultGhostMode: 0 | ||
| SupportedGhostModes: 3 | ||
| OptimizationMode: 1 | ||
| Importance: 1000 | ||
| prefabId: b5e6d2c9e04e20ca7afceb12dff6319c | ||
| HasOwner: 0 | ||
| SupportAutoCommandTarget: 1 | ||
| TrackInterpolationDelay: 0 | ||
| GhostGroup: 0 | ||
| UsePreSerialization: 0 | ||
| --- !u!114 &6978896562413794302 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 3194879136077857405} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: bfdaa6c06fe64fbda2b16e07a4ee0b25, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| ComponentOverrides: | ||
| - FullTypeName: Unity.Transforms.LocalTransform | ||
| EntityIndex: 0 | ||
| PrefabType: -1 | ||
| SendTypeOptimization: -1 | ||
| VariantHash: 10188360468653526834 |
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| using PolkaDOTS; | ||
| using PolkaDOTS.Networking; | ||
| using Unity.Entities; | ||
| using Unity.NetCode; | ||
| using Unity.Burst; | ||
|
|
||
|
|
||
| namespace Opencraft.Player | ||
| { | ||
| /// <summary> | ||
| /// System that detects terminated connections, and marks any players being controlled by that connection as no | ||
| /// longer in game. | ||
| /// </summary> | ||
| [BurstCompile] | ||
| [WorldSystemFilter(WorldSystemFilterFlags.ServerSimulation)] | ||
| [UpdateBefore(typeof(ConnectionMonitorSystem))] | ||
| public partial class HandleDisconnectSystem : SystemBase | ||
| { | ||
| private BeginSimulationEntityCommandBufferSystem m_CommandBufferSystem; | ||
|
|
||
| protected override void OnCreate() | ||
| { | ||
| // Use an entity command buffer that is resolved at the beginning of the simulation system group | ||
| m_CommandBufferSystem = World.GetOrCreateSystemManaged<BeginSimulationEntityCommandBufferSystem>(); | ||
| } | ||
|
|
||
| [BurstCompile] | ||
| protected override void OnUpdate() | ||
| { | ||
| var ecb = m_CommandBufferSystem.CreateCommandBuffer(); | ||
| foreach (var state in SystemAPI.Query<RefRO<ConnectionState>>().WithNone<NetworkStreamConnection>()) | ||
| { | ||
| foreach (var (owner, entity) in SystemAPI.Query<RefRW<GhostOwner>>().WithAll<PlayerInGame, PolkaDOTS.Player>().WithEntityAccess()) | ||
| { | ||
| if (state.ValueRO.NetworkId == owner.ValueRO.NetworkId) | ||
| { | ||
| ecb.SetComponentEnabled<PlayerInGame>(entity, false); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| //m_CommandBufferSystem.AddJobHandleForProducer(Dependency); | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.