From efc686cfb22597881bf1d5eff5a734a34b98cf8b Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Tue, 29 Apr 2014 13:08:09 +0000
Subject: [PATCH] had to change mac jni ant file
---
.../src/com/amd/aparapi/examples/nbody/Main.java | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java b/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
index 18f00402..916f2e1e 100644
--- a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
+++ b/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
@@ -211,7 +211,7 @@ public class Main{
final JPanel panel = new JPanel(new BorderLayout());
final JPanel controlPanel = new JPanel(new FlowLayout());
- panel.add(controlPanel, BorderLayout.SOUTH);
+ panel.add(controlPanel, BorderLayout.NORTH);
final JButton startButton = new JButton("Start");
@@ -277,7 +277,6 @@ public class Main{
@Override public void display(GLAutoDrawable drawable) {
final GL2 gl = drawable.getGL().getGL2();
-
texture.enable(gl);
texture.bind(gl);
gl.glLoadIdentity();
@@ -335,15 +334,6 @@ public class Main{
final InputStream textureStream = Main.class.getResourceAsStream("particle.jpg");
TextureData data = TextureIO.newTextureData(profile, textureStream, false, "jpg");
texture = TextureIO.newTexture(data);
- //final Texture texture = TextureIO.newTexture(textureStream, false, null);
- // texture.enable(gl);
- // texture.bind(gl);
-
- //gl.glEnable(GL.GL_TEXTURE_2D);
- //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR);
- //gl.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_NEAREST);
- //gl.glBindTexture(GL.GL_TEXTURE_2D, texture.);
-
} catch (final IOException e) {
e.printStackTrace();
} catch (final GLException e) {
@@ -367,11 +357,11 @@ public class Main{
panel.add(canvas, BorderLayout.CENTER);
frame.getContentPane().add(panel, BorderLayout.CENTER);
- final FPSAnimator animator = new FPSAnimator(canvas, 100);
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.pack();
frame.setVisible(true);
+ final FPSAnimator animator = new FPSAnimator(canvas, 100);
animator.start();
--
GitLab