Let scripts define the delegate themselves

ultraq · Feb 3, 2024 · 56524f5 · 56524f5
1 parent 96be22f
commit 56524f5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 79 deletions.
diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/ImageScript.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/ImageScript.groovy
@@ -17,14 +17,18 @@
 package nz.net.ultraq.redhorizon.cli.mediaplayer
 
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
-import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.SpriteScript
+import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.Sprite
+import nz.net.ultraq.redhorizon.engine.scripting.Script
 
 /**
  * A script to make a sprite node behave as a full-screen image.
  *
  * @author Emanuel Rabina
  */
-class ImageScript extends SpriteScript {
+class ImageScript extends Script<Sprite> {
+
+	@Delegate
+	private final Sprite sprite = scriptable
 
 	@Override
 	void onSceneAdded(Scene scene) {

diff --git a/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/SoundPlaybackScript.groovy b/redhorizon-cli/source/nz/net/ultraq/redhorizon/cli/mediaplayer/SoundPlaybackScript.groovy
@@ -18,7 +18,8 @@ package nz.net.ultraq.redhorizon.cli.mediaplayer
 
 import nz.net.ultraq.redhorizon.engine.input.KeyControl
 import nz.net.ultraq.redhorizon.engine.scenegraph.Scene
-import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.SoundEffectScript
+import nz.net.ultraq.redhorizon.engine.scenegraph.nodes.SoundEffect
+import nz.net.ultraq.redhorizon.engine.scripting.Script
 
 import static org.lwjgl.glfw.GLFW.GLFW_KEY_SPACE
 
@@ -27,7 +28,10 @@ import static org.lwjgl.glfw.GLFW.GLFW_KEY_SPACE
  *
  * @author Emanuel Rabina
  */
-class SoundPlaybackScript extends SoundEffectScript {
+class SoundPlaybackScript extends Script<SoundEffect> {
+
+	@Delegate
+	private final SoundEffect soundEffect = scriptable
 
 	@Override
 	void onSceneAdded(Scene scene) {

diff --git a/...n-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/SoundEffectScript.groovy b/...n-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/SoundEffectScript.groovy
diff --git a/...orizon-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/SpriteScript.groovy b/...orizon-engine/source/nz/net/ultraq/redhorizon/engine/scenegraph/nodes/SpriteScript.groovy
diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scripting/Script.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scripting/Script.groovy
@@ -18,6 +18,8 @@ package nz.net.ultraq.redhorizon.engine.scripting
 
 import nz.net.ultraq.redhorizon.engine.scenegraph.SceneEvents
 
+import groovy.transform.PackageScope
+
 /**
  * A script is a piece of code attached to an entity to customize its behaviour.
  *
@@ -31,6 +33,7 @@ abstract class Script<T extends Scriptable> implements SceneEvents {
 	 * Attach the script target to this script, allowing it to act as a delegate
 	 * within other script methods.
 	 */
+	@PackageScope
 	Script<T> attachScriptable(T scriptable) {
 
 		this.scriptable = scriptable

diff --git a/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scripting/Scriptable.groovy b/redhorizon-engine/source/nz/net/ultraq/redhorizon/engine/scripting/Scriptable.groovy
@@ -17,7 +17,7 @@
 package nz.net.ultraq.redhorizon.engine.scripting
 
 /**
- * Any class that can have a script attached to customize its behaviour.
+ * A class that can have a script attached to customize its behaviour.
  *
  * @author Emanuel Rabina
  */