Remove Unity render settings fallback
This commit is contained in:
parent
9de7174b4c
commit
0b7ed068ec
6 changed files with 30 additions and 137 deletions
|
|
@ -167,8 +167,6 @@ public class ActionGameManager : MonoBehaviour
|
|||
Settings = Settings,
|
||||
ZoneRenderer = ZoneRenderer,
|
||||
CockpitHudShell = CockpitHudShell,
|
||||
TargetSpottedBlinkFrequency = TargetSpottedBlinkFrequency,
|
||||
TargetSpottedBlinkOffset = TargetSpottedBlinkOffset,
|
||||
Log = Debug.Log
|
||||
};
|
||||
private AetheriaUnityGameplaySceneWiring SceneWiring =>
|
||||
|
|
@ -212,8 +210,6 @@ public class ActionGameManager : MonoBehaviour
|
|||
public GameSettings Settings;
|
||||
//public string StarterShipTemplate = "Longinus";
|
||||
public float2 Sensitivity;
|
||||
public float TargetSpottedBlinkFrequency = 20;
|
||||
public float TargetSpottedBlinkOffset = -.25f;
|
||||
|
||||
[Header("Postprocessing")]
|
||||
public Volume DeathPost;
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ public sealed class AetheriaUnityGameplayBootShell
|
|||
public GameSettings Settings { get; set; }
|
||||
public ZoneRenderer ZoneRenderer { get; set; }
|
||||
public AetheriaUnityCockpitHudShell CockpitHudShell { get; set; }
|
||||
public float TargetSpottedBlinkFrequency { get; set; }
|
||||
public float TargetSpottedBlinkOffset { get; set; }
|
||||
public Action<string> Log { get; set; }
|
||||
|
||||
public AetheriaUnityGameplayBootResult Boot()
|
||||
|
|
@ -79,17 +77,11 @@ public sealed class AetheriaUnityGameplayBootShell
|
|||
private AetheriaRuntimeDaemonRenderSettings ResolveDaemonRenderSettings(AetheriaClientState runtimeState)
|
||||
{
|
||||
var frame = runtimeState?.DaemonFrame?.Latest();
|
||||
if (frame?.RenderSettings != null)
|
||||
{
|
||||
Log?.Invoke($"Aetheria render/game-feel settings: daemon frame {frame.FrameId}");
|
||||
return frame.RenderSettings;
|
||||
}
|
||||
if (frame == null)
|
||||
throw new InvalidOperationException("Aetheria daemon frame is required before gameplay boot; render/game-feel settings are daemon authority.");
|
||||
|
||||
Log?.Invoke("Aetheria render/game-feel settings: local Unity Settings fallback; daemon frame unavailable.");
|
||||
return AetheriaUnityRenderSettingsBridge.Build(
|
||||
Settings,
|
||||
TargetSpottedBlinkFrequency,
|
||||
TargetSpottedBlinkOffset);
|
||||
Log?.Invoke($"Aetheria render/game-feel settings: daemon frame {frame.FrameId}");
|
||||
return frame.RenderSettings;
|
||||
}
|
||||
|
||||
private AetheriaRuntimeStateBootReport SyncRemoteReplicaBeforeBoot(AetheriaRuntimeStateBootReport stateBoot)
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
using System.Linq;
|
||||
using GameCult.Aetheria.State.Verse;
|
||||
|
||||
public static class AetheriaUnityRenderSettingsBridge
|
||||
{
|
||||
public static AetheriaRuntimeDaemonRenderSettings Build(
|
||||
GameSettings settings,
|
||||
float targetSpottedBlinkFrequency,
|
||||
float targetSpottedBlinkOffset)
|
||||
{
|
||||
var emissionCurve = settings.GameplaySettings.TemperatureEmissionCurve;
|
||||
var bodyIconSizeCurve = settings.IconSize;
|
||||
var bodyRadiusCurve = settings.PlanetSettings.BodyRadius;
|
||||
var lightRadiusCurve = settings.PlanetSettings.LightRadius;
|
||||
var gravityWaveFrequencyCurve = settings.PlanetSettings.WaveFrequency;
|
||||
return new AetheriaRuntimeDaemonRenderSettings(
|
||||
new AetheriaRuntimeExponentialCurve(
|
||||
emissionCurve.Exponent,
|
||||
emissionCurve.Multiplier,
|
||||
emissionCurve.Constant),
|
||||
new AetheriaRuntimeExponentialLerp(
|
||||
settings.GameplaySettings.LockIndicatorFrequency.Exponent,
|
||||
settings.GameplaySettings.LockIndicatorFrequency.Minimum,
|
||||
settings.GameplaySettings.LockIndicatorFrequency.Maximum),
|
||||
new AetheriaRuntimeExponentialLerp(
|
||||
settings.GameplaySettings.LockSpinSpeed.Exponent,
|
||||
settings.GameplaySettings.LockSpinSpeed.Minimum,
|
||||
settings.GameplaySettings.LockSpinSpeed.Maximum),
|
||||
settings.GameplaySettings.ConvergenceMinimumDistance,
|
||||
settings.GameplaySettings.HypothermiaTemperature,
|
||||
settings.GameplaySettings.HeatstrokeTemperature,
|
||||
settings.GameplaySettings.SevereHeatstrokeRiskThreshold,
|
||||
settings.GameplaySettings.TargetDetectionInfoThreshold,
|
||||
settings.GameplaySettings.LockIndicatorNoiseAmplitude,
|
||||
settings.HeatstrokePhasingFloor,
|
||||
settings.HeatstrokePhasingFrequency,
|
||||
targetSpottedBlinkFrequency,
|
||||
targetSpottedBlinkOffset,
|
||||
settings.MinimapZoomLevels?.Select(level => (double)level).ToArray(),
|
||||
settings.DefaultMinimapZoom,
|
||||
settings.WormholeDistanceRatio,
|
||||
settings.DefaultViewDistance,
|
||||
settings.MinimapIconSize,
|
||||
settings.MinimapAsteroidSize,
|
||||
new AetheriaRuntimeExponentialCurve(
|
||||
bodyIconSizeCurve.Exponent,
|
||||
bodyIconSizeCurve.Multiplier,
|
||||
bodyIconSizeCurve.Constant),
|
||||
settings.MinimapZoneGravityRange,
|
||||
settings.PlanetSettings.AsteroidVerticalOffset,
|
||||
settings.PlanetRotationSpeed,
|
||||
settings.PlanetSettings.ZoneDepthExponent,
|
||||
settings.PlanetSettings.ZoneDepth + settings.PlanetSettings.ZoneBoundaryFog,
|
||||
settings.AsteroidMeshCount,
|
||||
new AetheriaRuntimeExponentialCurve(
|
||||
bodyRadiusCurve.Exponent,
|
||||
bodyRadiusCurve.Multiplier,
|
||||
bodyRadiusCurve.Constant),
|
||||
new AetheriaRuntimeExponentialCurve(
|
||||
lightRadiusCurve.Exponent,
|
||||
lightRadiusCurve.Multiplier,
|
||||
lightRadiusCurve.Constant),
|
||||
new AetheriaRuntimeExponentialCurve(
|
||||
gravityWaveFrequencyCurve.Exponent,
|
||||
gravityWaveFrequencyCurve.Multiplier,
|
||||
gravityWaveFrequencyCurve.Constant));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0d5dc044370e0c340b28db46e4bfeca7
|
||||
Loading…
Reference in a new issue