Merge branch 'ihm' of https://git.unistra.fr/projet-integrateur-cmi2/cmi2 into ihm

cmi2/SaveSettings.gd

 extends Node
 
-var soundValue = 0
+var _settings = {
+	"audio":{
+		"son": null ,
+		"musique": null
+	},
+	"controles":{
+		"gauche": null,
+		"droite": null,
+		"saut": null
+	},
+	"jeu":{
+		"anim":null ,
+		"fullscreen":null
+		
+	}
+}
 
 var defaultSavePath = "res://defaultSettingsFile.cfg"
 var defaultConfig = ConfigFile.new()
@@ -14,14 +29,42 @@ var loadResponse = config.load(savePath)
 func _ready():
 	pass
 
-func saveValue(section, key):
-	config.set_value(section, key, soundValue)
+func saveValue( _settings):
+	for section in _settings.keys():
+		for key in _settings[section]:
+			config.set_value(section,key, _settings[section][key])
+			
 	config.save(savePath)
+		
 	
-func loadValue(section, key ):
-	soundValue = defaultConfig.get_value(section, key, soundValue)
-	return soundValue
+func loadValue():
+	#soundValue = defaultConfig.get_value(section, key, soundValue)
+	#return soundValue
+	var error = defaultConfig.load(defaultSavePath)
+	
+	if error != OK:
+		print("Erreur lors du chargement de %s" % error)
+		return null
+		
+	for section in _settings.keys():
+		for key in _settings[section]:
+			_settings[section][key] = defaultConfig.get_value(section,key, null)
+			
+	return _settings
+		
+	
+	
+	
+func loadDefaultValue():
+	var error = config.load(savePath)
+	
+	if error != OK:
+		print("Erreur lors du chargement de %s" % error)
+		return []
+		
+	for section in _settings.keys():
+		for key in _settings[section]:
+			_settings[section][key] = config.get_value(section,key, null)
+			
+	return _settings
 	
-func loadDefaultValue(section, key ):
-	soundValue = config.get_value(section, key, soundValue)
-	return soundValue

cmi2/defaultSettingsFile.cfg

-[Values]
+[audio]
 
-Son=42.0
+son=42.0
+musique=42.0
+
+[controles]
+
+gauche=1
+droite=1
+saut=1
+
+[jeu]
+
+anim=1
+fullscreen=0

cmi2/saveFile.cfg

-[Values]
+[audio]
 
-Son=90.0
+son=78.0
+musique=42.0
+
+[controles]
+
+gauche=1
+droite=1
+saut=1
+
+[jeu]
+
+anim=true
+fullscreen=true

cmi2/scenes/MainMenu.tscn

@@ -11675,6 +11675,9 @@ tracks/0/keys = {
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [node name="TextureRect2" type="TextureRect" parent="."]
 anchor_right = 1.0

cmi2/scenes/settings.gd

@@ -21,6 +21,9 @@ var music
 var musiclabel
 var musicimage
 
+var toggleFullscreen
+var animtoggle
+
 
 #sauvegarde
 var saveButton
@@ -28,7 +31,22 @@ var resetButton
 
 var settings
 
-
+var _settings = {
+	"audio":{
+		"son": null ,
+		"musique": null
+	},
+	"controles":{
+		"gauche": null,
+		"droite": null,
+		"saut": null
+	},
+	"jeu":{
+		"anim":null ,
+		"fullscreen":null
+		
+	}
+}
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -54,6 +72,9 @@ func _ready():
 
 	saveButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/BottomButtons/apply
 	resetButton = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideMenu/VBoxContainer/resetButton/button
+
+	toggleFullscreen = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/ecranToggle
+	animtoggle = $SettingsFullWindow/VBoxContainer/main/HBoxContainer/AsideDetails/content/scrollContainer/HBoxContainer/listMenu/jeu/animToggle
 	
 	sound.connect("value_changed", self, "on_sound_slider_slided")
 	music.connect("value_changed", self, "on_music_slider_slided")
@@ -67,17 +88,37 @@ func _ready():
 	saveButton.connect("pressed", self, "savePressed")
 	resetButton.connect("pressed", self, "loadPressed")
 	
+	toggleFullscreen.connect("toggled",self, "fullScreenOn")
+	
 	#valeurs par defaut
-	sound.value = get_node("/root/SaveSettings").loadDefaultValue("Values", "Son")
+	_settings = get_node("/root/SaveSettings").loadDefaultValue()
+	
+	sound.value = _settings.audio.son
+	music.value = _settings.audio.musique 
+	animtoggle.pressed = _settings.jeu.anim
+	toggleFullscreen.pressed = _settings.jeu.fullscreen
+	
+	
 	
 
 func savePressed():
-	get_node("/root/SaveSettings").soundValue = sound.value
-	get_node("/root/SaveSettings").saveValue("Values", "Son")
+	_settings.audio.son = sound.value
+	_settings.audio.musique = music.value
+	_settings.jeu.anim = animtoggle.pressed
+	_settings.jeu.fullscreen = toggleFullscreen.pressed
+	
+	get_node("/root/SaveSettings").saveValue(_settings)
 	print("ok")
 
 func loadPressed():
-	sound.value = get_node("/root/SaveSettings").loadValue("Values", "Son")
+	_settings = get_node("/root/SaveSettings").loadValue()
+	
+	sound.value = _settings.audio.son
+	music.value = _settings.audio.musique 
+	animtoggle.pressed = _settings.jeu.anim
+	toggleFullscreen.pressed = _settings.jeu.fullscreen
+	#toggleFullscreen.pressed = get_node("/root/SaveSettings").loadValue("Values", "FullScreen")
+
 
 func settings_menu_button_pressed(button_name):
 	var globals = get_node("/root/Globals")
@@ -141,3 +182,7 @@ func on_sound_slider_slided(value):
 func on_music_slider_slided(value):
 	on_slider_slided("music")
 	
+func fullScreenOn(_value):
+	print(toggleFullscreen.pressed)
+	OS.window_fullscreen = !OS.window_fullscreen
+