Merge remote-tracking branch 'origin/fix/placemark-rotation-and-tilt'…

… into develop
WorldWindEarth · Jul 25, 2022 · 625953b · 625953b
2 parents 07df859 + ec7d248
commit 625953b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/worldwind-examples/src/main/java/gov/nasa/worldwindx/milstd2525/MilStd2525.java b/worldwind-examples/src/main/java/gov/nasa/worldwindx/milstd2525/MilStd2525.java
@@ -10,7 +10,6 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Point;
-import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Handler;
 import android.os.Looper;
@@ -263,7 +262,7 @@ public Bitmap createBitmap() {
             // placement as the offset may change depending on the level of detail, for instance, the absence or
             // presence of text modifiers.
             Point centerPoint = imageInfo.getCenterPoint(); // The center of the core symbol
-            Rect bounds = imageInfo.getImageBounds();       // The extents of the image, including text modifiers
+            //Rect bounds = imageInfo.getImageBounds();       // The extents of the image, including text modifiers
             this.placemarkOffset = new Offset(
                 WorldWind.OFFSET_PIXELS, centerPoint.x, // x offset
                 // Use billboarding or lollipopping to prevent icon clipping by terrain as described in MIL-STD-2525C APPENDIX F.5.1.1.2

diff --git a/worldwind/src/main/java/gov/nasa/worldwind/render/RenderContext.java b/worldwind/src/main/java/gov/nasa/worldwind/render/RenderContext.java
@@ -430,7 +430,7 @@ public Texture getText(String text, TextAttributes attributes) {
     }
 
     public Texture renderText(String text, TextAttributes attributes) {
-        TextCacheKey key = this.scratchTextCacheKey.set(text, attributes);
+        TextCacheKey key = new TextCacheKey().set(text, attributes);
         Texture texture = null;
 
         if (text != null && attributes != null) {