vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Look and learn only display gps with videos and sounds

Browse Source
This commit is contained in:
Laurent Tourte
2024-06-06 11:41:35 +02:00
parent bbfafdb129
commit 25afa352dd
2 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/themes/kalulu_theme.tres
+12 -12
View File
File diff suppressed because one or more lines are too long
sources/look_and_learn/look_and_learn.gd
+35 -19
View File
@@ -48,10 +48,6 @@ func _ready() -> void:
func setup() -> void: func setup() -> void:
gp_list = Database.get_GP_for_lesson(lesson_nb, true, true) gp_list = Database.get_GP_for_lesson(lesson_nb, true, true)
grapheme_label.text = ""
for gp in gp_list:
grapheme_label.text += "%s" % gp.Grapheme
current_video = 0 current_video = 0
current_image_and_sound = 0 current_image_and_sound = 0
current_tracing = 0 current_tracing = 0
@@ -59,17 +55,27 @@ func setup() -> void:
images = [] images = []
sounds = [] sounds = []
videos = [] videos = []
var gp_display: = []
for gp in gp_list: for gp in gp_list:
var gp_image: = Database.get_gp_look_and_learn_image(gp) var gp_image: = Database.get_gp_look_and_learn_image(gp)
var gp_sound: = Database.get_gp_look_and_learn_sound(gp) var gp_sound: = Database.get_gp_look_and_learn_sound(gp)
if gp_image and gp_sound: var gp_video: = Database.get_gp_look_and_learn_video(gp)
if gp_image and gp_sound and gp_video:
images.append(gp_image) images.append(gp_image)
sounds.append(gp_sound) sounds.append(gp_sound)
var gp_video: = Database.get_gp_look_and_learn_video(gp)
if gp_video:
videos.append(gp_video) videos.append(gp_video)
gp_display.append(gp)
if gp_display.is_empty():
gp_display.append(gp_list[0])
grapheme_label.text = ""
for gp in gp_display:
grapheme_label.text += "%s" % gp.Grapheme
func play_videos() -> void: func play_videos() -> void:
if current_video >= videos.size(): if current_video >= videos.size():
@@ -102,16 +108,27 @@ func play_tracing() -> void:
func _on_grapheme_button_pressed() -> void: func _on_grapheme_button_pressed() -> void:
match current_button_pressed: var loop: = true
0: while loop:
animation_player.play("to_videos") match current_button_pressed:
current_button_pressed += 1 0:
1: if images.is_empty() or sounds.is_empty():
animation_player.play("to_images_and_sounds") current_button_pressed += 1
current_button_pressed += 1 else:
2: animation_player.play("to_videos")
animation_player.play("to_tracing") current_button_pressed += 1
current_button_pressed += 1 loop = false
1:
if videos.is_empty():
current_button_pressed += 1
else:
animation_player.play("to_images_and_sounds")
current_button_pressed += 1
loop = false
2:
animation_player.play("to_tracing")
current_button_pressed += 1
loop = false
func _on_video_stream_player_finished() -> void: func _on_video_stream_player_finished() -> void:
@@ -145,4 +162,3 @@ func _back_to_gardens() -> void:
func _on_garden_button_pressed() -> void: func _on_garden_button_pressed() -> void:
_back_to_gardens() _back_to_gardens()