diff --git a/baton_colle/baton_colle-15.blend b/baton_colle/baton_colle-15.blend index fe37054..52fba90 100644 Binary files a/baton_colle/baton_colle-15.blend and b/baton_colle/baton_colle-15.blend differ diff --git a/cine.py b/cine.py index a8c26fe..bff4179 100644 --- a/cine.py +++ b/cine.py @@ -97,12 +97,17 @@ def keyboard(cont): anim_pause() scene.objects['Pause'].setVisible(False,False) scene.objects['Pause-Hl'].setVisible(False,False) + scene.objects['Pause'].suspendPhysics() scene.objects['Play'].setVisible(True,False) + scene.objects['Play'].restorePhysics() else: anim_play() + scene.objects['Pause']['MO_desactive']=True # Rester avec Pause-Hl -> Desactive le MO scene.objects['Play'].setVisible(False,False) scene.objects['Play-Hl'].setVisible(False,False) + scene.objects['Play'].suspendPhysics() scene.objects['Pause'].setVisible(True,False) + scene.objects['Pause'].restorePhysics() # Touche H -> Cacher l'objet (hide) if JUST_ACTIVATED in keyboard.inputs[bge.events.HKEY].queue: @@ -144,6 +149,7 @@ def cmd_init(): # UI : Commands scene.objects['Play-Hl'].setVisible(False,False) scene.objects['Pause-Hl'].setVisible(False,False) + scene.objects['Play'].suspendPhysics() scene.objects['Reset-colors-Hl'].setVisible(False,False) scene.objects['Reset-view-Hl'].setVisible(False,False) scene.objects['Help-cmd-Hl'].setVisible(False,False) @@ -165,12 +171,14 @@ def cmd_hl(cont): # Activation if cont.sensors['MO'].status == JUST_ACTIVATED and scene.objects['Mecanism']['manip_mode']==0: - if obj.name!="Play" and obj.name!="Pause" and obj.name!="Play-Hl" and obj.name!="Pause-Hl": + + # Autres que Play et Pause + if obj.name!="Play" and obj.name!="Pause": obj.setVisible(False,True) scene.objects[obj.name+'-Hl'].setVisible(True,True) # obj.color = color_cmd_hl - # Play et pause + # Play ou Pause if obj.name=="Pause" or obj.name=="Play": if scene.objects['Mecanism']['anim'] == True: scene.objects['Pause'].setVisible(False,False) @@ -181,18 +189,28 @@ def cmd_hl(cont): # Désactivation if cont.sensors['MO'].status == JUST_RELEASED and scene.objects['Mecanism']['manip_mode']==0: - if obj.name!="Play" and obj.name!="Pause" and obj.name!="Play-Hl" and obj.name!="Pause-Hl": + + # Autres que Play et Pause + if obj.name!="Play" and obj.name!="Pause": scene.objects[obj.name+'-Hl'].setVisible(False,True) obj.setVisible(True,True) - # Play et pause + # Play ou Pause if obj.name=="Pause" or obj.name=="Play": - if scene.objects['Mecanism']['anim'] == True: - scene.objects['Pause-Hl'].setVisible(False,False) - scene.objects['Pause'].setVisible(True,False) + + # Rester avec Pause-Hl -> Désactive le MO + if scene.objects['Pause']['MO_desactive']==True: + scene.objects['Pause']['MO_desactive']=False else: - scene.objects['Play-Hl'].setVisible(False,False) - scene.objects['Play'].setVisible(True,False) + + # MO actif + if scene.objects['Mecanism']['anim'] == True: + if scene.objects['Pause']['MO_desactive']==False: + scene.objects['Pause-Hl'].setVisible(False,False) + scene.objects['Pause'].setVisible(True,False) + else: + scene.objects['Play-Hl'].setVisible(False,False) + scene.objects['Play'].setVisible(True,False) ## # Click sur les commandes @@ -202,20 +220,25 @@ def cmd_click(cont): obj = cont.owner if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive and scene.objects['Mecanism']['manip_mode']==0: - # Play et pause - if obj.name=="Pause" or obj.name=="Run": + # Play ou Pause + if obj.name=="Pause" or obj.name=="Play": # Pause if scene.objects['Mecanism']['anim'] == True: anim_pause() scene.objects['Pause'].setVisible(False,False) scene.objects['Pause-Hl'].setVisible(False,False) + scene.objects['Pause'].suspendPhysics() scene.objects['Play-Hl'].setVisible(True,False) + scene.objects['Play'].restorePhysics() else: # Play anim_play() + scene.objects['Pause']['MO_desactive']=True # Rester avec Pause-Hl -> Desactive le MO scene.objects['Play'].setVisible(False,False) scene.objects['Play-Hl'].setVisible(False,False) + scene.objects['Play'].suspendPhysics() scene.objects['Pause-Hl'].setVisible(True,False) + scene.objects['Pause'].restorePhysics() # Reset-colors if obj.name=="Reset-colors" : diff --git a/cine_config.xml b/cine_config.xml index 141158b..158b106 100644 --- a/cine_config.xml +++ b/cine_config.xml @@ -1,7 +1,7 @@ - 1548 - 871 + 1412 + 795 1 \ No newline at end of file diff --git a/hemomixer/hemomixer-17.blend b/hemomixer/hemomixer-17.blend index 28d4881..6c6b6e7 100644 Binary files a/hemomixer/hemomixer-17.blend and b/hemomixer/hemomixer-17.blend differ diff --git a/pince_schrader/pince_schrader-08.blend b/pince_schrader/pince_schrader-08.blend index 6deaab6..6edd690 100644 Binary files a/pince_schrader/pince_schrader-08.blend and b/pince_schrader/pince_schrader-08.blend differ diff --git a/serrure_biometrique/serrure_biometrique-38.blend b/serrure_biometrique/serrure_biometrique-38.blend index 250f263..c88a9fe 100644 Binary files a/serrure_biometrique/serrure_biometrique-38.blend and b/serrure_biometrique/serrure_biometrique-38.blend differ