Author: paperwing
Date: 2011-08-22 11:15:06 -0700 (Mon, 22 Aug 2011)
New Revision: 26621
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
Log:
removed animator bug fix, seems like needs a bit more work
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-08-22 18:05:45 UTC (rev 26620)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-08-22 18:15:06 UTC (rev 26621)
@@ -1765,11 +1765,16 @@
gl.glEnable(GL2.GL_COLOR_MATERIAL);
gl.glColorMaterial(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE);
+ // Older default values
+ // float[] specularReflection = { 0.5f, 0.5f, 0.5f, 1.0f };
+ // gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SPECULAR,
+ // FloatBuffer.wrap(specularReflection));
+ // gl.glMateriali(GL2.GL_FRONT, GL2.GL_SHININESS, 40);
- float[] specularReflection = { 0.5f, 0.5f, 0.5f, 1.0f };
+ float[] specularReflection = { 0.46f, 0.46f, 0.46f, 1.0f };
gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SPECULAR,
FloatBuffer.wrap(specularReflection));
- gl.glMateriali(GL2.GL_FRONT, GL2.GL_SHININESS, 40);
+ gl.glMateriali(GL2.GL_FRONT, GL2.GL_SHININESS, 31);
}
@Override
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-08-22 18:05:45 UTC (rev 26620)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-08-22 18:15:06 UTC (rev 26621)
@@ -146,15 +146,7 @@
// TODO: check whether to use GLCanvas or GLJPanel
GLJPanel panel = new GLJPanel(capabilities);
- graphics = new Graphics(networkView, visualLexicon) {
-
- @Override
- public void dispose(GLAutoDrawable drawable) {
- animator.stop();
-
- super.dispose(drawable);
- }
- };
+ graphics = new Graphics(networkView, visualLexicon);
panel.addGLEventListener(graphics);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
