From 656783476ed333578b3ed85830a054101e933d76 Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Wed, 16 Mar 2011 21:19:27 +0000 Subject: [PATCH] * Attempt to fix ATI native crash with particles git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7006 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java | 4 ++++ engine/src/test/jme3test/effect/TestPointSprite.java | 2 +- engine/src/test/jme3test/light/TestEnvironmentMapping.java | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java b/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java index 6af931a61..f1351bdb2 100644 --- a/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java +++ b/engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java @@ -1522,6 +1522,10 @@ public class LwjglRenderer implements Renderer { tex.getAnisotropicFilter()); } } + + if (context.pointSprite) + return; // Attempt to fix glTexParameter crash for some ATI GPUs + // repeat modes switch (tex.getType()) { case ThreeDimensional: diff --git a/engine/src/test/jme3test/effect/TestPointSprite.java b/engine/src/test/jme3test/effect/TestPointSprite.java index d45d70326..e423b694b 100644 --- a/engine/src/test/jme3test/effect/TestPointSprite.java +++ b/engine/src/test/jme3test/effect/TestPointSprite.java @@ -55,7 +55,7 @@ public class TestPointSprite extends SimpleApplication { emit.setGravity(0); emit.setLowLife(60); emit.setHighLife(60); - emit.setStartVel(new Vector3f(0, 0, 0)); + emit.setInitialVelocity(new Vector3f(0, 0, 0)); emit.setImagesX(15); emit.setStartSize(0.05f); emit.setEndSize(0.05f); diff --git a/engine/src/test/jme3test/light/TestEnvironmentMapping.java b/engine/src/test/jme3test/light/TestEnvironmentMapping.java index d61504305..67b03e098 100644 --- a/engine/src/test/jme3test/light/TestEnvironmentMapping.java +++ b/engine/src/test/jme3test/light/TestEnvironmentMapping.java @@ -3,14 +3,10 @@ package jme3test.light; import com.jme3.app.SimpleApplication; import com.jme3.asset.TextureKey; import com.jme3.input.ChaseCamera; -import com.jme3.input.KeyInput; -import com.jme3.input.controls.ActionListener; -import com.jme3.input.controls.KeyTrigger; import com.jme3.material.Material; import com.jme3.math.Vector3f; import com.jme3.post.FilterPostProcessor; import com.jme3.post.filters.BloomFilter; -import com.jme3.renderer.RenderManager; import com.jme3.scene.Geometry; import com.jme3.scene.Node; import com.jme3.scene.Spatial;