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

Remove some overactive logging

Browse Source
This commit is contained in:
bkuker 2012-12-26 13:52:52 -05:00
parent 56c6d1b714
commit bc2e759d86
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,12 +370,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
@Override @Override
public void dispose(GLAutoDrawable drawable) { public void dispose(GLAutoDrawable drawable) {
log.verbose("GL - dispose() called"); log.verbose("GL - dispose()");
} }
@Override @Override
public void init(GLAutoDrawable drawable) { public void init(GLAutoDrawable drawable) {
log.verbose("GL - init() called"); log.verbose("GL - init()");
rr.init(drawable); rr.init(drawable);
GL2 gl = drawable.getGL().getGL2(); GL2 gl = drawable.getGL().getGL2();
@ -400,13 +400,11 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
extrasOverlay = new Overlay(drawable); extrasOverlay = new Overlay(drawable);
caretOverlay = new Overlay(drawable); caretOverlay = new Overlay(drawable);
log.verbose("GL - init() complete");
} }
@Override @Override
public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) { public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) {
log.verbose("GL - reshape() called"); log.verbose("GL - reshape()");
GL2 gl = drawable.getGL().getGL2(); GL2 gl = drawable.getGL().getGL2();
GLU glu = new GLU(); GLU glu = new GLU();
@ -419,7 +417,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
redrawExtras = true; redrawExtras = true;
log.verbose("GL - reshape() complete");
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -458,7 +455,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} }
private void setupView(GL2 gl, GLU glu) { private void setupView(GL2 gl, GLU glu) {
log.verbose("GL - setupView() called");
gl.glLoadIdentity(); gl.glLoadIdentity();
gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_POSITION, gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_POSITION,
@ -494,8 +490,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
gl.glScaled(-1, 1, 1); gl.glScaled(-1, 1, 1);
gl.glTranslated(-1, 0, 0); gl.glTranslated(-1, 0, 0);
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
log.verbose("GL - setupView() complete");
} }
/** /**
@ -508,19 +502,15 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} }
private void internalRepaint() { private void internalRepaint() {
log.verbose("GL - internalRepaint() called");
super.repaint(); super.repaint();
if (canvas != null) if (canvas != null)
canvas.display(); canvas.display();
log.verbose("GL - internalRepaint() complete");
} }
@Override @Override
public void repaint() { public void repaint() {
log.verbose("GL - repaint() called");
redrawExtras = true; redrawExtras = true;
internalRepaint(); internalRepaint();
log.verbose("GL - repaint() complete");
} }
private Set<RocketComponent> selection = new HashSet<RocketComponent>(); private Set<RocketComponent> selection = new HashSet<RocketComponent>();
@ -551,7 +541,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
// ///////////// Extra methods // ///////////// Extra methods
private Coordinate project(Coordinate c, GL2 gl, GLU glu) { private Coordinate project(Coordinate c, GL2 gl, GLU glu) {
log.verbose("GL - project() called");
double[] mvmatrix = new double[16]; double[] mvmatrix = new double[16];
double[] projmatrix = new double[16]; double[] projmatrix = new double[16];
int[] viewport = new int[4]; int[] viewport = new int[4];
@ -564,7 +553,6 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
glu.gluProject(c.x, c.y, c.z, mvmatrix, 0, projmatrix, 0, viewport, 0, glu.gluProject(c.x, c.y, c.z, mvmatrix, 0, projmatrix, 0, viewport, 0,
out, 0); out, 0);
log.verbose("GL - project() complete");
return new Coordinate(out[0], out[1], out[2]); return new Coordinate(out[0], out[1], out[2]);
} }