xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1954 Speed up creation of GLColormapShadedShapes." into omaha_13.4.1

Browse source 
Former-commit-id: 7f4a6b6824 [formerly 6ff1729801df204872e505ad5f4fae36fde2420d]
Former-commit-id: c81db48d9d
This commit is contained in:
Nate Jensen 2013-04-25 16:18:41 -05:00 • committed by Gerrit Code Review
commit ca4157fdd1
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
View file

@ -24,7 +24,6 @@ import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.media.opengl.GL;
@ -48,7 +47,8 @@ import com.vividsolutions.jts.geom.LineString;
/**
*
* TODO Add Description
* Provides base implementation of shaded shapes in openGL that can be easily
* extended to implement IShadedShape or IColormapShadedShape.
*
* <pre>
*
@ -57,6 +57,8 @@ import com.vividsolutions.jts.geom.LineString;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 3, 2011 bsteffen Initial creation
* Apr 25, 2013 1954 bsteffen Speed up creation of
* GLColormapShadedShapes.
*
* </pre>
*
@ -116,32 +118,22 @@ public class GLShadedShapeBase implements IShape {
for (int i = 0; i < lineString.length; i++) {
buffers[i] = FloatBuffer.allocate(lineString[i].getNumPoints() * 2);
for (Coordinate c : lineString[i].getCoordinates()) {
double[] loc = { c.x, c.y };
loc = worldToPixel(loc);
buffers[i].put((float) loc[0]);
buffers[i].put((float) loc[1]);
buffers[i].put((float) c.x);
buffers[i].put((float) c.y);
numVertices += 1;
}
try {
float[] array = buffers[i].array();
worldToPixel.transform(array, 0, array, 0,
lineString[i].getNumPoints());
} catch (TransformException e) {
// Ignore...
}
numContours += 1;
}
polygons.add(buffers);
}
protected double[] worldToPixel(double[] world) {
if (worldToPixel != null) {
try {
double[] out = new double[world.length];
worldToPixel.transform(world, 0, out, 0, 1);
return out;
} catch (TransformException e) {
// Ignore...
}
return null;
} else {
return Arrays.copyOf(world, world.length);
}
}
public synchronized void addPolygonPixelSpace(LineString[] contours) {
FloatBuffer[] buffers = new FloatBuffer[contours.length];
for (int i = 0; i < contours.length; i++) {
@ -239,10 +231,10 @@ public class GLShadedShapeBase implements IShape {
if (tessellate) {
// This over allocates to avoid future resizing
if (vertexBuffer == null) {
vertexBuffer = FloatBuffer.allocate(numVertices * 2);
vertexBuffer = FloatBuffer.allocate(numVertices * 2 * 3);
} else {
FloatBuffer vertexBuffer = FloatBuffer.allocate(numVertices * 2
+ this.vertexBuffer.capacity());
* 3 + this.vertexBuffer.capacity());
this.vertexBuffer.rewind();
vertexBuffer.put(this.vertexBuffer);
this.vertexBuffer = vertexBuffer;