Merge remote-tracking branch 'refs/remotes/origin/dev' into led-enhan…

…cements

machine_files/demo_man/config/config.yaml

@@ -35,31 +35,130 @@ images:
     demo_man_logo:
         target: dmd
 
-#window:
-#  width: 500
-#  height: 300
-#  minimum_width: 200
-#  minimum_height: 100
-#  borderless: false
-#  fullscreen: false
-#  rotation: 0
-#  icon: None
-#  title: Mission Pinball Framework
-#  show_cursor: false
-#  source_display: window
-#  dpi: 96
-#  scale_contents: true
+window:
+  width: 800
+  height: 600
+  minimum_width: 200
+  minimum_height: 100
+  borderless: false
+  fullscreen: false
+  rotation: 0
+  title: Demo Man
+  show_cursor: false
+  source_display: window
+  dpi: 96
+  scale_contents: true
 
 displays:
   window:
     width: 400
     height: 300
 
-screens:
+slides:
   boot:
+  - type: text
+    text: FADE IN
+    animations:
+      entrance:
+        - property: opacity
+          value: 1
+          duration: 1s
+          repeat: True
+        - property: opacity
+          value: 0
+          duration: 1s
+  - type: text
+    text: SIZE
+    color: ff0000
+    animations:
+      event1:
+        - property: font_size, x
+          value: 200, 300
+          repeat: True
+          duration: 3s
+          easing: in_out_sine
+        - property: font_size, x
+          value: 0, 100
+          duration: 3s
+          easing: in_out_sine
+  - type: text
+    text: POSITION WITH CUSTOM EASING
+    font_size: 50
+    y: 350
+    color: 00ff00
+    animations:
+      entrance:
+        - property: y
+          value: 0
+          repeat: True
+          duration: 2s
+          easing: out_bounce
+        - property: y
+          value: 350
+          duration: 0
+
+  slide2:
+    type: text
+    text: MPF BOOTY
+    animations:
+      entrance2:
+        property: x  # x, y, height, width, opacity, rotation?
+        start: 0
+        value: 99
+        duration: 1s
+        repeats: -1
+
+  slide3:
+    type: text
+    text: MPF BOOTY
+    animations:
+      entrance3: fade_in, multi
+
+  slide4:
     type: text
     text: MPF BOOTY
-#    x: 100
-#    y: 100
-#    pos: (100, 200)
-#    size: (100, 50)
+    animations:
+      entrance4: fade_in, multi
+      some_event4: multi
+
+  slide5:
+    type: text
+    text: MPF BOOTY
+    animations:
+      entrance5: fade_in, multi
+      event5:
+        property: x # x, y, height, width, opacity, rotation?
+        start: 0
+        value: 98
+        duration: 1s
+        repeats: -1
+
+keyboard:
+  g:
+    mc_event: event1
+  h:
+    mc_event: event2
+
+slide_player:
+  display_window_initialized:
+    slide: boot
+    target: window
+
+#animations:
+#  fade_in:
+#    property: opacity
+#    start: 0
+#    value: 1
+#    duration: 1s
+#    timing: with_previous
+#    repeats: 0
+#
+#  multi:
+#  - property: opacity
+#    value: 1
+#    duration: 1s
+#  - property: opacity
+#    value: 0
+#    duration: 100ms
+#    timing: after_previous
+#    repeats: -1

mpf/config_validator.py

@@ -486,9 +486,10 @@
 slide_player:
     slide: single|str|
     target: single|str|None
-    priority: single|int|0
+    priority: single|int|None
     show: single|bool|True
     force: single|bool|False
+    transition: ignore
 snux:
     flipper_enable_driver_number: single|int|c23
     diag_led_driver_number: single|str|c24
@@ -524,28 +525,75 @@
 timing:
     hz: single|int|30
     hw_thread_sleep_ms: single|int|1
+transitions:
+    push:
+        type: single|str|
+        direction: single|str|left
+        easing: single|str|out_quad
+        duration: single|secs|1
+    move_in:
+        type: single|str|
+        direction: single|str|left
+        easing: single|str|out_quad
+        duration: single|secs|1
+    move_out:
+        type: single|str|
+        direction: single|str|left
+        easing: single|str|out_quad
+        duration: single|secs|1
+    fade:
+        type: single|str|
+        duration: single|secs|1
+    swap:
+        type: single|str|
+        duration: single|secs|2
+    wipe:
+        type: single|str|
+    fade_back:
+        type: single|str|
+        duration: single|secs|2
+    rise_in:
+        type: single|str|
+        duration: single|secs|2
+    none:
+        type: ignore
+
+    # clearcolor
+    # fs
+    # vs
+
+
 widgets:
+    animations:
+        property: list|str|
+        value: list|str|
+        duration: single|secs|1
+        timing: single|str|after_previous
+        repeat: single|bool|False
+        easing: single|str|linear
     slide_frame:
         type: single|str|slide_frame
-        x: single|num|0
-        y: single|num|0
-        v_pos: single|str|center
-        h_pos: single|str|center
+        x: single|str|None
+        y: single|str|None
+        anchor_x: single|str|None
+        anchor_y: single|str|None
         opacity: single|float|1.0
         z: single|int|0
+        animations: ignore
 
         name: single|str|
         width: single|int|
         height: single|int|
 
     text:
         type: single|str|text
-        x: single|num|0
-        y: single|num|0
-        v_pos: single|str|center
-        h_pos: single|str|center
+        x: single|str|None
+        y: single|str|None
+        anchor_x: single|str|None
+        anchor_y: single|str|None
         opacity: single|float|1.0
         z: single|int|0
+        animations: ignore
 
         text: single|str|
         color: single|str|ffffffff
@@ -555,6 +603,8 @@
         italic: single|bool|False
         halign: single|str|center
         valign: single|str|middle
+        anchor_x: single|str|None
+        anchor_y: single|str|None
         padding_x: single|int|0
         padding_y: single|int|0
   #      text_size:
@@ -569,19 +619,21 @@
   #      unicode_errors:
     image:
         type: single|str|image
-        x: single|num|0
-        y: single|num|0
-        v_pos: single|str|center
-        h_pos: single|str|center
+        x: single|str|None
+        y: single|str|None
+        anchor_x: single|str|None
+        anchor_y: single|str|None
         opacity: single|float|1.0
+        z: single|int|0
+        animations: ignore
 
         allow_stretch: single|bool|False
         anim_delay: single|float|.25
         anim_loop: single|int|0
         color: single|str|ffffffff
         keep_ratio: single|bool|False
         nocache: single|bool|False
-        source: single|str|
+        image: single|str|
 
 widget_player:
     widget: list|str|