From 1fe8adfcaa676865b5858e5d9de094392a22e26b Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 29 Jun 2008 17:13:15 -0700 Subject: [PATCH] checkpoint darcs-hash:20080630001315-5007d-8a9af8d7b4702cac08f237c73841d296b075bfd0.gz --- src/edu/berkeley/qfat/MeshViewer.java | 38 --------------------------------- src/edu/berkeley/qfat/Viewer.java | 33 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java index 8c2dca8..eaafed6 100644 --- a/src/edu/berkeley/qfat/MeshViewer.java +++ b/src/edu/berkeley/qfat/MeshViewer.java @@ -37,46 +37,8 @@ public class MeshViewer extends Viewer { protected HashSet safeTriangles = new HashSet(); public MeshViewer(JFrame f) { super(f); } - /* - public void init(GLAutoDrawable gld) { - GL gl = gld.getGL(); - gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - gl.glViewport(0, 0, 500, 300); - gl.glEnable(GL.GL_DEPTH_TEST); - gl.glClearDepth(1.0); - gl.glDepthFunc(GL.GL_LEQUAL); - gl.glMatrixMode(GL.GL_PROJECTION); - gl.glLoadIdentity(); - gl.glMatrixMode(GL.GL_MODELVIEW); - - float mat_specular[] = { 0.5f, 0.5f, 0.5f, 0.5f }; - float mat_shininess[] = { 50.0f }; - gl.glShadeModel(GL.GL_SMOOTH); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, mat_specular, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 0.3f }, 0); - //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0); - gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] { 1.0f, 4.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT1, GL.GL_POSITION, new float[] { -10.0f, 10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT2, GL.GL_POSITION, new float[] { 10.0f, -10.0f, 10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT3, GL.GL_POSITION, new float[] { 10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT4, GL.GL_POSITION, new float[] { -10.0f, 10.0f, -10.0f, 0.0f }, 0); - gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f, -10.0f, 0.0f }, 0); - gl.glEnable(GL.GL_LIGHTING); - gl.glEnable(GL.GL_LIGHT0); - - //gl.glEnable(GL.GL_LIGHT1); - //gl.glEnable(GL.GL_LIGHT2); - //gl.glEnable(GL.GL_LIGHT3); - //gl.glEnable(GL.GL_LIGHT4); - //gl.glEnable(GL.GL_LIGHT5); - gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); - gl.glEnable(GL.GL_COLOR_MATERIAL); - display(gld); - } - */ public void _display(GLAutoDrawable drawable, GL gl) { if (transforms==null) return; diff --git a/src/edu/berkeley/qfat/Viewer.java b/src/edu/berkeley/qfat/Viewer.java index 5b33872..b39f2a6 100644 --- a/src/edu/berkeley/qfat/Viewer.java +++ b/src/edu/berkeley/qfat/Viewer.java @@ -39,6 +39,39 @@ public abstract class Viewer implements GLEventListener, MouseListener, MouseMot public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { } public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { } + public void init(GLAutoDrawable gld) { + GL gl = gld.getGL(); + gl.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + gl.glViewport(0, 0, 500, 300); + gl.glEnable(GL.GL_DEPTH_TEST); + gl.glClearDepth(1.0); + gl.glDepthFunc(GL.GL_LEQUAL); + gl.glMatrixMode(GL.GL_PROJECTION); + gl.glLoadIdentity(); + gl.glMatrixMode(GL.GL_MODELVIEW); + + float mat_specular[] = { 0.5f, 0.5f, 0.5f, 0.5f }; + float mat_shininess[] = { 50.0f }; + gl.glShadeModel(GL.GL_SMOOTH); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_DIFFUSE, mat_specular, 0); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SPECULAR, mat_specular, 0); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT, new float[] { 0.3f, 0.3f, 0.3f, 0.3f }, 0); + //gl.glMaterialfv(GL.GL_FRONT, GL.GL_SHININESS, mat_shininess, 0); + gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] { 1.0f, 4.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT1, GL.GL_POSITION, new float[] { -10.0f, 10.0f, 10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT2, GL.GL_POSITION, new float[] { 10.0f, -10.0f, 10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT3, GL.GL_POSITION, new float[] { 10.0f, 10.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT4, GL.GL_POSITION, new float[] { -10.0f, 10.0f, -10.0f, 0.0f }, 0); + gl.glLightfv(GL.GL_LIGHT5, GL.GL_POSITION, new float[] { 10.0f, -10.0f, -10.0f, 0.0f }, 0); + gl.glEnable(GL.GL_LIGHTING); + gl.glEnable(GL.GL_LIGHT0); + + gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); + gl.glEnable(GL.GL_COLOR_MATERIAL); + + display(gld); + } + public abstract void _display(GLAutoDrawable drawable, GL gl); public void display(GLAutoDrawable drawable) { GL gl = drawable.getGL(); -- 1.7.10.4