diff --git a/portail_coulissant/porcou.py b/portail_coulissant/porcou.py index 29ba219..f5ed8b1 100644 --- a/portail_coulissant/porcou.py +++ b/portail_coulissant/porcou.py @@ -38,6 +38,9 @@ ACTIVATE = bge.logic.KX_INPUT_ACTIVE ############################################################################### def init(cont): + if cont.sensors['Init'].positive == False: # 1 seule fois + return False + twin.manip_init() # Manipulation du modèle 3D twin.cmd_init() # Commandes diff --git a/portail_coulissant/portail_coulissant-14.blend b/portail_coulissant/portail_coulissant-14.blend index 42670e5..7dace27 100644 Binary files a/portail_coulissant/portail_coulissant-14.blend and b/portail_coulissant/portail_coulissant-14.blend differ diff --git a/twin.py b/twin.py index 6b7871a..1464f3b 100644 --- a/twin.py +++ b/twin.py @@ -333,11 +333,11 @@ def manip_reset(): scene.objects['System'].worldPosition.x = scene.objects['System']['init_lx'] scene.objects['System'].worldPosition.y = scene.objects['System']['init_ly'] scene.objects['System'].worldPosition.z = scene.objects['System']['init_lz'] - for objet in scene.objects['System']['objects'] : - scene.objects[objet].setVisible(True,False) - scene.objects[objet].restorePhysics() - if objet+"_Lines.GP" in scene.objects: - scene.objects[objet+"_Lines.GP"].setVisible(True,False) + # for objet in scene.objects['System']['objects'] : + # scene.objects[objet].setVisible(True,False) + # scene.objects[objet].restorePhysics() + # if objet+"_Lines.GP" in scene.objects: + # scene.objects[objet+"_Lines.GP"].setVisible(True,False) ## # Position de départ pour la manipulation de la vue @@ -434,7 +434,7 @@ def python_validation(file): stdout = pylint_stdout.read() stderr = pylint_stderr.read() if " error (" in stdout: # Présence d'erreur - print(stdout) + print(stdout) # Affichage console return False else: return True diff --git a/twin_about.py b/twin_about.py index ee8488e..8b1a696 100644 --- a/twin_about.py +++ b/twin_about.py @@ -62,6 +62,10 @@ def open(): scene.objects['About_screen-up'].setVisible(True,True) scene.objects['About_screen-up-colbox'].restorePhysics() +## +# Fermer +## + def close(cont): if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : scene.active_camera = scene.objects["Camera"] diff --git a/twin_config.xml b/twin_config.xml index 7ea4457..2f742d8 100644 --- a/twin_config.xml +++ b/twin_config.xml @@ -1,6 +1,6 @@ - 1565 - 928 + 1339 + 753 \ No newline at end of file diff --git a/twin_doc.py b/twin_doc.py index 5750992..da8c6e9 100644 --- a/twin_doc.py +++ b/twin_doc.py @@ -181,10 +181,6 @@ def init(): def open(): # Placer la tablette - # scene.objects['Doc'].worldPosition = [0, -21, 15.75] - # scene.objects['Doc'].worldPosition = [0, -21, 15.8] - # scene.objects['Doc_close'].color = color_doc_chap - # scene.objects['Doc'].setVisible(True,True) scene.active_camera = scene.objects["Camera-Doc"] scene.objects['Doc_close'].color= color_doc_fct scene.objects['Doc'].setVisible(True,True) @@ -224,15 +220,16 @@ def open(): # Fermer la documentation ## -def close(): - chap=("general", "system", "python") - for page in chap: - scene.objects["Doc_chap-"+page].setVisible(False,True) - scene.objects["Doc_chap-"+page].worldPosition.x = scene.objects["Doc_chap-"+page]['init_lx'] - scene.objects["Doc_chap-"+page].worldPosition.y = scene.objects["Doc_chap-"+page]['init_ly'] - scene.objects["Doc_chap-"+page].worldPosition.z = scene.objects["Doc_chap-"+page]['init_lz'] - scene.objects['Doc'].setVisible(False,True) - scene.objects['Doc'].worldPosition = [35, -2, 2] +def close(cont): + if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : + scene.active_camera = scene.objects["Camera"] + chap=("general", "system", "python") + for page in chap: + scene.objects["Doc_chap-"+page].setVisible(False,True) + scene.objects["Doc_chap-"+page].worldPosition.x = scene.objects["Doc_chap-"+page]['init_lx'] + scene.objects["Doc_chap-"+page].worldPosition.y = scene.objects["Doc_chap-"+page]['init_ly'] + scene.objects["Doc_chap-"+page].worldPosition.z = scene.objects["Doc_chap-"+page]['init_lz'] + scene.objects['Doc'].setVisible(False,True) ## # Highlight @@ -396,7 +393,6 @@ def text_load(): doc_text= scene.addObject('Doc_text-l'+str(i+1), None, 0.00, True) doc_text.setParent(scene.objects['Doc']) doc_text.name = 'Doc_text-l'+str(i+1)+'-'+str(card) - print ("Création : "+'Doc_text-l'+str(i+1)+'-'+str(card)) doc_text.worldPosition.x = scene.objects['Doc_text-l'+str(i+1)+'-ref'].worldPosition.x doc_text.worldPosition.y = scene.objects['Doc_text-l'+str(i+1)+'-ref'].worldPosition.y doc_text.worldPosition.z = scene.objects['Doc_text-l'+str(i+1)+'-ref'].worldPosition.z