Release 1.2.4: Adjusting to engine changes, and fixing a shader bug b…

…y updating

src/me/anno/remsstudio/RemsStudio.kt

@@ -113,7 +113,7 @@ import kotlin.math.min
 
 // todo when playing video, and the time hasn't been touched manually, slide the time panel, when the time reaches the end: slide by 1x window width
 
-object RemsStudio : StudioBase("Rem's Studio", 10203, true) {
+object RemsStudio : StudioBase("Rem's Studio", 10204, true) {
 
     val defaultWindowStack get() = GFX.someWindow!!.windowStack
     var hideUnusedProperties = false

src/me/anno/remsstudio/RenderSettings.kt

@@ -5,7 +5,6 @@ import me.anno.config.DefaultConfig
 import me.anno.gpu.GFX
 import me.anno.io.files.InvalidRef
 import me.anno.language.translation.NameDesc
-import me.anno.maths.Maths.mixARGB
 import me.anno.remsstudio.RemsStudio.editorTime
 import me.anno.remsstudio.RemsStudio.project
 import me.anno.remsstudio.RemsStudio.targetDuration
@@ -20,6 +19,7 @@ import me.anno.remsstudio.Rendering.renderSetPercent
 import me.anno.remsstudio.objects.Transform
 import me.anno.remsstudio.ui.scene.StudioSceneView
 import me.anno.studio.Inspectable
+import me.anno.ui.Style
 import me.anno.ui.base.buttons.TextButton
 import me.anno.ui.base.groups.PanelListY
 import me.anno.ui.base.text.TextPanel
@@ -29,8 +29,8 @@ import me.anno.ui.input.EnumInput
 import me.anno.ui.input.FileInput
 import me.anno.ui.input.FloatInput
 import me.anno.ui.input.IntInput
-import me.anno.ui.Style
 import me.anno.utils.Color.black
+import me.anno.utils.Color.mixARGB
 import me.anno.utils.process.DelayedTask
 import me.anno.video.ffmpeg.FFMPEGEncodingBalance
 import me.anno.video.ffmpeg.FFMPEGEncodingType

src/me/anno/remsstudio/audio/pattern/PatternRecorderCore.kt

@@ -1,6 +1,5 @@
 package me.anno.remsstudio.audio.pattern
 
-import me.anno.Engine
 import me.anno.Time
 import me.anno.config.DefaultConfig.style
 import me.anno.gpu.drawing.DrawTexts.drawSimpleTextCharByChar
@@ -10,7 +9,6 @@ import me.anno.input.Input
 import me.anno.input.Key
 import me.anno.language.translation.NameDesc
 import me.anno.maths.Maths.mix
-import me.anno.maths.Maths.mixARGB
 import me.anno.maths.Maths.pow
 import me.anno.maths.Maths.unmix
 import me.anno.remsstudio.RemsStudio
@@ -21,6 +19,7 @@ import me.anno.ui.base.menu.Menu.openMenu
 import me.anno.ui.base.menu.MenuOption
 import me.anno.ui.input.TextInput
 import me.anno.utils.Color.black
+import me.anno.utils.Color.mixARGB
 import me.anno.utils.types.Booleans.toInt
 import org.joml.Vector2f
 import kotlin.math.abs

src/me/anno/remsstudio/ui/editor/TimelinePanel.kt

@@ -13,7 +13,6 @@ import me.anno.language.translation.NameDesc
 import me.anno.maths.Maths.clamp
 import me.anno.maths.Maths.fract
 import me.anno.maths.Maths.mix
-import me.anno.maths.Maths.mixARGB
 import me.anno.maths.Maths.pow
 import me.anno.remsstudio.RemsStudio
 import me.anno.remsstudio.RemsStudio.editorTime
@@ -26,12 +25,13 @@ import me.anno.remsstudio.objects.Transform
 import me.anno.remsstudio.ui.graphs.GraphEditorBody.Companion.shouldMove
 import me.anno.remsstudio.ui.graphs.GraphEditorBody.Companion.shouldScrub
 import me.anno.ui.Panel
+import me.anno.ui.Style
 import me.anno.ui.base.constraints.AxisAlignment
 import me.anno.ui.base.menu.Menu.openMenu
 import me.anno.ui.base.menu.MenuOption
 import me.anno.ui.custom.CustomContainer.Companion.isCross
-import me.anno.ui.Style
 import me.anno.utils.Color.black
+import me.anno.utils.Color.mixARGB
 import me.anno.utils.Color.mulAlpha
 import me.anno.utils.structures.tuples.Quad
 import me.anno.utils.types.Strings.formatTime

src/me/anno/remsstudio/ui/editor/cutting/LayerStripeSolution.kt

@@ -3,14 +3,12 @@ package me.anno.remsstudio.ui.editor.cutting
 import me.anno.Build
 import me.anno.animation.LoopingState
 import me.anno.audio.streams.AudioStreamRaw.Companion.bufferSize
-import me.anno.video.VideoCache
 import me.anno.config.DefaultConfig
 import me.anno.gpu.drawing.DrawGradients.drawRectGradient
 import me.anno.gpu.drawing.DrawRectangles
 import me.anno.gpu.drawing.DrawStriped.drawRectStriped
 import me.anno.maths.Maths.clamp
 import me.anno.maths.Maths.max
-import me.anno.maths.Maths.mixARGB
 import me.anno.maths.Maths.nonNegativeModulo
 import me.anno.remsstudio.RemsStudio.nullCamera
 import me.anno.remsstudio.audio.AudioFXCache2
@@ -21,6 +19,8 @@ import me.anno.remsstudio.ui.editor.TimelinePanel.Companion.centralTime
 import me.anno.remsstudio.ui.editor.TimelinePanel.Companion.dtHalfLength
 import me.anno.remsstudio.ui.editor.cutting.LayerView.Companion.maxLines
 import me.anno.utils.Color.black
+import me.anno.utils.Color.mixARGB
+import me.anno.video.VideoCache
 import me.anno.video.ffmpeg.MediaMetadata
 import org.joml.Vector4f
 import kotlin.math.abs
@@ -57,7 +57,14 @@ class LayerStripeSolution(
     }
 
     fun keepResourcesLoaded() {
-        iteratorOverGradients(emptyList(), null, false, { _, _, _, _, _, _ -> }, { _, _, _, _, _, _ -> }, ::keepFrameLoaded)
+        iteratorOverGradients(
+            emptyList(),
+            null,
+            false,
+            { _, _, _, _, _, _ -> },
+            { _, _, _, _, _, _ -> },
+            ::keepFrameLoaded
+        )
     }
 
     private fun iteratorOverGradients(

src/me/anno/remsstudio/ui/sceneTabs/SceneTab.kt

@@ -10,7 +10,6 @@ import me.anno.io.files.InvalidRef
 import me.anno.io.json.saveable.JsonStringReader
 import me.anno.io.json.saveable.JsonStringWriter
 import me.anno.language.translation.NameDesc
-import me.anno.maths.Maths.mixARGB
 import me.anno.remsstudio.RemsStudio.project
 import me.anno.remsstudio.history.History
 import me.anno.remsstudio.objects.Transform
@@ -27,6 +26,7 @@ import me.anno.ui.base.text.TextPanel
 import me.anno.ui.dragging.Draggable
 import me.anno.ui.editor.files.FileExplorer
 import me.anno.ui.editor.files.toAllowedFilename
+import me.anno.utils.Color.mixARGB
 import org.apache.logging.log4j.LogManager
 import kotlin.concurrent.thread