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

Trying to get material and lighting right

Browse Source
This commit is contained in:
Bill Kuker 2012-07-01 18:05:23 +00:00 committed by U-WINDOWS-C28163E\Administrator
parent 09b81a3529
commit 5dd804bed0
3 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/gui/figure3d/FigureRenderStrategy.java
View File

@ -115,4 +115,15 @@ public class FigureRenderStrategy extends RenderStrategy {
return 20; return 20;
} }
protected static void convertColor(Color color, float[] out) {
if ( color == null ){
out[0] = 1;
out[1] = 1;
out[2] = 0;
} else {
out[0] = Math.max(0.2f, (float) color.getRed() / 255f);
out[1] = Math.max(0.2f, (float) color.getGreen() / 255f);
out[2] = Math.max(0.2f, (float) color.getBlue() / 255f);
}
}
} }

31
core/src/net/sf/openrocket/gui/figure3d/RealisticRenderStrategy.java
View File

@ -22,9 +22,11 @@ import net.sf.openrocket.appearance.Decal;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Color;
public class RealisticRenderStrategy extends RenderStrategy { public class RealisticRenderStrategy extends RenderStrategy {
private final float[] colorBlack = { 0, 0, 0, 1 };
private final float[] color = new float[4]; private final float[] color = new float[4];
private static final LogHelper log = Application.getLogger(); private static final LogHelper log = Application.getLogger();
@ -60,20 +62,20 @@ public class RealisticRenderStrategy extends RenderStrategy {
convertColor(a.getDiffuse(), color); convertColor(a.getDiffuse(), color);
color[3] = alpha; color[3] = alpha;
gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, color, 0);
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_DIFFUSE, color, 0);
convertColor(a.getAmbient(), color); convertColor(a.getAmbient(), color);
color[3] = alpha; color[3] = alpha;
gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0);
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_AMBIENT, color, 0);
convertColor(a.getSpecular(), color); convertColor(a.getSpecular(), color);
color[3] = alpha; color[3] = alpha;
gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_SPECULAR, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_SPECULAR, color, 0);
gl.glMateriali(GL.GL_FRONT, GLLightingFunc.GL_SHININESS, a.getShininess()); gl.glMateriali(GL.GL_FRONT, GLLightingFunc.GL_SHININESS, a.getShininess());
convertColor(a.getDiffuse(), color); gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_SPECULAR, colorBlack, 0);
color[3] = alpha; gl.glMateriali(GL.GL_BACK, GLLightingFunc.GL_SHININESS, 0);
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_DIFFUSE, color, 0);
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_AMBIENT, color, 0);
Decal t = a.getTexture(); Decal t = a.getTexture();
Texture tex = null; Texture tex = null;
@ -119,7 +121,7 @@ public class RealisticRenderStrategy extends RenderStrategy {
log.debug("ClearCaches"); log.debug("ClearCaches");
for (Map.Entry<URI, Texture> e : oldTexCache.entrySet()) { for (Map.Entry<URI, Texture> e : oldTexCache.entrySet()) {
log.debug("Destroying Texture for " + e.getKey()); log.debug("Destroying Texture for " + e.getKey());
if ( e.getValue() != null ) if (e.getValue() != null)
e.getValue().destroy(gl); e.getValue().destroy(gl);
} }
oldTexCache = texCache; oldTexCache = texCache;
@ -128,7 +130,7 @@ public class RealisticRenderStrategy extends RenderStrategy {
private Texture getTexture(Decal t) { private Texture getTexture(Decal t) {
URL url = t.getImageURL(); URL url = t.getImageURL();
URI uri; //NEVER use a URL as a key! URI uri; // NEVER use a URL as a key!
try { try {
uri = url.toURI(); uri = url.toURI();
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
@ -136,18 +138,18 @@ public class RealisticRenderStrategy extends RenderStrategy {
return null; return null;
} }
//Return the Cached value if available // Return the Cached value if available
if (texCache.containsKey(uri)) if (texCache.containsKey(uri))
return texCache.get(uri); return texCache.get(uri);
//If the texture is in the Old Cache, save it. // If the texture is in the Old Cache, save it.
if (oldTexCache.containsKey(uri)) { if (oldTexCache.containsKey(uri)) {
texCache.put(uri, oldTexCache.get(uri)); texCache.put(uri, oldTexCache.get(uri));
oldTexCache.remove(uri); oldTexCache.remove(uri);
return texCache.get(uri); return texCache.get(uri);
} }
//Otherwise load it. // Otherwise load it.
Texture tex = null; Texture tex = null;
try { try {
log.debug("Loading texture " + t); log.debug("Loading texture " + t);
@ -183,4 +185,15 @@ public class RealisticRenderStrategy extends RenderStrategy {
} }
} }
protected static void convertColor(Color color, float[] out) {
if (color == null) {
out[0] = 1;
out[1] = 1;
out[2] = 0;
} else {
out[0] = (float) color.getRed() / 255f;
out[1] = (float) color.getGreen() / 255f;
out[2] = (float) color.getBlue() / 255f;
}
}
} }

15
core/src/net/sf/openrocket/gui/figure3d/RenderStrategy.java
View File

@ -3,29 +3,18 @@ package net.sf.openrocket.gui.figure3d;
import javax.media.opengl.GL2; import javax.media.opengl.GL2;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.util.Color;
public abstract class RenderStrategy { public abstract class RenderStrategy {
public abstract boolean isDrawn(RocketComponent c); public abstract boolean isDrawn(RocketComponent c);
public abstract boolean isDrawnTransparent(RocketComponent c); public abstract boolean isDrawnTransparent(RocketComponent c);
public abstract void preGeometry(GL2 gl, RocketComponent c, float alpha); public abstract void preGeometry(GL2 gl, RocketComponent c, float alpha);
public abstract void postGeometry(GL2 gl, RocketComponent c, float alpha); public abstract void postGeometry(GL2 gl, RocketComponent c, float alpha);
public void clearCaches(){ public void clearCaches() {
} }
protected static void convertColor(Color color, float[] out) {
if ( color == null ){
out[0] = 1;
out[1] = 1;
out[2] = 0;
} else {
out[0] = Math.max(0.2f, (float) color.getRed() / 255f);
out[1] = Math.max(0.2f, (float) color.getGreen() / 255f);
out[2] = Math.max(0.2f, (float) color.getBlue() / 255f);
}
}
} }