From 09bccec68fc6bb3d8d10a5e85d48d7f995e9cb0d Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Sun, 11 Nov 2012 18:35:00 +0000
Subject: [PATCH] add linux/macos scripts
---
examples/javaonedemo/build.xml | 2 +-
examples/javaonedemo/life.sh | 7 +++++++
examples/javaonedemo/mandel.sh | 7 +++++++
examples/javaonedemo/nbody.sh | 8 ++++++++
.../src/com/amd/aparapi/examples/javaonedemo/NBody.java | 7 +++++--
5 files changed, 28 insertions(+), 3 deletions(-)
create mode 100644 examples/javaonedemo/life.sh
create mode 100644 examples/javaonedemo/mandel.sh
create mode 100644 examples/javaonedemo/nbody.sh
diff --git a/examples/javaonedemo/build.xml b/examples/javaonedemo/build.xml
index 7afd3409..8ccee70e 100644
--- a/examples/javaonedemo/build.xml
+++ b/examples/javaonedemo/build.xml
@@ -4,7 +4,7 @@
<path id="compiler.class.path">
<pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
- <pathelement path="jogamp/jogl.all.jar"/>
+ <pathelement path="jogamp/jogl-all.jar"/>
<pathelement path="jogamp/gluegen-rt.jar"/>
</path>
diff --git a/examples/javaonedemo/life.sh b/examples/javaonedemo/life.sh
new file mode 100644
index 00000000..70586141
--- /dev/null
+++ b/examples/javaonedemo/life.sh
@@ -0,0 +1,7 @@
+java \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist \
+ -Dcom.amd.aparapi.executionMode=$1 \
+ -Dheight=600 \
+ -Dwidth=600 \
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:javaonedemo.jar \
+ com.amd.aparapi.examples.javaonedemo.Life
diff --git a/examples/javaonedemo/mandel.sh b/examples/javaonedemo/mandel.sh
new file mode 100644
index 00000000..395e7826
--- /dev/null
+++ b/examples/javaonedemo/mandel.sh
@@ -0,0 +1,7 @@
+java \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist \
+ -Dcom.amd.aparapi.executionMode=$1 \
+ -Dheight=600 \
+ -Dwidth=600 \
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:javaonedemo.jar \
+ com.amd.aparapi.examples.javaonedemo.Mandel
diff --git a/examples/javaonedemo/nbody.sh b/examples/javaonedemo/nbody.sh
new file mode 100644
index 00000000..f410e163
--- /dev/null
+++ b/examples/javaonedemo/nbody.sh
@@ -0,0 +1,8 @@
+java \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist:jogamp \
+ -Dcom.amd.aparapi.executionMode=$1 \
+ -Dbodies=$2 \
+ -Dheight=600 \
+ -Dwidth=600 \
+ -classpath jogamp/jogl-all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:javaonedemo.jar \
+ com.amd.aparapi.examples.javaonedemo.NBody
diff --git a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java b/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java
index 14d77428..44cbc037 100644
--- a/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java
+++ b/examples/javaonedemo/src/com/amd/aparapi/examples/javaonedemo/NBody.java
@@ -198,6 +198,8 @@ public class NBody{
public static boolean running;
+ public static Texture texture;
+
public static void main(String _args[]) {
final NBodyKernel kernel = new NBodyKernel(Range.create(Integer.getInteger("bodies", 10000)));
@@ -290,6 +292,8 @@ public class NBody{
@Override public void display(GLAutoDrawable drawable) {
GL2 gl = drawable.getGL().getGL2();
+ texture.enable(gl);
+ texture.bind(gl);
gl.glLoadIdentity();
gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
@@ -339,8 +343,7 @@ public class NBody{
gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
try {
InputStream textureStream = NBody.class.getResourceAsStream("particle.jpg");
- Texture texture = TextureIO.newTexture(textureStream, false, null);
- texture.enable(gl);
+ texture = TextureIO.newTexture(textureStream, false, null);
} catch (IOException e) {
e.printStackTrace();
} catch (GLException e) {
--
GitLab