Added new hotkeys. Added new debug tab. Fixed project creation validation bug

Author: ValeraShimchuck

composeApp/src/jvmMain/composeResources/drawable/images/tilesets/blending/height_mask.png

@@ -6,6 +6,10 @@ out vec4 FragColor;
 
 uniform usampler2D uTileMap;
 uniform sampler2DArray uBlobTexture;
+uniform sampler2DArray uBlobMask;
+uniform vec4 uMaskColor;
+uniform bool uShouldDrawMask;
+
 
 uniform vec2 uTileUnit;// (1,1) / map_size_in_tiles
 uniform vec4 uColorTint;
@@ -14,6 +18,12 @@ bool withinBounds(vec2 toCheck, vec2 minBounds, vec2 maxBounds) {
     return toCheck.x >= minBounds.x && toCheck.x < maxBounds.x && toCheck.y >= minBounds.y && toCheck.y < maxBounds.y;
 }
 
+vec4 blendPixels(vec4 src, vec4 dst) {
+//    vec4 preProcessed = (src * src.a) + (dst * (1.0 - src.a));
+//    return vec4(preProcessed.rgb, max(src.a, dst.a));
+    return max(src, dst);
+}
+
 bool withinUnit(vec2 cords) {
     return withinBounds(cords, vec2(0), vec2(1));
 }
@@ -200,7 +210,15 @@ vec4 getPixel(vec2 texCord) {
         ivec2 currentBlobMask = blobMasks[i];
         if (checkMask(mask, currentBlobMask.x)) blobIndex = currentBlobMask.y;
     }
-    return texture(uBlobTexture, vec3(tileCoordinates, blobIndex)) * uColorTint;
+
+    vec4 currentColor = texture(uBlobTexture, vec3(tileCoordinates, blobIndex)) * uColorTint;
+    if (!uShouldDrawMask)
+        return currentColor;
+    else {
+        vec4 maskColor = texture(uBlobMask, vec3(tileCoordinates, blobIndex)) * uMaskColor;
+//        return blendPixels(currentColor, maskColor);
+        return blendPixels(maskColor, currentColor);
+    }
 
 }
 

composeApp/src/jvmMain/composeResources/drawable/images/tilesets/blending/height_mask.webp

@@ -66,6 +66,7 @@ data class Terrain (
 
     companion object {
 
+        const val MAX_TERRAIN_HEIGHT = 7;
 
         fun deserialize(json: JsonObject): Terrain {
             // Extract dimensions in pixels

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

@@ -178,7 +178,8 @@ class EditorRenderer(override val di: DI) : GLEventListener, DIAware {
 
                     translate(Vector3f(toolService.refenceOverlayTool.offset.value.mul(-1f, Vector2f()), 0f))
                 }
-            )
+            ),
+            toolService.debugTool.debugInfo.value
         )
 
 

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/domain/terrain/Terrain.kt

@@ -28,6 +28,7 @@ import ua.valeriishymchuk.lobmapeditor.domain.unit.GameUnit.Companion.UNIT_DIMEN
 import ua.valeriishymchuk.lobmapeditor.services.project.EditorService
 import ua.valeriishymchuk.lobmapeditor.services.project.EditorService.Companion.deleteUnits
 import ua.valeriishymchuk.lobmapeditor.services.project.ToolService
+import ua.valeriishymchuk.lobmapeditor.services.project.tools.TerrainPickTool
 import ua.valeriishymchuk.lobmapeditor.shared.GameConstants
 import ua.valeriishymchuk.lobmapeditor.shared.refence.Reference
 import java.awt.Desktop
@@ -150,6 +151,27 @@ class InputListener(
             KeyEvent.VK_E -> {
 //                runTestError()
             }
+
+            KeyEvent.VK_R -> {
+                if (isCtrlPressed) {
+                    toolService.refenceOverlayTool.enabled.value = !toolService.refenceOverlayTool.enabled.value
+                }
+            }
+
+
+            KeyEvent.VK_G -> {
+                if (isCtrlPressed) {
+                    toolService.gridTool.enabled.value = !toolService.gridTool.enabled.value
+                }
+            }
+
+
+            KeyEvent.VK_Q -> {
+                if (isCtrlPressed) {
+                    toolService.currentTool.value = TerrainPickTool
+                }
+            }
+
         }
     }
 

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/render/EditorRenderer.kt

@@ -21,7 +21,8 @@ data class RenderContext(
     val selectedObjectives: List<Objective>,
     val selection: SelectionContext,
     val gridContext: GridContext,
-    val overlayReferenceContext: OverlayReferenceContext
+    val overlayReferenceContext: OverlayReferenceContext,
+    val debugInfo: DebugInfo
 ) {
     fun getMvp(model: Matrix4f): Matrix4f {
         return Matrix4f(projectionMatrix)
@@ -47,6 +48,10 @@ data class RenderContext(
         val positionMatrix: Matrix4f
     )
 
+    data class DebugInfo(
+        val firstHeightColor: Vector4f,
+        val secondHeightColor: Vector4f
+    )
 
 
 }

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/render/InputListener.kt

@@ -25,6 +25,9 @@ class BlobProcessorProgram(
     val mvpLocation = ctx.glGetUniformLocation(program, "uMVP")
     val tileMapLocation = ctx.glGetUniformLocation(program, "uTileMap")
     val blobTextureLocation = ctx.glGetUniformLocation(program, "uBlobTexture")
+    val shouldDrawMaskLocation = ctx.glGetUniformLocation(program, "uShouldDrawMask")
+    val maskColorLocation = ctx.glGetUniformLocation(program, "uMaskColor")
+    val blobMaskTextureLocation = ctx.glGetUniformLocation(program, "uBlobMask")
     val tileUnitLocation = ctx.glGetUniformLocation(program, "uTileUnit")
     val mapSizeLocation = ctx.glGetUniformLocation(program, "uMapSize")
     val colorTintLocation = ctx.glGetUniformLocation(program, "uColorTint")
@@ -145,6 +148,16 @@ class BlobProcessorProgram(
         ctx.glActiveTexture(GL.GL_TEXTURE0 + 1)
         ctx.glBindTexture(GL3.GL_TEXTURE_2D_ARRAY, data.blobTexture)
         ctx.glUniform1i(blobTextureLocation, 1)
+
+        val mask = data.mask
+        ctx.glUniform1i(shouldDrawMaskLocation, if(mask != null ) 1 else 0)
+        if (mask != null) {
+            ctx.glActiveTexture(GL.GL_TEXTURE0 + 2)
+            ctx.glBindTexture(GL3.GL_TEXTURE_2D_ARRAY, mask.blobMask)
+            ctx.glUniform1i(blobMaskTextureLocation, 2)
+            ctx.glUniform4fv(maskColorLocation, 1, floatArrayOf(mask.maskColor.x, mask.maskColor.y, mask.maskColor.z, mask.maskColor.w), 0)
+        }
+
 //        if (maskTextureLocation >= 0) // handling the fact that mask texute location can be discarded by compiler because its not being used
 //            ctx.applyTexture(maskTextureLocation, 2, data.maskTexture)
 
@@ -176,21 +189,30 @@ class BlobProcessorProgram(
         val tileUnit: Vector2f,
         val mapSize: Vector2f, // in world units
         val colorTint: Vector4f,
+        val mask: Mask?
+
     ) {
         constructor(
             mvp: Matrix4f,
             blobTexture: Int,
             mapTileSize: Vector2i,
             mapSize: Vector2i, // in world units
             colorTint: Vector4f,
+            mask: Mask? = null
         ): this(
             mvp,
             blobTexture,
             Vector2f(1f / mapTileSize.x, 1f / mapTileSize.y),
             Vector2f(mapSize.x.toFloat(), mapSize.y.toFloat()),
             colorTint,
+            mask
+        )
 
+        data class Mask(
+            val blobMask: Int,
+            val maskColor: Vector4f
         )
+
     }
 
 }

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/render/context/RenderContext.kt

@@ -4,7 +4,9 @@ import com.jogamp.opengl.GL.GL_TRIANGLES
 import com.jogamp.opengl.GL3
 import org.joml.Matrix4f
 import org.joml.Vector2i
+import org.joml.Vector3f
 import org.joml.Vector4f
+import ua.valeriishymchuk.lobmapeditor.domain.terrain.Terrain
 import ua.valeriishymchuk.lobmapeditor.domain.terrain.TerrainType
 import ua.valeriishymchuk.lobmapeditor.render.context.RenderContext
 import ua.valeriishymchuk.lobmapeditor.render.helper.glBindVBO
@@ -50,8 +52,8 @@ class BlobTileStage(
 
         val heightMap = scenario.map.terrainHeight
         val maxTerrain: Int = heightMap.map.flatMap { it }.distinct().max()
-        val minTerrain: Int = heightMap.map.flatMap { it }.distinct().min() + 1
-
+//        val minTerrain: Int = heightMap.map.flatMap { it }.distinct().min() + 1
+        val minTerrain: Int = heightMap.map.flatMap { it }.distinct().min()
         for (heightTile in minTerrain..maxTerrain) {
             blobProcessorProgram.setUpVBO(glCtx, tileMapVertices)
             blobProcessorProgram.setUpVAO(glCtx)
@@ -63,9 +65,24 @@ class BlobTileStage(
                     Vector2i(scenario.map.widthTiles, scenario.map.heightTiles),
                     Vector2i(scenario.map.widthPixels, scenario.map.heightPixels),
                     Vector4f(1f),
+                    BlobProcessorProgram.Uniform.Mask(
+                        textureStorage.heightMaskBlobTexture,
+                        getTintByHeight(heightTile)
+                    )
                 )
             )
             glCtx.glDrawArrays(GL_TRIANGLES, 0, 6)
         }
     }
+
+    private fun RenderContext.getTintByHeight(height: Int): Vector4f {
+        val maxHeight = Terrain.MAX_TERRAIN_HEIGHT
+//        val basicTint = Vector4f(Vector3f(0.1f, 0.2f, 0.1f),0.2f)
+//        val maxTint = Vector4f(Vector3f(0.55f, 0.4f, 0.3f), 0.2f)
+        val basicTint = debugInfo.firstHeightColor
+        val maxTint = debugInfo.secondHeightColor
+        val step = 1f / maxHeight
+        return basicTint.lerp(maxTint, step * height, Vector4f())
+    }
+
 }

composeApp/src/jvmMain/kotlin/ua/valeriishymchuk/lobmapeditor/render/program/BlobProcessorProgram.kt

@@ -52,6 +52,8 @@ class TextureStorage {
         private set
     var heightBlobTexture: Int = -1
         private set
+    var heightMaskBlobTexture: Int = -1
+        private set
     var objectiveMaskTexture: Int = -1
         private set
     var objectiveOverlayTexture: Int = -1
@@ -179,6 +181,17 @@ class TextureStorage {
         )
         heightBlobTexture = textures["tilesets/blending/height"]!!
 
+        loadAtlas(
+            ctx, "tilesets/blending/height_mask",
+            Vector2i(16),
+            Vector2i(8, 6),
+            ImageFilter(
+                useClamp = true,
+                useLinear = false
+            )
+        )
+        heightMaskBlobTexture = textures["tilesets/blending/height_mask"]!!
+
         loadInternalTexture(ctx, "other/arrow-body")
         arrowBody = textures["other/arrow-body"]!!