rusefi
/
jzy3d-api
mirror of https://github.com/rusefi/jzy3d-api.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OffscreenCanvas now working with jogl2.3.2

This commit is contained in:
Martin Pernollet 2015-10-16 10:21:42 +02:00
parent 6163001504
commit 12e80a74ea
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jzy3d-api/src/api/org/jzy3d/plot3d/rendering/canvas/OffscreenCanvas.java
View File

@ -28,6 +28,9 @@ import com.jogamp.opengl.util.texture.TextureIO;
* </code>
* </pre>
*
* Note that the {@link GLCapabilities} are modified while an instance of {@link OffscreenCanvas}
* is modified.
*
* @author Nils Hoffman
* @author Martin Pernollet
*/
@ -41,7 +44,7 @@ public class OffscreenCanvas implements ICanvas {
this.renderer = factory.newRenderer(view, traceGL, debugGL);
this.capabilities = capabilities;
initGLPBuffer(capabilities, width, height);
initBuffer(capabilities, width, height);
}
/**
@ -53,14 +56,16 @@ public class OffscreenCanvas implements ICanvas {
* @param width
* @param height
*/
public void initGLPBuffer(GLCapabilities capabilities, int width, int height) {
public void initBuffer(GLCapabilities capabilities, int width, int height) {
GLProfile profile = capabilities.getGLProfile();
capabilities.setDoubleBuffered(false);
capabilities.setPBuffer(true);
if (!GLDrawableFactory.getFactory(profile).canCreateGLPbuffer(null, profile))
throw new RuntimeException("No pbuffer support");
GLDrawableFactory factory = GLDrawableFactory.getFactory(profile);
if (!factory.canCreateGLPbuffer(null, profile))
throw new RuntimeException("No pbuffer support");
if(glpBuffer!=null)
glpBuffer.removeGLEventListener(renderer);
glpBuffer = factory.createOffscreenAutoDrawable(factory.getDefaultDevice(), capabilities, null, width, height);
@ -73,7 +78,7 @@ public class OffscreenCanvas implements ICanvas {
}
@Override
public GLDrawable getDrawable() {
public GLOffscreenAutoDrawable getDrawable() {
return glpBuffer;
}
@ -109,19 +114,11 @@ public class OffscreenCanvas implements ICanvas {
return view;
}
/**
* Provide the actual renderer width for the open gl camera settings, which
* is obtained after a resize event.
*/
@Override
public int getRendererWidth() {
return (renderer != null ? renderer.getWidth() : 0);
}
/**
* Provide the actual renderer height for the open gl camera settings, which
* is obtained after a resize event.
*/
@Override
public int getRendererHeight() {
return (renderer != null ? renderer.getHeight() : 0);
@ -158,8 +155,6 @@ public class OffscreenCanvas implements ICanvas {
return capabilities;
}
protected View view;
protected Renderer3d renderer;
protected GLOffscreenAutoDrawable glpBuffer;

2
jzy3d-javafx/src/main/java/org/jzy3d/javafx/JavaFXChartFactory.java
View File

@ -124,7 +124,7 @@ public class JavaFXChartFactory extends AWTChartComponentFactory {
protected void resetTo(Chart chart, double width, double height) {
if (chart.getCanvas() instanceof OffscreenCanvas) {
OffscreenCanvas canvas = (OffscreenCanvas) chart.getCanvas();
canvas.initGLPBuffer(canvas.getCapabilities(), (int) width, (int) height);
canvas.initBuffer(canvas.getCapabilities(), (int) width, (int) height);
chart.render();
} else {
System.err.println("NOT AN OFFSCREEN CANVAS!");