Trying to fix performance issues

Author: ValeraShimchuck

.gitignore

@@ -22,3 +22,5 @@ captures
 /composeApp/natives/
 /composeApp/projects.json
 /composeApp/testreference.png
+/composeApp/editor.log
+/composeApp/error2.log

composeApp/src/jvmMain/composeResources/files/shaders/desktop/foverlaytile.glsl

@@ -1,6 +1,6 @@
 #version 330 core
 
-const int MAX_OVERLAYS = 16;
+const int MAX_OVERLAYS = 2;
 const int NEIGHBORS_SIZE = 9;
 const int OVERLAY_NEIGHBORS_SIZE = MAX_OVERLAYS * NEIGHBORS_SIZE;
 const ivec2 OVERLAY_NEIGHBORS_DIMENSIONS = ivec2(NEIGHBORS_SIZE, MAX_OVERLAYS);
@@ -52,8 +52,6 @@ int getIndex2d(ivec2 pos, ivec2 dimensions) {
 vec4 getPixel(vec2 texCord) {
     // 0 - nothing
     // 1 - current tile to be drawn
-//    uint tileValue = texture(uTileMap, texCord).r;
-//    bool isSet = tileValue == 1u;
     vec2 tileMapCoordinates = texCord / uTileUnit;
     vec2 tileCoordinates = fract(tileMapCoordinates);// [0..1] within a tile
 
@@ -111,12 +109,10 @@ vec4 getPixel(vec2 texCord) {
     for (int i = 0; i < 9; i++) {
         ivec2 offset = offsets[i];
         neighborTileStatus[i] = texture(uTileMap, texCord + vec2(offset) * uTileUnit).r == 1u;
-//        if (neighborTileStatus[i]) debugPixels[i] = vec4(1.0);
     }
 
 
 
-//    float[9][MAX_OVERLAYS] tileIndecies;
     float[OVERLAY_NEIGHBORS_SIZE] tileIndecies;
 
 
@@ -128,7 +124,6 @@ vec4 getPixel(vec2 texCord) {
         }
     }
 
-//    vec2[9][MAX_OVERLAYS] randomOffsets;
     vec2[OVERLAY_NEIGHBORS_SIZE] randomOffsets;
 
     float doubleRandomRange = uRandomRange * 2;

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/services/project/EditorService.kt

@@ -154,19 +154,20 @@ class EditorService<T : GameScenario<T>>(
     private val saveCount = AtomicInteger()
 
     fun save(forceSave: Boolean = false, blocking: Boolean = false) {
+        val scenario = scenario.value ?: return
         if (savingJob?.isActive == true) return
         if (!forceSave) {
             if (System.currentTimeMillis() - lastSave < 30000 && System.currentTimeMillis() - lastAction < 5000) return
         }
-        if (scenario.value!!.hashCode() == lastHashCode) return
+        if (scenario.hashCode() == lastHashCode) return
 
         suspend fun save0() {
             lastSave = System.currentTimeMillis()
-            lastHashCode = scenario.value!!.hashCode()
+            lastHashCode = scenario.hashCode()
             val backupId = saveCount.incrementAndGet() % 10
             val backupFile = projectRef.getBackupFile(backupId)
             projectRef.mapFile.copyTo(backupFile, overwrite = true)
-            scenarioIOService.save(scenario.value!!, projectRef.mapFile)
+            scenarioIOService.save(scenario, projectRef.mapFile)
             println("Saved map")
         }
 

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/ui/component/project/tool/ToolConfig.kt

@@ -286,9 +286,10 @@ private fun PlayerToolConfig() {
     val toolService by rememberInstance<ToolService>()
     val editorService by rememberInstance<EditorService<GameScenario.Preset>>()
     val scenario by editorService.scenario.collectAsState()
+    scenario ?: return
     val tool = toolService.playerTool
     val currentPlayerReference by tool.currentPlayer.collectAsState()
-    var playerToMoveOwnership by remember(scenario!!, currentPlayerReference) {
+    var playerToMoveOwnership by remember(scenario, currentPlayerReference) {
         mutableStateOf(Reference<Int, Player>(scenario!!.players.indices.first { currentPlayerReference.key != it }))
     }
     val currentPlayer = currentPlayerReference.getValueOrNull(scenario!!.players::getOrNull) ?: Unit.let {
@@ -310,8 +311,6 @@ private fun PlayerToolConfig() {
 
 
     LaunchedEffect(currentPlayerReference) {
-//        println("Changed currentPlayerReference to ${currentPlayerReference.key}")
-//        val textValue = ammoTextFieldValue.text.toIntOrNull() ?: return@LaunchedEffect
         ammoTextFieldValue = ammoTextFieldValue.copy(text = currentPlayer.ammo.toString())
     }