Merge pull request #135 from junkdog/master

ParticleEditor: delta multiplier and simpler new emitters.

diff --combined extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
index 4148299,11c64f2..eb82a72
--- 1/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
--- 2/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
+++ b/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java
@@@ -71,6 -71,7 +71,7 @@@ public class ParticleEditor extends JFr
        OrthographicCamera textCamera;\r
        NumericValue pixelsPerMeter;\r
        NumericValue zoomLevel;\r
+       NumericValue deltaMultiplier;\r
  \r
        float pixelsPerMeterPrev;\r
        float zoomLevelPrev;\r
@@@ -103,6 -104,7 +104,7 @@@
                                editRowsPanel.removeAll();\r
                                addEditorRow(new NumericPanel(pixelsPerMeter, "Pixels per meter", ""));\r
                                addEditorRow(new NumericPanel(zoomLevel, "Zoom level", ""));\r
+                               addEditorRow(new NumericPanel(deltaMultiplier, "Delta multiplier", ""));\r
  \r
                                rowsPanel.removeAll();\r
                                ParticleEmitter emitter = getEmitter();\r
@@@ -322,10 -324,14 +324,14 @@@
                        zoomLevel = new NumericValue();\r
                        zoomLevel.setValue(1.0f);\r
                        zoomLevel.setAlwaysActive(true);\r
+                       \r
+                       deltaMultiplier = new NumericValue();\r
+                       deltaMultiplier.setValue(1.0f);\r
+                       deltaMultiplier.setAlwaysActive(true);\r
  \r
                        font = new BitmapFont(Gdx.files.getFileHandle("default.fnt", FileType.Internal), Gdx.files.getFileHandle("default.png",\r
                                FileType.Internal), true);\r
-                       effectPanel.newEmitter("Untitled", true);\r
+                       effectPanel.newExampleEmitter("Untitled", true);\r
                        // if (resources.openFile("/editor-bg.png") != null) bgImage = new Image(gl, "/editor-bg.png");\r
                        Gdx.input.setInputProcessor(this);\r
                }\r
@@@ -350,7 -356,7 +356,7 @@@
                        int viewWidth = Gdx.graphics.getWidth();\r
                        int viewHeight = Gdx.graphics.getHeight();\r
  \r
-                       float delta = Gdx.graphics.getDeltaTime();\r
+                       float delta = Math.max(0, Gdx.graphics.getDeltaTime() * deltaMultiplier.getValue());\r
  \r
                        Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
  \r
@@@ -366,7 -372,7 +372,7 @@@
                                zoomLevelPrev = zoomLevel.getValue();\r
                                pixelsPerMeterPrev = pixelsPerMeter.getValue();\r
                        }\r
- \r
+                       \r
                        spriteBatch.setProjectionMatrix(worldCamera.combined);\r
  \r
                        spriteBatch.begin();\r
@@@ -458,9 -464,6 +464,9 @@@
                }\r
  \r
                public boolean touchUp (int x, int y, int pointer, int button) {\r
 +                      ParticleEditor.this.dispatchEvent(new WindowEvent(ParticleEditor.this, WindowEvent.WINDOW_LOST_FOCUS));\r
 +                      ParticleEditor.this.dispatchEvent(new WindowEvent(ParticleEditor.this, WindowEvent.WINDOW_GAINED_FOCUS));\r
 +                      ParticleEditor.this.requestFocusInWindow();\r
                        return false;\r
                }\r
  \r