Fix local space intensity and IVAIntensityCurve

StollD · StollD · commit bdfc343b2c46 · 2017-10-26T12:50:13.000+02:00
diff --git a/src/Kopernicus.Components/Kopernicus.Components.csproj b/src/Kopernicus.Components/Kopernicus.Components.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Kopernicus.Components</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Kopernicus.Components/KopernicusStar.cs b/src/Kopernicus.Components/KopernicusStar.cs
@@ -285,7 +285,7 @@ void LateUpdate()
                 if (HighLogic.LoadedSceneIsFlight && iva?.GetComponent<Light>())
                 {
                     iva.GetComponent<Light>().color = shifter.IVASunColor;
-                    iva.GetComponent<Light>().intensity = shifter.IVASunIntensity;
+                    iva.GetComponent<Light>().intensity = shifter.ivaIntensityCurve.Evaluate((Single)Vector3d.Distance(sun.position, target.position));
                 }
 
                 // Set SunFlare color
@@ -312,7 +312,6 @@ void LateUpdate()
                 if (FlightGlobals.currentMainBody == null || FlightGlobals.currentMainBody == sun)
                 {
                     localTime = 1f;
-                    light.intensity = scaledSunLight.intensity;
                 }
                 else
                 {
@@ -325,7 +324,7 @@ void LateUpdate()
                     Single fadeStartAtAlt = horizonScalar + fadeStart * dayNightRatio;
                     Single fadeEndAtAlt = horizonScalar - fadeEnd * dayNightRatio;
                     localTime = Vector3.Dot(-FlightGlobals.getUpAxis(localSpace), transform.forward);
-                    light.intensity = Mathf.Lerp(0f, scaledSunLight.intensity, Mathf.InverseLerp(fadeEndAtAlt, fadeStartAtAlt, localTime));
+                    light.intensity = Mathf.Lerp(0f, light.intensity, Mathf.InverseLerp(fadeEndAtAlt, fadeStartAtAlt, localTime));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ void LateUpdate()`
`285`	`285`	`if (HighLogic.LoadedSceneIsFlight && iva?.GetComponent<Light>())`
`286`	`286`	`{`
`287`	`287`	`iva.GetComponent<Light>().color = shifter.IVASunColor;`
`288`		`- iva.GetComponent<Light>().intensity = shifter.IVASunIntensity;`
	`288`	`+ iva.GetComponent<Light>().intensity = shifter.ivaIntensityCurve.Evaluate((Single)Vector3d.Distance(sun.position, target.position));`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`// Set SunFlare color`
`@@ -312,7 +312,6 @@ void LateUpdate()`
`312`	`312`	`if (FlightGlobals.currentMainBody == null \|\| FlightGlobals.currentMainBody == sun)`
`313`	`313`	`{`
`314`	`314`	`localTime = 1f;`
`315`		`- light.intensity = scaledSunLight.intensity;`
`316`	`315`	`}`
`317`	`316`	`else`
`318`	`317`	`{`
`@@ -325,7 +324,7 @@ void LateUpdate()`
`325`	`324`	`Single fadeStartAtAlt = horizonScalar + fadeStart * dayNightRatio;`
`326`	`325`	`Single fadeEndAtAlt = horizonScalar - fadeEnd * dayNightRatio;`
`327`	`326`	`localTime = Vector3.Dot(-FlightGlobals.getUpAxis(localSpace), transform.forward);`
`328`		`- light.intensity = Mathf.Lerp(0f, scaledSunLight.intensity, Mathf.InverseLerp(fadeEndAtAlt, fadeStartAtAlt, localTime));`
	`327`	`+ light.intensity = Mathf.Lerp(0f, light.intensity, Mathf.InverseLerp(fadeEndAtAlt, fadeStartAtAlt, localTime));`
`329`	`328`	`}`
`330`	`329`	`}`
`331`	`330`