[script] Example script rewritten to use the object system

1 files changed, 49 insertions, 55 deletions

diff --git a/themes/script/script.script b/themes/script/script.script
index 2480f022..1010a73d 100644
--- a/themes/script/script.script
+++ b/themes/script/script.script
@@ -1,11 +1,10 @@
 # This is an example plymouth plugin script
 
-SpriteWindowSetBackgroundTopColor(0.234, 0.43, 0.705);
-SpriteWindowSetBackgroundBottomColor(0.16, 0.25, 0.44);
+Window.SetBackgroundTopColor(0.234, 0.43, 0.705);
+Window.SetBackgroundBottomColor(0.16, 0.25, 0.44);
 
-logo.image = ImageNew("special://logo");
-logo.sprite = SpriteNew();
-SpriteSetImage(logo.sprite, logo.image);
+logo.image = Image("special://logo");
+logo.sprite = Sprite(logo.image);
 logo.opacity_angle = 0;
 
 fun refresh_callback ()
@@ -17,15 +16,15 @@ fun refresh_callback ()
         opacity = (MathCos(logo.opacity_angle) + 1) / 2;
         opacity *= 1 - min_opacity;
         opacity += min_opacity;
-        SpriteSetX (logo.sprite, SpriteWindowGetWidth()  / 2 - ImageGetWidth(logo.image)  / 2);
-        SpriteSetY (logo.sprite, SpriteWindowGetHeight() / 2 - ImageGetHeight(logo.image) / 2);
-        SpriteSetOpacity (logo.sprite, opacity);
+        logo.sprite.SetX (Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
+        logo.sprite.SetY (Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
+        logo.sprite.SetOpacity (opacity);
       }
     else
       {
-        SpriteSetX (logo.sprite, 0);
-        SpriteSetY (logo.sprite, 0);
-        SpriteSetOpacity (logo.sprite, 1);
+        logo.sprite.SetX (0);
+        logo.sprite.SetY (0);
+        logo.sprite.SetOpacity (1);
       }
   }
   
@@ -41,46 +40,43 @@ fun dialog_setup()
     local.lock;
     local.entry;
     
-    box.image = ImageNew("box.png");
-    lock.image = ImageNew("lock.png");
-    entry.image = ImageNew("entry.png");
+    box.image = Image("box.png");
+    lock.image = Image("lock.png");
+    entry.image = Image("entry.png");
     
-    box.sprite = SpriteNew();
-    SpriteSetImage(box.sprite, box.image);
-    box.x = SpriteWindowGetWidth()  / 2 - ImageGetWidth (box.image)/2;
-    box.y = SpriteWindowGetHeight() / 2 - ImageGetHeight(box.image)/2;
+    box.sprite = Sprite(box.image);
+    box.x = Window.GetWidth()  / 2 - box.image.GetWidth ()/2;
+    box.y = Window.GetHeight() / 2 - box.image.GetHeight()/2;
     box.z = 10000;
-    SpriteSetPosition(box.sprite, box.x, box.y, box.z);
+    box.sprite.SetPosition(box.x, box.y, box.z);
     
-    lock.sprite = SpriteNew();
-    SpriteSetImage(lock.sprite, lock.image);
-    lock.x = box.x + ImageGetWidth(box.image)/2 - (ImageGetWidth(lock.image) + ImageGetWidth(entry.image)) / 2;
-    lock.y = box.y + ImageGetHeight(box.image)/2 - ImageGetHeight(lock.image)/2;
+    lock.sprite = Sprite(lock.image);
+    lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2;
+    lock.y = box.y + box.image.GetHeight()/2 - lock.image.GetHeight()/2;
     lock.z = box.z + 1;
-    SpriteSetPosition(lock.sprite, lock.x, lock.y, lock.z);
+    lock.sprite.SetPosition(lock.x, lock.y, lock.z);
     
-    entry.sprite = SpriteNew();
-    SpriteSetImage(entry.sprite, entry.image);
-    entry.x = lock.x + ImageGetWidth(lock.image);
-    entry.y = box.y + ImageGetHeight(box.image)/2 - ImageGetHeight(entry.image)/2;
+    entry.sprite = Sprite(entry.image);
+    entry.x = lock.x + lock.image.GetWidth();
+    entry.y = box.y + box.image.GetHeight()/2 - entry.image.GetHeight()/2;
     entry.z = box.z + 1;
-    SpriteSetPosition(entry.sprite, entry.x, entry.y, entry.z);
+    entry.sprite.SetPosition(entry.x, entry.y, entry.z);
     
     global.dialog.box = box;
     global.dialog.lock = lock;
     global.dialog.entry = entry;
-    global.dialog.bullet_image = ImageNew("bullet.png");
+    global.dialog.bullet_image = Image("bullet.png");
     dialog_opacity (1);
   }
     
 fun dialog_opacity(opacity)
   {
-    SpriteSetOpacity (dialog.box.sprite, opacity);
-    SpriteSetOpacity (dialog.lock.sprite, opacity);
-    SpriteSetOpacity (dialog.entry.sprite, opacity);
+    dialog.box.sprite.SetOpacity (opacity);
+    dialog.lock.sprite.SetOpacity (opacity);
+    dialog.entry.sprite.SetOpacity (opacity);
     for (index = 0; dialog.bullet[index]; index++)
       {
-        SpriteSetOpacity(dialog.bullet[index].sprite, opacity);
+        dialog.bullet[index].sprite.SetOpacity(opacity);
       }
   }
 
@@ -102,17 +98,16 @@ fun display_password_callback (prompt, bullets)
       {
         if (!dialog.bullet[index])
           {
-            dialog.bullet[index].sprite = SpriteNew();
-            SpriteSetImage(dialog.bullet[index].sprite, dialog.bullet_image);
-            dialog.bullet[index].x = dialog.entry.x + index * ImageGetWidth(dialog.bullet_image);
-            dialog.bullet[index].y = dialog.entry.y + ImageGetHeight(dialog.entry.image) / 2 - ImageGetHeight(dialog.bullet_image) / 2;
+            dialog.bullet[index].sprite = Sprite(dialog.bullet_image);
+            dialog.bullet[index].x = dialog.entry.x + index * dialog.bullet_image.GetWidth();
+            dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2;
             dialog.bullet[index].z = dialog.entry.z + 1;
-            SpriteSetPosition(dialog.bullet[index].sprite, dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z);
+            dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z);
           }
         if (index < bullets)
-          SpriteSetOpacity(dialog.bullet[index].sprite, 1);
+          dialog.bullet[index].sprite.SetOpacity(1);
         else
-          SpriteSetOpacity(dialog.bullet[index].sprite, 0);
+          dialog.bullet[index].sprite.SetOpacity(0);
       }
   }
 
@@ -121,27 +116,26 @@ PlymouthSetDisplayPasswordFunction(display_password_callback);
 
 #----------------------------------------- Progress Bar --------------------------------
 
-progress_box.image = ImageNew("progress_box.png");
-progress_box.sprite = SpriteNew();
-SpriteSetImage(progress_box.sprite, progress_box.image);
+progress_box.image = Image("progress_box.png");
+progress_box.sprite = Sprite(progress_box.image);
 
-progress_box.x = SpriteWindowGetWidth()  / 2 -    ImageGetWidth(progress_box.image)  / 2;
-progress_box.y = SpriteWindowGetHeight() * 0.75 - ImageGetHeight(progress_box.image) / 2;
-SpriteSetPosition(progress_box.sprite, progress_box.x, progress_box.y, 0);
+progress_box.x = Window.GetWidth()  / 2 -    progress_box.image.GetWidth()  / 2;
+progress_box.y = Window.GetHeight() * 0.75 - progress_box.image.GetHeight() / 2;
+progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
 
-progress_bar.original_image = ImageNew("progress_bar.png");
-progress_bar.sprite = SpriteNew();
+progress_bar.original_image = Image("progress_bar.png");
+progress_bar.sprite = Sprite();
 
-progress_bar.x = SpriteWindowGetWidth()  / 2 -        ImageGetWidth(progress_bar.original_image) / 2;
-progress_bar.y = SpriteWindowGetHeight() / 2 * 1.5  - ImageGetHeight(progress_box.image) / 2 + (ImageGetHeight(progress_box.image) - ImageGetHeight(progress_bar.original_image)) / 2;
-SpriteSetPosition(progress_bar.sprite, progress_bar.x, progress_bar.y, 1);
+progress_bar.x = Window.GetWidth()  / 2 -        progress_bar.original_image.GetWidth() / 2;
+progress_bar.y = Window.GetHeight() / 2 * 1.5  - progress_box.image.GetHeight() / 2 + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
+progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
 
 fun progress_callback (duration, progress)
   {
-    if (ImageGetWidth (progress_bar.image) != MathInt (ImageGetWidth (progress_bar.original_image) * progress))
+    if (progress_bar.image.GetWidth () != MathInt (progress_bar.original_image.GetWidth () * progress))
       {
-        progress_bar.image = ImageScale(progress_bar.original_image, ImageGetWidth(progress_bar.original_image) * progress, ImageGetHeight(progress_bar.original_image));
-        SpriteSetImage (progress_bar.sprite, progress_bar.image);
+        progress_bar.image = progress_bar.original_image.Scale(progress_bar.original_image.GetWidth(progress_bar.original_image) * progress, progress_bar.original_image.GetHeight());
+        progress_bar.sprite.SetImage (progress_bar.image);
       }
   }