From f3afd3cd3be302c9b9cc3b6ec56cf032817e00a4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 26 Apr 2011 19:24:19 +0200
Subject: sync w/ jogl e007bb306124411e0232e51d16aa493cbd361f74

---
 src/demos/particles/engine/Engine.java      | 5 +++--
 src/demos/particles/engine/GLComponent.java | 2 +-
 src/demos/particles/engine/Particle.java    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/demos/particles')

diff --git a/src/demos/particles/engine/Engine.java b/src/demos/particles/engine/Engine.java
index d769457..d443ac2 100755
--- a/src/demos/particles/engine/Engine.java
+++ b/src/demos/particles/engine/Engine.java
@@ -37,6 +37,7 @@
 package demos.particles.engine;
 
 import javax.media.opengl.*;
+
 import com.jogamp.opengl.util.texture.*;
 import java.net.*;
 import java.util.*;
@@ -78,12 +79,12 @@ public class Engine {
     }
   }
     
-  public void init() {               
+  public void init(GL gl) {               
     try {
       ClassLoader c1 = this.getClass().getClassLoader();
       URL url = c1.getResource(path);
       texture = TextureIO.newTexture(url, false, null);
-      texture.enable();
+      texture.enable(gl);
     }
     catch(IOException e) {
       e.printStackTrace();
diff --git a/src/demos/particles/engine/GLComponent.java b/src/demos/particles/engine/GLComponent.java
index 7194861..46a0940 100755
--- a/src/demos/particles/engine/GLComponent.java
+++ b/src/demos/particles/engine/GLComponent.java
@@ -106,7 +106,7 @@ public class GLComponent extends GLCanvas implements GLEventListener {
         
         animator.start();
         
-        engine.init();
+        engine.init(gl);
         
     }    
     
diff --git a/src/demos/particles/engine/Particle.java b/src/demos/particles/engine/Particle.java
index d9858dd..81fbe25 100755
--- a/src/demos/particles/engine/Particle.java
+++ b/src/demos/particles/engine/Particle.java
@@ -58,7 +58,7 @@ public class Particle {
     
   public void draw(GL2 gl, Texture texture, RGBA tendToColor) {
     adjust(tendToColor);
-    texture.bind();
+    texture.bind(gl);
     gl.glColor4f(rgba.r,rgba.g,rgba.b,rgba.a);
         
     gl.glBegin(GL2.GL_QUADS);
-- 
cgit v1.2.3