Fill mode optional

ultraq · Feb 10, 2024 · 6dbc370 · 6dbc370
1 parent b07c5e8
commit 6dbc370
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 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
@@ -22,7 +22,6 @@ import nz.net.ultraq.redhorizon.engine.graphics.GraphicsConfiguration
 import nz.net.ultraq.redhorizon.engine.input.KeyEvent
 import nz.net.ultraq.redhorizon.engine.scenegraph.Node
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.FullScreenContainer
-import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.FullScreenContainer.FillMode
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Sound
 import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Sprite
 import nz.net.ultraq.redhorizon.filetypes.ImageFile
@@ -72,7 +71,7 @@ class MediaPlayer extends Application {
 		logger.info('File details: {}', mediaFile)
 
 		var mediaNode = switch (mediaFile) {
-			case ImageFile -> new FullScreenContainer(fillMode: FillMode.ASPECT_RATIO).addChild(new Sprite(mediaFile))
+			case ImageFile -> new FullScreenContainer().addChild(new Sprite(mediaFile))
 			case SoundFile -> new Sound(mediaFile).attachScript(new SoundPlaybackScript())
 			default -> throw new UnsupportedOperationException("No media script for the associated file class of ${mediaFile}")
 		}

diff --git a/...engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/FullScreenContainer.groovy b/...engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/FullScreenContainer.groovy
@@ -61,7 +61,6 @@ class FullScreenContainer extends Node<FullScreenContainer> implements GraphicsE
 		bounds
 			.set(scene.window.renderResolution as Rectanglef)
 			.center()
-//		transform.translate(-bounds.lengthX() / 2 as float, -bounds.lengthY() / 2 as float)
 
 		// Update children to take up the full screen
 		children.each { child ->
@@ -103,13 +102,12 @@ class FullScreenContainer extends Node<FullScreenContainer> implements GraphicsE
 		@Override
 		void onSceneAdded(Scene scene) {
 
-//			bounds.set(
-//				parent.bounds.minX + 5 as float,
-//				parent.bounds.minY + 5 as float,
-//				parent.bounds.maxX - 5 as float,
-//				parent.bounds.maxY - 5 as float
-//			)
-			bounds.set(0, 0, 10, 10)
+			bounds.set(
+				parent.bounds.minX + 5 as float,
+				parent.bounds.minY + 5 as float,
+				parent.bounds.maxX - 5 as float,
+				parent.bounds.maxY - 5 as float
+			)
 			mesh = scene
 				.requestCreateOrGet(new MeshRequest(
 					MeshType.LINE_LOOP,
@@ -138,7 +136,8 @@ class FullScreenContainer extends Node<FullScreenContainer> implements GraphicsE
 				return
 			}
 
-			renderer.draw(mesh, transform, shader)
+			var globalTransform = getGlobalTransform()
+			renderer.draw(mesh, globalTransform, shader)
 		}
 	}
 }