Lucifer3/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactorings.

Browse Source
This commit is contained in:
gisle
2022-08-21 11:17:42 +02:00
parent ae68679228
commit b303a623f6
14 changed files with 166 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/state.go
+2 -2
View File
@@ -47,7 +47,7 @@ func (s State) Interpolate(s2 State, f float64) State {
}
if s.Intensity != nil && s2.Intensity != nil {
newState.Intensity = gentools.Ptr((*s.Intensity * f) + (*s2.Intensity * (1.0 - f)))
newState.Intensity = gentools.Ptr((*s2.Intensity * f) + (*s.Intensity * (1.0 - f)))
} else if s.Intensity != nil {
newState.Intensity = gentools.ShallowCopy(s.Intensity)
} else if s2.Intensity != nil {
@@ -55,7 +55,7 @@ func (s State) Interpolate(s2 State, f float64) State {
}
if s.Temperature != nil && s2.Temperature != nil {
newState.Temperature = gentools.Ptr((*s.Temperature * f) + (*s2.Temperature * (1.0 - f)))
newState.Temperature = gentools.Ptr((*s2.Temperature * f) + (*s.Temperature * (1.0 - f)))
} else if s.Temperature != nil {
newState.Temperature = gentools.ShallowCopy(s.Temperature)
} else if s2.Temperature != nil {