[added] InputMultiplexer getProcessors().

[added] Skin load().
Ncl8 · Nov 6, 2011 · 58ad40c · 58ad40c
1 parent 1cfbc42
commit 58ad40c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/gdx/src/com/badlogic/gdx/InputMultiplexer.java b/gdx/src/com/badlogic/gdx/InputMultiplexer.java
@@ -44,6 +44,14 @@ public void clear () {
 		processors.clear();
 	}
 
+	public void setProcessors (ArrayList<InputProcessor> processors) {
+		this.processors = processors;
+	}
+
+	public ArrayList<InputProcessor> getProcessors () {
+		return processors;
+	}
+
 	public boolean keyDown (int keycode) {
 		for (int i = 0, n = processors.size(); i < n; i++)
 			if (processors.get(i).keyDown(keycode)) return true;

diff --git a/gdx/src/com/badlogic/gdx/math/Interpolation.java b/gdx/src/com/badlogic/gdx/math/Interpolation.java
@@ -1,7 +1,7 @@
 
 package com.badlogic.gdx.math;
 
-/** Function that takes a linear value in the range of 0-1 and outputs a (usually) non-linear interpolated value. */
+/** Takes a linear value in the range of 0-1 and outputs a (usually) non-linear, interpolated value. */
 public abstract class Interpolation {
 	abstract public float apply (float a);
 

diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java
@@ -184,16 +184,16 @@ public Skin () {
 
 	public Skin (FileHandle skinFile, FileHandle textureFile) {
 		texture = new Texture(textureFile);
-		try {
-			getJsonLoader(skinFile).fromJson(Skin.class, skinFile);
-		} catch (SerializationException ex) {
-			throw new SerializationException("Error reading file: " + skinFile, ex);
-		}
+		load(skinFile);
 	}
 
 	public Skin (FileHandle skinFile, Texture texture) {
 		this.texture = texture;
 		texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+		load(skinFile);
+	}
+
+	public void load (FileHandle skinFile) {
 		try {
 			getJsonLoader(skinFile).fromJson(Skin.class, skinFile);
 		} catch (SerializationException ex) {