fixed gwt backend, updated to 2.5.0. Typed arrays clashed, ParticleEffect emu didn...

diff --git a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gdx_backends_gwt.gwt.xml b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gdx_backends_gwt.gwt.xml
index 36b7014..bc67686 100644 (file)
--- a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gdx_backends_gwt.gwt.xml
+++ b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gdx_backends_gwt.gwt.xml
@@ -4,7 +4,7 @@
        <inherits name='com.google.gwt.user.theme.chrome.Chrome'/>\r
        \r
        <inherits name="com.badlogic.gdx" />\r
-       <inherits name="com.google.gwt.typedarrays.TypedArrays" />\r
+       <inherits name="com.google.gwt.typedarrays.CustomTypedArrays" />\r
        <inherits name="com.google.gwt.webgl.WebGL" />\r
        <inherits name="com.badlogic.gwtref.GwtReflect"/>\r
 \r

diff --git a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/graphics/g2d/ParticleEffect.java b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
index 4bfa49b..5928e4a 100644 (file)
--- a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
+++ b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
@@ -48,6 +48,10 @@ public class ParticleEffect implements Disposable {
                        emitters.get(i).start();\r
        }\r
 \r
+       public void reset () {\r
+               for (int i = 0, n = emitters.size; i < n; i++)\r
+                       emitters.get(i).reset();\r
+       }\r
        public void update (float delta) {\r
                for (int i = 0, n = emitters.size; i < n; i++)\r
                        emitters.get(i).update(delta);\r

diff --git a/backends/gdx-backends-gwt/src/com/google/gwt/typedarrays/TypedArrays.gwt.xml b/backends/gdx-backends-gwt/src/com/google/gwt/typedarrays/TypedArrays.gwt.xml
deleted file mode 100644 (file)
index b45b4f7..0000000
--- a/backends/gdx-backends-gwt/src/com/google/gwt/typedarrays/TypedArrays.gwt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">\r
-<module>\r
-  <inherits name="com.google.gwt.core.Core"/>\r
-</module>\r

diff --git a/backends/gdx-backends-gwt/src/com/google/gwt/webgl/WebGL.gwt.xml b/backends/gdx-backends-gwt/src/com/google/gwt/webgl/WebGL.gwt.xml
index e22fe39..96adac3 100644 (file)
--- a/backends/gdx-backends-gwt/src/com/google/gwt/webgl/WebGL.gwt.xml
+++ b/backends/gdx-backends-gwt/src/com/google/gwt/webgl/WebGL.gwt.xml
@@ -3,5 +3,5 @@
 <module>\r
   <inherits name="com.google.gwt.user.User"/>\r
   <inherits name="com.google.gwt.canvas.Canvas"/>\r
-  <inherits name="com.google.gwt.typedarrays.TypedArrays"/>\r
+  <inherits name="com.google.gwt.typedarrays.CustomTypedArrays"/>\r
 </module>\r

diff --git a/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffectPool.java b/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffectPool.java
index 2e69a2a..47dcce4 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffectPool.java
+++ b/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffectPool.java
@@ -41,6 +41,13 @@ public class ParticleEffectPool extends Pool<PooledEffect> {
                PooledEffect (ParticleEffect effect) {\r
                        super(effect);\r
                }\r
+               \r
+               \r
+\r
+               @Override\r
+               public void reset () {\r
+                       super.reset();\r
+               }\r
 \r
                public void free () {\r
                        ParticleEffectPool.this.free(this);\r