fixed demo

Author: royerloic

build.gradle

@@ -65,6 +65,7 @@ dependencies
 
 
 	compile ('org.jogamp.jogl:jogl-all:2.3.1'){transitive = true}
+	compile ('org.jogamp.jogl:jogl-all-main:2.3.1'){transitive = true}
 	compile ('org.jogamp.jogl:jogl-all:2.3.1:natives-macosx-universal'){transitive = true}
 	compile ('org.jogamp.jogl:jogl-all:2.3.1:natives-windows-amd64'){transitive = true}
 	compile ('org.jogamp.jogl:jogl-all:2.3.1:natives-linux-amd64'){transitive = true}
@@ -105,6 +106,20 @@ if (JavaVersion.current().isJava8Compatible()) {
 	}
 }
 
+//***********************************************************************************
+// BINTRAY PUBLISHING
+
+task TestProgFatJar(type:Jar) {
+	archiveName = "TestProg.jar"
+	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+	with jar
+
+	manifest {
+		attributes("Class-Path": ".", 'Main-Class': 'cleargl.testprog.JOGLTestProgram')
+	}
+}
+
+
 
 
 //***********************************************************************************

src/java/cleargl/ClearGLDefaultEventListener.java

@@ -61,11 +61,12 @@ private void setDebugPipeline(GLAutoDrawable pDrawable)
 
 		final GL lGL = pDrawable.getGL();
 		lGL.getContext()
-				.setGL(GLPipelineFactory.create("javax.media.opengl.Debug",
+				.setGL(GLPipelineFactory.create("com.jogamp.opengl.Debug",
 																				null,
 																				lGL,
 																				null));
 
+
 		mAlreadyInDebugMode = true;
 	}
 

src/java/cleargl/ClearGLWindow.java

@@ -112,6 +112,19 @@ public ClearGLWindow(	String pWindowTitle,
 												int pDefaultWidth,
 												int pDefaultHeight,
 												ClearGLEventListener pClearGLWindowEventListener)
+	{
+		this(	pWindowTitle,
+					pDefaultWidth,
+					pDefaultHeight,
+					16,
+					pClearGLWindowEventListener);
+	}
+
+	public ClearGLWindow(	String pWindowTitle,
+												int pDefaultWidth,
+												int pDefaultHeight,
+												int pNumberOfSamples,
+												ClearGLEventListener pClearGLWindowEventListener)
 	{
 		super();
 		mWindowTitle = pWindowTitle;
@@ -126,14 +139,14 @@ public ClearGLWindow(	String pWindowTitle,
 												+ lProfile);
 		final GLCapabilities lCapabilities = new GLCapabilities(lProfile);
 
-		lCapabilities.setSampleBuffers(true);
-		lCapabilities.setNumSamples(16);
+		lCapabilities.setSampleBuffers(pNumberOfSamples > 1);
+		lCapabilities.setNumSamples(pNumberOfSamples);
 
-		final GLCapabilitiesChooser multisampleChooser = new MultisampleChooser();
+		final GLCapabilitiesChooser lMultisampleChooser = new MultisampleChooser();
 
 		mWindow = NewtFactory.createWindow(lCapabilities);
 		mGlWindow = GLWindow.create(mWindow);
-		mGlWindow.setCapabilitiesChooser(multisampleChooser);
+		mGlWindow.setCapabilitiesChooser(lMultisampleChooser);
 		mGlWindow.setTitle(pWindowTitle);
 
 		pClearGLWindowEventListener.setClearGLWindow(this);

src/java/cleargl/demo/ClearGLDemo.java

@@ -201,7 +201,9 @@ public void reshape(GLAutoDrawable pDrawable,
 			public void display(GLAutoDrawable pDrawable)
 			{
 				super.display(pDrawable);
+
 				final GL lGL = pDrawable.getGL();
+
 				lGL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
 
 				getClearGLWindow().lookAt(0f, 0f, 1, 0f, 0f, -1, 0, 1, 0);
@@ -284,7 +286,10 @@ public ClearGLDisplayable getClearGLWindow()
 			// lClearGLWindow.disableClose();
 			lClearGLWindow.setVisible(true);
 
-			Thread.sleep(2000);
+			while (lClearGLWindow.isVisible())
+			{
+				Thread.sleep(100);
+			}
 		}
 
 		/*try (ClearGLJPanel lClearGLJPanel = new ClearGLJPanel(lClearGLWindowEventListener))

src/java/cleargl/testprog/JOGLTestProgram.java

@@ -0,0 +1,28 @@
+package cleargl.testprog;
+
+import cleargl.demo.ClearGLDemo;
+
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLProfile;
+
+public class JOGLTestProgram
+{
+
+
+	public static void main(String[] args) throws InterruptedException
+	{
+		final AbstractGraphicsDevice lDefaultDevice = GLProfile.getDefaultDevice();
+		final GLProfile lProfile = GLProfile.getMaxProgrammable(true);
+		final GLCapabilities lCapabilities = new GLCapabilities(lProfile);
+
+		System.out.println("Device: " + lDefaultDevice);
+		System.out.println("Capabilities: " + lCapabilities);
+		System.out.println("Profile: " + lProfile);
+
+		final ClearGLDemo lClearGLDemo = new ClearGLDemo();
+		lClearGLDemo.demo();
+
+	}
+
+}