diff options
Diffstat (limited to 'src/com/fourisland/fourpuzzle/Display.java')
-rwxr-xr-x | src/com/fourisland/fourpuzzle/Display.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/fourisland/fourpuzzle/Display.java b/src/com/fourisland/fourpuzzle/Display.java index cf1cb2d..a8c9a37 100755 --- a/src/com/fourisland/fourpuzzle/Display.java +++ b/src/com/fourisland/fourpuzzle/Display.java | |||
@@ -11,6 +11,7 @@ import com.fourisland.fourpuzzle.transition.MultidirectionalTransition; | |||
11 | import com.fourisland.fourpuzzle.transition.OutTransition; | 11 | import com.fourisland.fourpuzzle.transition.OutTransition; |
12 | import com.fourisland.fourpuzzle.transition.Transition; | 12 | import com.fourisland.fourpuzzle.transition.Transition; |
13 | import com.fourisland.fourpuzzle.transition.TransitionDirection; | 13 | import com.fourisland.fourpuzzle.transition.TransitionDirection; |
14 | import com.fourisland.fourpuzzle.transition.TransitionPair; | ||
14 | import com.fourisland.fourpuzzle.transition.TransitionUnsupportedException; | 15 | import com.fourisland.fourpuzzle.transition.TransitionUnsupportedException; |
15 | import com.fourisland.fourpuzzle.util.Renderable; | 16 | import com.fourisland.fourpuzzle.util.Renderable; |
16 | import java.awt.Color; | 17 | import java.awt.Color; |
@@ -208,7 +209,7 @@ public class Display { | |||
208 | } | 209 | } |
209 | 210 | ||
210 | private static Executor transitioner = Executors.newSingleThreadExecutor(); | 211 | private static Executor transitioner = Executors.newSingleThreadExecutor(); |
211 | public static void transition(final Transition out, final GameState gameState, final Transition in, boolean thread) | 212 | public static void transition(final OutTransition out, final GameState gameState, final InTransition in, boolean thread) |
212 | { | 213 | { |
213 | Runnable transitionCall = new Runnable() { | 214 | Runnable transitionCall = new Runnable() { |
214 | public void run() | 215 | public void run() |
@@ -237,6 +238,11 @@ public class Display { | |||
237 | } | 238 | } |
238 | } | 239 | } |
239 | 240 | ||
241 | public static void transition(TransitionPair trans, GameState gameState, boolean thread) | ||
242 | { | ||
243 | transition(trans.getOutTransition(), gameState, trans.getInTransition(), thread); | ||
244 | } | ||
245 | |||
240 | public static boolean isTransitionRunning() | 246 | public static boolean isTransitionRunning() |
241 | { | 247 | { |
242 | return transitionRunning; | 248 | return transitionRunning; |