Merge pull request NASAWorldWind#39 from mainstringargs/develop

PointPlacemark & PointPlacemarkAttributes Pitch

Author: wcmatthysen

src/gov/nasa/worldwind/render/PointPlacemark.java

@@ -977,9 +977,24 @@ protected void doDrawOrderedRenderable(DrawContext dc, PickSupport pickCandidate
                     (byte) color.getAlpha());
             }
 
+            // Compute the scale
+            double xscale;
+            Double scale = this.getActiveAttributes().getScale();
+            if (scale != null)
+                xscale = scale * this.activeTexture.getWidth(dc);
+            else
+                xscale = this.activeTexture.getWidth(dc);
+
+            double yscale;
+            if (scale != null)
+                yscale = scale * this.activeTexture.getHeight(dc);
+            else
+                yscale = this.activeTexture.getHeight(dc);
+            double maxwh = Math.max(xscale, yscale);
+
             // The image is drawn using a parallel projection.
             osh.pushProjectionIdentity(gl);
-            gl.glOrtho(0d, dc.getView().getViewport().width, 0d, dc.getView().getViewport().height, -1d, 1d);
+            gl.glOrtho(0d, dc.getView().getViewport().width, 0d, dc.getView().getViewport().height, -0.6 * maxwh, 0.6 * maxwh);
 
             // Apply the depth buffer but don't change it (for screen-space shapes).
             if ((!dc.isDeepPickingEnabled()))
@@ -1001,20 +1016,6 @@ protected void doDrawOrderedRenderable(DrawContext dc, PickSupport pickCandidate
             osh.pushModelviewIdentity(gl);
             gl.glTranslated(opm.screenPoint.x + this.dx, opm.screenPoint.y + this.dy, 0);
 
-            // Compute the scale
-            double xscale;
-            Double scale = this.getActiveAttributes().getScale();
-            if (scale != null)
-                xscale = scale * this.activeTexture.getWidth(dc);
-            else
-                xscale = this.activeTexture.getWidth(dc);
-
-            double yscale;
-            if (scale != null)
-                yscale = scale * this.activeTexture.getHeight(dc);
-            else
-                yscale = this.activeTexture.getHeight(dc);
-
             Double heading = getActiveAttributes().getHeading();
             Double pitch = getActiveAttributes().getPitch();