From 96be22f5aac3bd8bc3d7002f5d21985dbb9caa4d Mon Sep 17 00:00:00 2001 From: Emanuel Rabina Date: Sat, 3 Feb 2024 18:15:12 +1300 Subject: [PATCH] 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 --- .../redhorizon/cli/mediaplayer/MediaPlayer.groovy | 2 -- .../net/ultraq/redhorizon/explorer/Explorer.groovy | 12 ++++++------ .../explorer/medialoaders}/AnimationLoader.groovy | 3 ++- .../explorer/medialoaders}/ImageLoader.groovy | 3 ++- .../explorer/medialoaders}/ImagesLoader.groovy | 3 ++- .../explorer/medialoaders}/MediaLoader.groovy | 2 +- .../explorer/medialoaders}/SoundLoader.groovy | 4 +++- .../explorer/medialoaders}/VideoLoader.groovy | 3 ++- 8 files changed, 18 insertions(+), 14 deletions(-) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/AnimationLoader.groovy (96%) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/ImageLoader.groovy (91%) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/ImagesLoader.groovy (95%) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/MediaLoader.groovy (96%) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/SoundLoader.groovy (93%) rename {redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media => redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders}/VideoLoader.groovy (96%) 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 index 22a05955..b4227949 100644 --- 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 index ab3a4c10..d2745770 100644 --- 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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/AnimationLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/AnimationLoader.groovy similarity index 96% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/AnimationLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/AnimationLoader.groovy index dcc9c740..8c668f96 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/AnimationLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImageLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/ImageLoader.groovy similarity index 91% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImageLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/ImageLoader.groovy index 0c815174..45a413c0 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImageLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImagesLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/ImagesLoader.groovy similarity index 95% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImagesLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/ImagesLoader.groovy index 75a09008..c1ea6496 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/ImagesLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/MediaLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/MediaLoader.groovy similarity index 96% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/MediaLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/MediaLoader.groovy index f6df6813..a146f0aa 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/MediaLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/SoundLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/SoundLoader.groovy similarity index 93% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/SoundLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/SoundLoader.groovy index 58b4f30a..75006ad9 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/SoundLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/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/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/VideoLoader.groovy b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/VideoLoader.groovy similarity index 96% rename from redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/VideoLoader.groovy rename to redhorizon-explorer/source/nz/net/ultraq/redhorizon/explorer/medialoaders/VideoLoader.groovy index 4f18a676..5f11d38c 100644 --- a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/media/VideoLoader.groovy +++ b/redhorizon-explorer/source/nz/net/ultraq/redhorizon/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