Bigger Sectors & Various Bugfixes

Minimap works again
Stardust density is now proportional to gravity depth
Generated zones are double the size and better distributed
Orbital hierarchy actually working now (!)
Station start position actually orbits something now
Max gravity strength remapped to infinity (zone boundary is properly impassable now)
This commit is contained in:
Reinier Vens 2020-12-23 22:38:30 +00:00
commit 9e88fcda95
21 changed files with 245 additions and 214 deletions

View file

@ -563,6 +563,7 @@
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\OrientedHubSegment.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Layout\LargeGraphLayout\DeviceIndependedZoomCalculatorForNodes.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\ScanSegmentTree.cs" />
<Compile Include="Assets\UnityHelpers.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\ProximityOverlapRemoval\OverlapRemovalMethod.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Incremental\MinSeparationConstraint.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Core\Layout\CurvePort.cs" />
@ -685,7 +686,6 @@
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Rectilinear\BasicReflectionEvent.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Layout\Layered\IntEdge.cs" />
<Compile Include="Assets\Scripts\NIH\MSAGL\Routing\Spline\Bundling\PointPairOrder.cs" />
<Compile Include="Assets\UnityHelpers.cs" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\Shaders\Clouds.shader" />

View file

@ -58,7 +58,7 @@ Material:
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _Depth: 1
- _Depth: 0.33
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Frequency: 6.2832
@ -78,6 +78,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.1764706, g: 0.31764707, b: 0.1254902, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -68,7 +68,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Power: 8
- _Power: 16
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1

View file

@ -43,7 +43,7 @@ Material:
- _AlphaFloor: 0
- _DepthBlend: 512
- _DepthCeiling: 4096
- _Gamma: 0.3
- _Gamma: 0.45
- _GridCeilingBlend: -300
- _GridCeilingDensity: 0.01
- _GridCeilingFollow: 0
@ -61,5 +61,5 @@ Material:
- _StepExponent: 2
- _TintExponent: 4
m_Colors:
- _Tint: {r: 0.319, g: 0.319, b: 0.319, a: 1}
- _Tint: {r: 0.75, g: 0.75, b: 0.75, a: 1}
m_BuildTextureStacks: []

View file

@ -85,6 +85,6 @@ Material:
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.015686275, g: 0.015686275, b: 0.015686275, a: 1}
- _Color: {r: 1.0039216, g: 1.0039216, b: 1.0039216, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Map Gravity Lines
m_Shader: {fileID: 4800000, guid: f5505d3747493e24c91b7cb141fd7b8c, type: 3}
m_ShaderKeywords:
m_ShaderKeywords: SCREEN_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -69,7 +69,7 @@ Material:
- _ColorMask: 15
- _Cutoff: 0.5
- _DangerSteepness: 0.35
- _DepthRange: 280
- _DepthRange: 500
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
@ -82,7 +82,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Scale: 12.885553
- _Scale: 6.1097183
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
@ -94,6 +94,7 @@ Material:
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseScreenSpace: 1
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:

View file

@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Minimap Gravity Lines
m_Shader: {fileID: 4800000, guid: f5505d3747493e24c91b7cb141fd7b8c, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailTex:
m_Texture: {fileID: 8400000, guid: ed3d896ce7cb4a84aa4de8515a60f59c, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 8400000, guid: ed3d896ce7cb4a84aa4de8515a60f59c, type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Angle2Fade: 1.1
- _Angle2Width: 0.5
- _AngleFade: 1.15
- _AngleWidth: 0.05
- _BumpScale: 1
- _ClipDistance: 1000
- _ColorMask: 15
- _Cutoff: 0.5
- _DangerSteepness: 1.5
- _DepthRange: 500
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _HeightRange: 50
- _LineFade: 5
- _LineWidth: 0.15
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Scale: 10
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartDepth: 420
- _StartHeight: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseScreenSpace: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _AngleColor: {r: 1.4980392, g: 0, b: 1.2705883, a: 0.5019608}
- _Color: {r: 0, g: 0.4, b: 0.6, a: 1}
- _DangerColor: {r: 2.670157, g: 0.22367807, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a92fc6d958edb9f46b6e58134f609cc0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -13,8 +13,8 @@ RenderTexture:
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 256
m_Height: 256
m_Width: 128
m_Height: 128
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 0

BIN
Assets/Resources/Settings.asset (Stored with Git LFS)

Binary file not shown.

View file

@ -1540,7 +1540,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &346000247
RectTransform:
m_ObjectHideFlags: 0
@ -2124,6 +2124,78 @@ MonoBehaviour:
CopyRotation: 0
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!1 &496438310
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 496438311}
- component: {fileID: 496438313}
- component: {fileID: 496438312}
m_Layer: 5
m_Name: Icons
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &496438311
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 496438310}
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_Children: []
m_Father: {fileID: 2352149241280877834}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &496438312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 496438310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 1cb3b89320b91bf4986d2333eebadbbd, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 8400000, guid: 7f2cc6f8dbb93cd40b3a72c55d17c971, type: 2}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &496438313
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 496438310}
m_CullTransparentMesh: 0
--- !u!1 &507065481
GameObject:
m_ObjectHideFlags: 0
@ -4666,7 +4738,7 @@ MonoBehaviour:
CopyXPosition: 1
CopyYPosition: 0
CopyZPosition: 1
CopyRotation: 1
CopyRotation: 0
PixelSnapCamera: {fileID: 0}
PixelSnapIncrement: 1
--- !u!1 &1009503727
@ -4989,10 +5061,10 @@ MonoBehaviour:
Speed: 0.125
MinimumSize: 0.5
MaximumSize: 3
Spacing: 8
Ceiling: -300
Spacing: 16
Ceiling: -400
Floor: 5
HeightExponent: 32
HeightExponent: 10000
Heightmap: {fileID: 8400000, guid: 2fc21a9d3e9647948b56e384cd9378b3, type: 2}
ParticleColors: {fileID: 2800000, guid: 56db63da398b2d04394ddbccedce943c, type: 3}
GravityCamera: {fileID: 1537342003}
@ -7115,102 +7187,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1593845000}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1646066147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1646066151}
- component: {fileID: 1646066150}
- component: {fileID: 1646066148}
- component: {fileID: 1646066149}
m_Layer: 0
m_Name: Quad
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!23 &1646066148
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646066147}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
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!64 &1646066149
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646066147}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!33 &1646066150
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646066147}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1646066151
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1646066147}
m_LocalRotation: {x: -0, y: -0.9839266, z: -0, w: -0.17857356}
m_LocalPosition: {x: 49.3, y: 0, z: 16}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: -200.573, z: 0}
--- !u!1 &1647230681
GameObject:
m_ObjectHideFlags: 0
@ -9891,85 +9867,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 560317486090564712}
m_CullTransparentMesh: 0
--- !u!1001 &1426725682743115580
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalPosition.x
value: 45.8
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.4
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalPosition.z
value: 15.7
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 434691370613433342, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4210795439511044087, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: ShapeModule.m_MeshRenderer
value:
objectReference: {fileID: 1646066148}
- target: {fileID: 7847908271862099961, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_Name
value: Thruster 1
objectReference: {fileID: 0}
- target: {fileID: 7847908271862099961, guid: 016516404b2bc1649bdf789bfc96d1cb,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 016516404b2bc1649bdf789bfc96d1cb, type: 3}
--- !u!1001 &1719766129265659974
PrefabInstance:
m_ObjectHideFlags: 0
@ -10920,7 +10817,7 @@ RectTransform:
- {fileID: 2352149241950064198}
- {fileID: 2352149240859250049}
m_Father: {fileID: 2352149241280877834}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -11361,7 +11258,7 @@ RectTransform:
- {fileID: 2352149241923245455}
- {fileID: 2352149240139726782}
m_Father: {fileID: 2352149241280877834}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -11602,7 +11499,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2352149241280877834}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -12423,6 +12320,7 @@ RectTransform:
m_Children:
- {fileID: 2352149240818267995}
- {fileID: 2352149241570183590}
- {fileID: 496438311}
- {fileID: 2352149240782116564}
- {fileID: 2352149240622546024}
- {fileID: 2352149240130501729}
@ -12534,7 +12432,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 1cb3b89320b91bf4986d2333eebadbbd, type: 2}
m_Material: {fileID: 2100000, guid: a92fc6d958edb9f46b6e58134f609cc0, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@ -12542,7 +12440,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 8400000, guid: 7f2cc6f8dbb93cd40b3a72c55d17c971, type: 2}
m_Texture: {fileID: 2800000, guid: d4144ee6db2bf3c468cc5010acfe8974, type: 3}
m_UVRect:
serializedVersion: 2
x: 0

View file

@ -138,10 +138,10 @@ public class ActionGameManager : MonoBehaviour
var stationType = ItemData.GetAll<HullData>().First(x=>x.HullType==HullType.Station);
var stationHull = ItemManager.CreateInstance(stationType, 0, 1) as EquippableItem;
var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(2);
var stationParent = Zone.PlanetInstances.Values.OrderByDescending(p => p.BodyData.Mass.Value).ElementAt(3);
var parentOrbit = stationParent.Orbit.Data.ID;
var stationPos = Zone.GetOrbitPosition(parentOrbit) +
normalize(ItemManager.Random.NextFloat2() - float2(.5f, .5f)) * ItemManager.Random.NextFloat() * stationParent.GravityWellRadius.Value * .75f;
var parentPos = Zone.GetOrbitPosition(parentOrbit);
var stationPos = parentPos + ItemManager.Random.NextFloat2Direction() * stationParent.GravityWellRadius.Value * .1f;
var stationOrbit = Zone.CreateOrbit(parentOrbit, stationPos);
var station = new OrbitalEntity(ItemManager, Zone, stationHull, stationOrbit.ID);
Zone.Entities.Add(station);

View file

@ -376,7 +376,12 @@ public class SectorRenderer : MonoBehaviour
ship.Value.Transform.position = new Vector3(ship.Key.Position.x,h + hullData.GridOffset,ship.Key.Position.y);
var normal = _zone.GetNormal(ship.Key.Position);
var f = new float2(normal.x, normal.z);
ship.Key.Velocity += f * Settings.PlanetSettings.GravityStrength;// * lengthsq(f);
var fl = lengthsq(f);
if(fl > .001)
{
var fa = 1 / (1 - fl) - 1;
ship.Key.Velocity += normalize(f) * Settings.PlanetSettings.GravityStrength * fa;
}
//Debug.Log($"Normal: {normal}");
var shipRight = ship.Key.Direction.Rotate(ItemRotation.Clockwise);
var forward = Vector3.Cross(new Vector3(shipRight.x,0,shipRight.y), normal);

View file

@ -203,6 +203,9 @@ public abstract class ItemData : DatabaseEntry, INamedEntry
[InspectableField, JsonProperty("specificHeat"), Key(5)]
public float SpecificHeat;
// [InspectableField, JsonProperty("conductivity"), Key(6)]
// public float Conductivity;
[IgnoreMember] public string EntryName
{
get => Name;

View file

@ -69,7 +69,7 @@ public class Zone
return new ZonePack
{
Data = Data,
Entities = Entities.ToList(),
//Entities = Entities.ToList(),
Orbits = Orbits.Values.Select(o=>o.Data).ToList(),
Planets = Planets.Values.ToList()
};
@ -126,8 +126,8 @@ public class Zone
}
}
Orbits[orbitID].Position = GetOrbitPosition(orbit.Data.Parent) + pos;
_updatedOrbits.Add(orbitID);
return GetOrbitPosition(orbit.Data.Parent) + pos;
}
return Orbits[orbitID].Position;
@ -219,6 +219,7 @@ public class Zone
var orbit = new OrbitData
{
ID = Guid.NewGuid(),
Distance = new ReactiveProperty<float>(distance),
Parent = parent,
Phase = storedPhase

View file

@ -130,7 +130,7 @@ public abstract class BodyData : DatabaseEntry, INamedEntry
public ReactiveProperty<float> GravityDepthMultiplier = new ReactiveProperty<float>(1);
[JsonProperty("depthExp")] [Key(8)]
public ReactiveProperty<float> GravityDepthExponent = new ReactiveProperty<float>(8);
public ReactiveProperty<float> GravityDepthExponent = new ReactiveProperty<float>(16);
[IgnoreMember] public string EntryName
{

View file

@ -262,8 +262,8 @@ public class ZoneGenerator
root.ExpandSolar(
ref random,
count: random.NextInt(5, 15),
massMulMin: 0.5f,
massMulMax: 2.0f,
massMulMin: 0.75f,
massMulMax: 2.5f,
distMulMin: 1.1f,
distMulMax: 1.25f,
jupiterJump: random.NextFloat() * random.NextFloat() * 10 + 1,

View file

@ -127,6 +127,6 @@ void UpdateParticles(uint3 id : SV_DispatchThreadID, int3 groupID : SV_GroupThre
y * spacing + yt * spacing + perlinNoise1D(RandomValue()*1024+time)*spacing);
float2 puv = float2(.5,.5) - (particles[id.x].position.xz - transform.xy) / (transform.z);
float gravDepth = Heightmap.SampleLevel(samplerHeightmap, puv, 0.0f).r;
particles[id.x].position.y = lerp(-gravDepth + floorHeight, ceilingHeight, pow(RandomValue(), heightExponent)) + perlinNoise1D(RandomValue()*1024+time)*spacing/2;
particles[id.x].position.y = lerp(-gravDepth + floorHeight, ceilingHeight, pow(RandomValue(), heightExponent/(ceilingHeight+gravDepth))) + perlinNoise1D(RandomValue()*1024+time)*spacing/2;
particles[id.x].size = lerp(minimumSize, maximumSize, RandomValue());
}

View file

@ -31,6 +31,7 @@ Shader "UI/Isolines"
_ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
[Toggle(SCREEN_SPACE)] _UseScreenSpace ("Screen Space Detail Texture", Float) = 0
}
SubShader
@ -63,7 +64,7 @@ Shader "UI/Isolines"
Pass
{
Name "Default"
CGPROGRAM
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
@ -73,6 +74,7 @@ Shader "UI/Isolines"
#pragma multi_compile_local _ UNITY_UI_CLIP_RECT
#pragma multi_compile_local _ UNITY_UI_ALPHACLIP
#pragma shader_feature SCREEN_SPACE
struct appdata_t
{
@ -87,8 +89,9 @@ Shader "UI/Isolines"
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
float4 screenPos : TEXCOORD2;
#ifdef SCREEN_SPACE
float4 screenPos : TEXCOORD1;
#endif
//float2 detailtexcoord : TEXCOORD2;
UNITY_VERTEX_OUTPUT_STEREO
};
@ -119,11 +122,13 @@ Shader "UI/Isolines"
v2f OUT;
UNITY_SETUP_INSTANCE_ID(v);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.worldPosition = v.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
OUT.vertex = UnityObjectToClipPos(v.vertex);
OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
#ifdef SCREEN_SPACE
OUT.screenPos = ComputeScreenPos( OUT.vertex );
#endif
//OUT.detailtexcoord = TRANSFORM_TEX(OUT.worldPosition.xy, _MainTex);
OUT.color = v.color * _Color;
@ -141,9 +146,14 @@ Shader "UI/Isolines"
{
half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd);
#ifdef SCREEN_SPACE
float2 q = IN.screenPos.xy / IN.screenPos.w;
#else
float2 q = IN.texcoord;
#endif
float h = -tex2D(_DetailTex, q).r;
float4 col = float4(0,0,0,0);
float blend = smoothstep(_StartDepth, _StartDepth + _DepthRange / 32, -h);

BIN
GameData/homem.zone Normal file

Binary file not shown.