From 53b7b026099c3e1b29d8981b7c3417c7808f84d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Fri, 4 Apr 2014 23:06:56 +0200 Subject: [PATCH] EventBus now using thread; +Textures; +Audio; Cleaner structure --- eclipse-config.epf | 171 --- org.eclipse.core.runtime.zip | Bin 44447 -> 0 bytes res/audio/shutter.ogg | Bin 0 -> 7784 bytes res/audio/wilderness.ogg | Bin 0 -> 1111419 bytes res/font/PolygonPixel5x7Standard.ttf | Bin 0 -> 34276 bytes res/font/PressStart2P.ttf | Bin 0 -> 82480 bytes res/img/kitten.png | Bin 0 -> 210970 bytes src/mightypork/rogue/App.java | 236 ++-- src/mightypork/rogue/AppAccess.java | 11 +- src/mightypork/rogue/AppAdapter.java | 12 +- src/mightypork/rogue/Config.java | 1 + src/mightypork/rogue/Const.java | 3 +- src/mightypork/rogue/Deferred.java | 21 + src/mightypork/rogue/MainLoop.java | 112 ++ src/mightypork/rogue/Res.java | 87 ++ src/mightypork/rogue/Resources.java | 33 - .../{sounds => audio}/BaseAudioPlayer.java | 14 +- .../AudioX.java => audio/DeferredAudio.java} | 43 +- .../rogue/{sounds => audio}/EffectPlayer.java | 8 +- .../rogue/{sounds => audio}/JointVolume.java | 2 +- .../rogue/{sounds => audio}/LoopPlayer.java | 18 +- src/mightypork/rogue/audio/NullAudio.java | 30 + src/mightypork/rogue/audio/SoundBank.java | 90 ++ .../rogue/{sounds => audio}/SoundSystem.java | 157 +-- src/mightypork/rogue/bus/ChildClient.java | 5 +- .../rogue/bus/events/ActionRequest.java | 33 + .../rogue/bus/events/KeyboardEvent.java | 4 +- .../rogue/bus/events/MouseButtonEvent.java | 4 +- .../rogue/bus/events/MouseMotionEvent.java | 6 +- .../rogue/bus/events/RequestType.java | 7 + .../rogue/bus/events/ScreenChangeEvent.java | 4 +- .../rogue/bus/events/ScreenRequestEvent.java | 28 + .../rogue/display/screens/ScreenRegistry.java | 22 - .../screenTextures/ScreenTextureTest.java | 6 - .../constraints/ElementHolder.java | 2 +- .../constraints/Renderable.java | 2 +- .../constraints/RenderableWithContext.java | 2 +- .../screens}/LayeredScreen.java | 2 +- .../{display => gui/screens}/Screen.java | 119 +- .../{display => gui/screens}/ScreenLayer.java | 4 +- .../rogue/gui/screens/ScreenRegistry.java | 55 + .../screens/screenBouncy/BouncyBox.java | 8 +- .../screenBouncy/LayerBouncyBoxes.java | 8 +- .../screens/screenBouncy/ScreenTestAnim.java} | 8 +- .../screenTextures/ScreenTextureTest.java | 104 ++ src/mightypork/rogue/input/InputSystem.java | 56 +- .../{display => render}/DisplaySystem.java | 17 +- src/mightypork/rogue/render/Render.java | 349 ++++++ .../{ => render}/textures/MultiTexture.java | 21 +- .../textures/TextureBank.java} | 23 +- .../rogue/render/textures/TxQuad.java | 91 ++ src/mightypork/rogue/sounds/NullAudio.java | 17 - .../rogue/tasks/TaskTakeScreenshot.java | 4 +- src/mightypork/rogue/textures/Render.java | 1032 ----------------- src/mightypork/rogue/textures/TxQuad.java | 70 -- .../utils/control/bus/BufferedHashSet.java | 130 +++ .../bus/{Handleable.java => Event.java} | 2 +- .../utils/control/bus/EventBus.java | 236 +++- .../utils/control/bus/EventChannel.java | 101 +- .../control/bus/events/DestroyEvent.java | 4 +- .../utils/control/bus/events/UpdateEvent.java | 4 +- .../utils/control/timing/TimerFps.java | 1 - src/mightypork/utils/logging/Log.java | 31 + .../utils/math/animation/AnimDouble.java | 10 +- .../utils/math/animation/AnimDoubleDeg.java | 2 +- .../utils/math/animation/AnimDoubleRad.java | 2 +- .../math/constraints/ConstraintFactory.java | 21 +- src/mightypork/utils/math/coord/Rect.java | 26 +- 68 files changed, 1845 insertions(+), 1887 deletions(-) delete mode 100644 eclipse-config.epf delete mode 100644 org.eclipse.core.runtime.zip create mode 100644 res/audio/shutter.ogg create mode 100644 res/audio/wilderness.ogg create mode 100644 res/font/PolygonPixel5x7Standard.ttf create mode 100644 res/font/PressStart2P.ttf create mode 100644 res/img/kitten.png create mode 100644 src/mightypork/rogue/Deferred.java create mode 100644 src/mightypork/rogue/MainLoop.java create mode 100644 src/mightypork/rogue/Res.java delete mode 100644 src/mightypork/rogue/Resources.java rename src/mightypork/rogue/{sounds => audio}/BaseAudioPlayer.java (72%) rename src/mightypork/rogue/{sounds/AudioX.java => audio/DeferredAudio.java} (88%) rename src/mightypork/rogue/{sounds => audio}/EffectPlayer.java (73%) rename src/mightypork/rogue/{sounds => audio}/JointVolume.java (95%) rename src/mightypork/rogue/{sounds => audio}/LoopPlayer.java (82%) create mode 100644 src/mightypork/rogue/audio/NullAudio.java create mode 100644 src/mightypork/rogue/audio/SoundBank.java rename src/mightypork/rogue/{sounds => audio}/SoundSystem.java (56%) create mode 100644 src/mightypork/rogue/bus/events/ActionRequest.java create mode 100644 src/mightypork/rogue/bus/events/RequestType.java create mode 100644 src/mightypork/rogue/bus/events/ScreenRequestEvent.java delete mode 100644 src/mightypork/rogue/display/screens/ScreenRegistry.java delete mode 100644 src/mightypork/rogue/display/screens/screenTextures/ScreenTextureTest.java rename src/mightypork/rogue/{display => gui}/constraints/ElementHolder.java (97%) rename src/mightypork/rogue/{display => gui}/constraints/Renderable.java (75%) rename src/mightypork/rogue/{display => gui}/constraints/RenderableWithContext.java (89%) rename src/mightypork/rogue/{display => gui/screens}/LayeredScreen.java (96%) rename src/mightypork/rogue/{display => gui/screens}/Screen.java (82%) rename src/mightypork/rogue/{display => gui/screens}/ScreenLayer.java (89%) create mode 100644 src/mightypork/rogue/gui/screens/ScreenRegistry.java rename src/mightypork/rogue/{display => gui}/screens/screenBouncy/BouncyBox.java (88%) rename src/mightypork/rogue/{display => gui}/screens/screenBouncy/LayerBouncyBoxes.java (83%) rename src/mightypork/rogue/{display/screens/screenBouncy/TestLayeredScreen.java => gui/screens/screenBouncy/ScreenTestAnim.java} (80%) create mode 100644 src/mightypork/rogue/gui/screens/screenTextures/ScreenTextureTest.java rename src/mightypork/rogue/{display => render}/DisplaySystem.java (90%) create mode 100644 src/mightypork/rogue/render/Render.java rename src/mightypork/rogue/{ => render}/textures/MultiTexture.java (84%) rename src/mightypork/rogue/{textures/TextureRegistry.java => render/textures/TextureBank.java} (83%) create mode 100644 src/mightypork/rogue/render/textures/TxQuad.java delete mode 100644 src/mightypork/rogue/sounds/NullAudio.java delete mode 100644 src/mightypork/rogue/textures/Render.java delete mode 100644 src/mightypork/rogue/textures/TxQuad.java create mode 100644 src/mightypork/utils/control/bus/BufferedHashSet.java rename src/mightypork/utils/control/bus/{Handleable.java => Event.java} (88%) diff --git a/eclipse-config.epf b/eclipse-config.epf deleted file mode 100644 index ca92d5b..0000000 --- a/eclipse-config.epf +++ /dev/null @@ -1,171 +0,0 @@ -#Tue Apr 01 09:43:03 CEST 2014 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -/instance/org.eclipse.jdt.ui/cleanup.add_missing_methods=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=