Enhance MilStd2525 Render Settings and Color mapping.

WorldWindEarth · Jan 18, 2025 · e1868c1 · e1868c1
1 parent efe67e0
commit e1868c1
Show file tree

Hide file tree

Showing 18 changed files with 10,540 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'earth.worldwind:worldwind:1.6.7'
+    implementation 'earth.worldwind:worldwind:1.6.9'
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
 
 allprojects {
     group = "earth.worldwind"
-    version = "1.6.7"
+    version = "1.6.9"
 
     extra.apply {
         set("minSdk", 21)

diff --git a/worldwind-examples-android/build.gradle.kts b/worldwind-examples-android/build.gradle.kts
@@ -41,5 +41,5 @@ dependencies {
     implementation("com.google.android.material:material:1.12.0")
     implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.60")
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
diff --git a/worldwind-tutorials/build.gradle.kts b/worldwind-tutorials/build.gradle.kts
@@ -77,5 +77,5 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
diff --git a/worldwind/build.gradle.kts b/worldwind/build.gradle.kts
@@ -165,7 +165,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
 }
 
 // Do not generate Intrinsics runtime assertion for performance reasons
@@ -182,7 +182,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class)
         }
     }
 
-val dokkaOutputDir = "${layout.buildDirectory}/dokka"
+val dokkaOutputDir = "${layout.buildDirectory.get()}/dokka"
 tasks.getByName<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml") {
     outputDirectory.set(file(dokkaOutputDir))
 }

diff --git a/worldwind/src/jsMain/kotlin/earth/worldwind/shape.milstd2525/MilStd2525.kt b/worldwind/src/jsMain/kotlin/earth/worldwind/shape.milstd2525/MilStd2525.kt
@@ -95,8 +95,12 @@ actual object MilStd2525 {
             family = RendererSettings.getModifierFontName(),
             weight = RendererSettings.getModifierFontStyle()
         )
-        textColor.set(RendererSettings.getLabelForegroundColor().toInt())
-        outlineColor.set(RendererSettings.getLabelBackgroundColor().toInt())
+        val foregroundColor = RendererSettings.getLabelForegroundColor() ?: Color(0, 0, 0)
+        val backgroundColor = RendererSettings.getLabelBackgroundColor() ?: Color.getColorFromHexString(
+            RendererUtilities.getIdealOutlineColor(foregroundColor.toHexString(withAlpha = false), forceRGB = true)
+        )
+        textColor.set(foregroundColor.toARGB().toInt())
+        outlineColor.set(backgroundColor.toARGB().toInt())
         outlineWidth =  RendererSettings.getTextOutlineWidth().toFloat()
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ repositories { @@
     }
     dependencies {
-        implementation 'earth.worldwind:worldwind:1.6.7'
+        implementation 'earth.worldwind:worldwind:1.6.9'
     }
     ```
@@ Expand Down @@