Move the media loaders alongside the explorer project that uses it

Will probably remove these in favour of scripts once that's all up and running
ultraq · Feb 3, 2024 · 96be22f · 96be22f
1 parent 7e2b224
commit 96be22f
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/MediaPlayer.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/MediaPlayer.groovy
@@ -20,7 +20,6 @@ import nz.net.ultraq.redhorizon.engine.Application
 import nz.net.ultraq.redhorizon.engine.audio.AudioConfiguration
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsConfiguration
 import nz.net.ultraq.redhorizon.engine.input.KeyEvent
-import nz.net.ultraq.redhorizon.engine.media.MediaLoader
 import nz.net.ultraq.redhorizon.engine.scenegraph.Node
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.SoundEffect
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Sprite
@@ -53,7 +52,6 @@ class MediaPlayer extends Application {
 
 	private final ResourceFile mediaFile
 	private final Palette palette
-	private MediaLoader mediaLoader
 	private Node media
 
 	/**

diff --git a/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/Explorer.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/Explorer.groovy
@@ -24,13 +24,13 @@ import nz.net.ultraq.redhorizon.engine.geometry.Dimension
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsConfiguration
 import nz.net.ultraq.redhorizon.engine.graphics.WindowMaximizedEvent
 import nz.net.ultraq.redhorizon.engine.input.KeyEvent
-import nz.net.ultraq.redhorizon.engine.media.AnimationLoader
-import nz.net.ultraq.redhorizon.engine.media.ImageLoader
-import nz.net.ultraq.redhorizon.engine.media.ImagesLoader
-import nz.net.ultraq.redhorizon.engine.media.MediaLoader
 import nz.net.ultraq.redhorizon.engine.media.Playable
-import nz.net.ultraq.redhorizon.engine.media.SoundLoader
-import nz.net.ultraq.redhorizon.engine.media.VideoLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.AnimationLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.ImageLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.ImagesLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.MediaLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.SoundLoader
+import nz.net.ultraq.redhorizon.explorer.medialoaders.VideoLoader
 import nz.net.ultraq.redhorizon.filetypes.AnimationFile
 import nz.net.ultraq.redhorizon.filetypes.ImageFile
 import nz.net.ultraq.redhorizon.filetypes.ImagesFile

diff --git a/...rizon/engine/media/AnimationLoader.groovy → ...lorer/medialoaders/AnimationLoader.groovy b/...rizon/engine/media/AnimationLoader.groovy → ...lorer/medialoaders/AnimationLoader.groovy
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsSystem
 import nz.net.ultraq.redhorizon.engine.input.InputEventStream
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.input.RemoveControlFunction
+import nz.net.ultraq.redhorizon.engine.media.Animation
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
 import nz.net.ultraq.redhorizon.engine.time.GameClock
 import nz.net.ultraq.redhorizon.filetypes.AnimationFile

diff --git a/...edhorizon/engine/media/ImageLoader.groovy → .../explorer/medialoaders/ImageLoader.groovy b/...edhorizon/engine/media/ImageLoader.groovy → .../explorer/medialoaders/ImageLoader.groovy
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
+import nz.net.ultraq.redhorizon.engine.media.Image
 import nz.net.ultraq.redhorizon.filetypes.ImageFile
 
 import groovy.transform.InheritConstructors

diff --git a/...dhorizon/engine/media/ImagesLoader.groovy → ...explorer/medialoaders/ImagesLoader.groovy b/...dhorizon/engine/media/ImagesLoader.groovy → ...explorer/medialoaders/ImagesLoader.groovy
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsSystem
 import nz.net.ultraq.redhorizon.engine.input.InputEventStream
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.input.RemoveControlFunction
+import nz.net.ultraq.redhorizon.engine.media.ImageStrip
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
 import nz.net.ultraq.redhorizon.filetypes.ImagesFile
 import nz.net.ultraq.redhorizon.filetypes.Palette

diff --git a/...edhorizon/engine/media/MediaLoader.groovy → .../explorer/medialoaders/MediaLoader.groovy b/...edhorizon/engine/media/MediaLoader.groovy → .../explorer/medialoaders/MediaLoader.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
 import nz.net.ultraq.redhorizon.filetypes.ResourceFile

diff --git a/...edhorizon/engine/media/SoundLoader.groovy → .../explorer/medialoaders/SoundLoader.groovy b/...edhorizon/engine/media/SoundLoader.groovy → .../explorer/medialoaders/SoundLoader.groovy
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
 import nz.net.ultraq.redhorizon.engine.input.InputEventStream
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.input.RemoveControlFunction
+import nz.net.ultraq.redhorizon.engine.media.Playable
+import nz.net.ultraq.redhorizon.engine.media.SoundTrack
 import nz.net.ultraq.redhorizon.engine.scenegraph.Node
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.SoundEffect

diff --git a/...edhorizon/engine/media/VideoLoader.groovy → .../explorer/medialoaders/VideoLoader.groovy b/...edhorizon/engine/media/VideoLoader.groovy → .../explorer/medialoaders/VideoLoader.groovy
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package nz.net.ultraq.redhorizon.engine.media
+package nz.net.ultraq.redhorizon.explorer.medialoaders
 
 import nz.net.ultraq.redhorizon.engine.graphics.GraphicsSystem
 import nz.net.ultraq.redhorizon.engine.input.InputEventStream
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.input.RemoveControlFunction
+import nz.net.ultraq.redhorizon.engine.media.Video
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
 import nz.net.ultraq.redhorizon.engine.time.GameClock
 import nz.net.ultraq.redhorizon.filetypes.VideoFile