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

Move lighting setup into RenderStrategies

Browse Source
This commit is contained in:
Bill Kuker 2012-07-06 18:40:43 +00:00 committed by U-WINDOWS-C28163E\Administrator
parent fc848db00e
commit f5c309d2cc
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
View File

@ -17,7 +17,6 @@ import java.util.Set;
import javax.media.opengl.GL; import javax.media.opengl.GL;
import javax.media.opengl.GL2; import javax.media.opengl.GL2;
import javax.media.opengl.GL2ES1;
import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLEventListener; import javax.media.opengl.GLEventListener;
@ -388,25 +387,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
gl.glDepthFunc(GL.GL_LEQUAL); // the type of depth test to do gl.glDepthFunc(GL.GL_LEQUAL); // the type of depth test to do
gl.glLightModelfv(GL2ES1.GL_LIGHT_MODEL_AMBIENT,
new float[] { 0,0,0 }, 0);
float amb = 0.3f;
float dif = 1.0f - amb;
float spc = 1.0f;
gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_AMBIENT,
new float[] { amb, amb, amb, 1 }, 0);
gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_DIFFUSE,
new float[] { dif, dif, dif, 1 }, 0);
gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_SPECULAR,
new float[] { spc, spc, spc, 1 }, 0);
gl.glEnable(GLLightingFunc.GL_LIGHT1);
gl.glEnable(GLLightingFunc.GL_LIGHTING);
gl.glShadeModel(GLLightingFunc.GL_SMOOTH);
gl.glEnable(GLLightingFunc.GL_NORMALIZE);
extrasOverlay = new Overlay(drawable); extrasOverlay = new Overlay(drawable);
caretOverlay = new Overlay(drawable); caretOverlay = new Overlay(drawable);

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

@ -27,7 +27,7 @@ public class RocketRenderer {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final LogHelper log = Application.getLogger(); private static final LogHelper log = Application.getLogger();
RenderStrategy currentStrategy = new RealisticRenderStrategy(); RenderStrategy currentStrategy = new FigureRenderStrategy();
ComponentRenderer cr; ComponentRenderer cr;