hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-introduce display lists.

Browse Source 
I should really just push everything into a single one, but I would
have to re-factor to pre-load all the textures, not load them while
rendering.
This isn't Doom III :)
This commit is contained in:
bkuker 2013-03-10 12:40:30 -04:00
parent 9eaca6c30c
commit befd3bfb96
3 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
View File

@ -13,6 +13,7 @@ import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.fixedfunc.GLLightingFunc;
import net.sf.openrocket.gui.figure3d.geometry.ComponentRenderer;
import net.sf.openrocket.gui.figure3d.geometry.DisplayListComponentRenderer;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor;
@ -28,7 +29,7 @@ import net.sf.openrocket.util.Coordinate;
public abstract class RocketRenderer {
protected static final LogHelper log = Application.getLogger();
final ComponentRenderer cr = new ComponentRenderer();
final ComponentRenderer cr = new DisplayListComponentRenderer();
private final float[] selectedEmissive = { 1, 0, 0, 1 };
private final float[] colorBlack = { 0, 0, 0, 1 };

2
core/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
View File

@ -72,7 +72,7 @@ public class ComponentRenderer {
};
}
private void renderGeometry(GL2 gl, RocketComponent c, Surface which) {
protected void renderGeometry(GL2 gl, RocketComponent c, Surface which) {
if (glu == null)
throw new IllegalStateException(this + " Not Initialized");

78
core/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java Normal file
View File

@ -0,0 +1,78 @@
package net.sf.openrocket.gui.figure3d.geometry;
import java.util.HashMap;
import java.util.Map;
import javax.media.opengl.GL2;
import javax.media.opengl.GLAutoDrawable;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
import net.sf.openrocket.rocketcomponent.RocketComponent;
public class DisplayListComponentRenderer extends ComponentRenderer {
private Map<Key, Integer> lists = new HashMap<Key, Integer>();
@Override
public void updateFigure(GLAutoDrawable drawable) {
super.updateFigure(drawable);
GL2 gl = drawable.getGL().getGL2();
for (int i : lists.values()) {
gl.glDeleteLists(i, 1);
}
lists.clear();
}
@Override
protected void renderGeometry(GL2 gl, RocketComponent c, Surface which) {
Key k = new Key(c, which);
if (lists.containsKey(k)) {
gl.glCallList(lists.get(k));
} else {
int list = gl.glGenLists(1);
gl.glNewList(list, GL2.GL_COMPILE_AND_EXECUTE);
super.renderGeometry(gl, c, which);
gl.glEndList();
lists.put(k, list);
}
}
private static class Key {
final RocketComponent c;
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((c == null) ? 0 : c.hashCode());
result = prime * result + ((which == null) ? 0 : which.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Key other = (Key) obj;
if (c == null) {
if (other.c != null)
return false;
} else if (!c.equals(other.c))
return false;
if (which != other.which)
return false;
return true;
}
final Surface which;
Key(final RocketComponent c, final Surface which) {
this.c = c;
this.which = which;
}
}
}