diff --git a/baton_colle/__pycache__/batoncolle.cpython-39.pyc b/baton_colle/__pycache__/batoncolle.cpython-39.pyc new file mode 100644 index 0000000..1ccf31f Binary files /dev/null and b/baton_colle/__pycache__/batoncolle.cpython-39.pyc differ diff --git a/baton_colle/baton_colle-14.blend b/baton_colle/baton_colle-14.blend index 711ff80..615a120 100644 Binary files a/baton_colle/baton_colle-14.blend and b/baton_colle/baton_colle-14.blend differ diff --git a/baton_colle/baton_colle-14.blend1 b/baton_colle/baton_colle-14.blend1 new file mode 100644 index 0000000..711ff80 Binary files /dev/null and b/baton_colle/baton_colle-14.blend1 differ diff --git a/baton_colle/cine.py b/baton_colle/cine.py index 202c7da..d986f26 120000 --- a/baton_colle/cine.py +++ b/baton_colle/cine.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine.py \ No newline at end of file diff --git a/baton_colle/cine_about.py b/baton_colle/cine_about.py index df92645..519b0ea 120000 --- a/baton_colle/cine_about.py +++ b/baton_colle/cine_about.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_about.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_about.py \ No newline at end of file diff --git a/baton_colle/cine_config.xml b/baton_colle/cine_config.xml index ec48df5..3f38240 120000 --- a/baton_colle/cine_config.xml +++ b/baton_colle/cine_config.xml @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_config.xml \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_config.xml \ No newline at end of file diff --git a/baton_colle/cine_doc.py b/baton_colle/cine_doc.py index e936682..b407ec9 120000 --- a/baton_colle/cine_doc.py +++ b/baton_colle/cine_doc.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_doc.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_doc.py \ No newline at end of file diff --git a/cine_about.py b/cine_about.py index 146de6d..0f01c9d 100644 --- a/cine_about.py +++ b/cine_about.py @@ -44,6 +44,20 @@ def open(): scene.objects['About'].setVisible(True,True) + # Boutons < et > ("640x360", "960x540", "1280x720", "1920x1080") + if bge.render.getWindowWidth() <=640: + scene.objects['About_screen-down'].setVisible(False,True) + scene.objects['About_screen-down-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-down'].setVisible(True,True) + scene.objects['About_screen-down-colbox'].restorePhysics() + if bge.render.getWindowWidth() >= 1920: + scene.objects['About_screen-up'].setVisible(False,True) + scene.objects['About_screen-up-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-up'].setVisible(True,True) + scene.objects['About_screen-up-colbox'].restorePhysics() + def close(cont): if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : if scene.objects['About']['anim'] == True: @@ -99,7 +113,41 @@ def link(cont): def get_near_pos(array,value): array = np.asarray(array) idx = (np.abs(array-value)).argmin() - return idx + return idx + + +# def about_screen_up(cont): +# if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : +# screen_width_mode=[640, 960, 1280, 1920] +# screen_height_mode=[360, 540, 720,1080] +# screen_mode_txt=["640x360", "960x540", "1280x720", "1920x1080"] +# i = get_near_pos(screen_width_mode, bge.render.getWindowWidth()) +# if i>=0 and i<3 : +# screen_width=screen_width_mode[i+1] +# screen_height=screen_height_mode[i+1] +# scene.objects['About_screen']['Text']= "SCREEN SIZE : "+str(screen_width) +" x "+str(screen_height) +# bge.render.setWindowSize(screen_width,screen_height) + +# # Boutons < et > +# if screen_width <=640: +# scene.objects['About_screen-down'].setVisible(False,True) +# scene.objects['About_screen-down-colbox'].suspendPhysics (True) +# else: +# scene.objects['About_screen-down'].setVisible(True,True) +# scene.objects['About_screen-down-colbox'].restorePhysics() +# if screen_width >= 1920: +# scene.objects['About_screen-up'].setVisible(False,True) +# scene.objects['About_screen-up-colbox'].suspendPhysics (True) +# else: +# scene.objects['About_screen-up'].setVisible(True,True) +# scene.objects['About_screen-up-colbox'].restorePhysics() + +# # Maj du fichier de config (screen size : data/config/screen/width-> [0][3][0].text) +# rp_config_tree[0][3][0].text=str(screen_width) +# rp_config_tree[0][3][1].text=str(screen_height) +# buffer_xml = ET.tostring(rp_config_tree) +# with open("rp_config.xml", "wb") as f: +# f.write(buffer_xml) # Taille de l'écran + def screen_up(cont): @@ -114,6 +162,54 @@ def screen_up(cont): scene.objects['About_screen']['Text']= "Taille écran : "+str(screen_width) +" x "+str(screen_height) bge.render.setWindowSize(screen_width,screen_height) + # Boutons < et > + if screen_width <=640: + scene.objects['About_screen-down'].setVisible(False,True) + scene.objects['About_screen-down-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-down'].setVisible(True,True) + scene.objects['About_screen-down-colbox'].restorePhysics() + if screen_width >= 1920: + scene.objects['About_screen-up'].setVisible(False,True) + scene.objects['About_screen-up-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-up'].setVisible(True,True) + scene.objects['About_screen-up-colbox'].restorePhysics() + + +# def about_screen_down(cont): +# if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : +# screen_width_mode=[640, 960, 1280, 1920] +# screen_height_mode=[360, 540, 720,1080] +# screen_mode_txt=["640x360", "960x540", "1280x720", "1920x1080"] +# i = get_near_pos(screen_width_mode, bge.render.getWindowWidth()) +# if i>0 and i<=3 : +# screen_width=screen_width_mode[i-1] +# screen_height=screen_height_mode[i-1] +# scene.objects['About_screen']['Text']= "SCREEN SIZE : "+str(screen_width) +" x "+str(screen_height) +# bge.render.setWindowSize(screen_width,screen_height) + +# # Boutons < et > +# if screen_width <=640: +# scene.objects['About_screen-down'].setVisible(False,True) +# scene.objects['About_screen-down-colbox'].suspendPhysics (True) +# else: +# scene.objects['About_screen-down'].setVisible(True,True) +# scene.objects['About_screen-down-colbox'].restorePhysics() +# if screen_width >= 1920: +# scene.objects['About_screen-up'].setVisible(False,True) +# scene.objects['About_screen-up-colbox'].suspendPhysics (True) +# else: +# scene.objects['About_screen-up'].setVisible(True,True) +# scene.objects['About_screen-up-colbox'].restorePhysics() + +# # Maj du fichier de config (screen size : data/config/screen/width-> [0][3][0].text) +# rp_config_tree[0][3][0].text=str(screen_width) +# rp_config_tree[0][3][1].text=str(screen_height) +# buffer_xml = ET.tostring(rp_config_tree) +# with open("rp_config.xml", "wb") as f: +# f.write(buffer_xml) + # Taille de l'écran - def screen_down(cont): if cont.sensors['Click'].status == JUST_ACTIVATED and cont.sensors['MO'].positive : @@ -126,3 +222,18 @@ def screen_down(cont): screen_height=screen_height_mode[i-1] scene.objects['About_screen']['Text']= "Taille écran : "+str(screen_width) +" x "+str(screen_height) bge.render.setWindowSize(screen_width,screen_height) + + # Boutons < et > + if screen_width <=640: + scene.objects['About_screen-down'].setVisible(False,True) + scene.objects['About_screen-down-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-down'].setVisible(True,True) + scene.objects['About_screen-down-colbox'].restorePhysics() + if screen_width >= 1920: + scene.objects['About_screen-up'].setVisible(False,True) + scene.objects['About_screen-up-colbox'].suspendPhysics (True) + else: + scene.objects['About_screen-up'].setVisible(True,True) + scene.objects['About_screen-up-colbox'].restorePhysics() + diff --git a/hemomixer/cine.py b/hemomixer/cine.py index 202c7da..d986f26 120000 --- a/hemomixer/cine.py +++ b/hemomixer/cine.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine.py \ No newline at end of file diff --git a/hemomixer/cine_about.py b/hemomixer/cine_about.py index df92645..519b0ea 120000 --- a/hemomixer/cine_about.py +++ b/hemomixer/cine_about.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_about.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_about.py \ No newline at end of file diff --git a/hemomixer/cine_config.xml b/hemomixer/cine_config.xml index ec48df5..3f38240 120000 --- a/hemomixer/cine_config.xml +++ b/hemomixer/cine_config.xml @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_config.xml \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_config.xml \ No newline at end of file diff --git a/hemomixer/cine_doc.py b/hemomixer/cine_doc.py index e936682..b407ec9 120000 --- a/hemomixer/cine_doc.py +++ b/hemomixer/cine_doc.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_doc.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_doc.py \ No newline at end of file diff --git a/hemomixer/hemomixer-16.blend b/hemomixer/hemomixer-16.blend index 1e51d17..bc7e189 100644 Binary files a/hemomixer/hemomixer-16.blend and b/hemomixer/hemomixer-16.blend differ diff --git a/hemomixer/hemomixer-16.blend1 b/hemomixer/hemomixer-16.blend1 new file mode 100644 index 0000000..0e3776d Binary files /dev/null and b/hemomixer/hemomixer-16.blend1 differ diff --git a/pince_schrader/cine.py b/pince_schrader/cine.py index 202c7da..d986f26 120000 --- a/pince_schrader/cine.py +++ b/pince_schrader/cine.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine.py \ No newline at end of file diff --git a/pince_schrader/cine_about.py b/pince_schrader/cine_about.py index df92645..519b0ea 120000 --- a/pince_schrader/cine_about.py +++ b/pince_schrader/cine_about.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_about.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_about.py \ No newline at end of file diff --git a/pince_schrader/cine_config.xml b/pince_schrader/cine_config.xml index ec48df5..3f38240 120000 --- a/pince_schrader/cine_config.xml +++ b/pince_schrader/cine_config.xml @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_config.xml \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_config.xml \ No newline at end of file diff --git a/pince_schrader/cine_doc.py b/pince_schrader/cine_doc.py index e936682..b407ec9 120000 --- a/pince_schrader/cine_doc.py +++ b/pince_schrader/cine_doc.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_doc.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_doc.py \ No newline at end of file diff --git a/pince_schrader/pince_schrader-07.blend b/pince_schrader/pince_schrader-07.blend index 41185d9..538323e 100644 Binary files a/pince_schrader/pince_schrader-07.blend and b/pince_schrader/pince_schrader-07.blend differ diff --git a/pince_schrader/pince_schrader-07.blend1 b/pince_schrader/pince_schrader-07.blend1 new file mode 100644 index 0000000..41185d9 Binary files /dev/null and b/pince_schrader/pince_schrader-07.blend1 differ diff --git a/serrure_biometrique/cine.py b/serrure_biometrique/cine.py index 202c7da..d986f26 120000 --- a/serrure_biometrique/cine.py +++ b/serrure_biometrique/cine.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine.py \ No newline at end of file diff --git a/serrure_biometrique/cine_about.py b/serrure_biometrique/cine_about.py index df92645..519b0ea 120000 --- a/serrure_biometrique/cine_about.py +++ b/serrure_biometrique/cine_about.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_about.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_about.py \ No newline at end of file diff --git a/serrure_biometrique/cine_config.xml b/serrure_biometrique/cine_config.xml index ec48df5..3f38240 120000 --- a/serrure_biometrique/cine_config.xml +++ b/serrure_biometrique/cine_config.xml @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_config.xml \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_config.xml \ No newline at end of file diff --git a/serrure_biometrique/cine_doc.py b/serrure_biometrique/cine_doc.py index e936682..b407ec9 120000 --- a/serrure_biometrique/cine_doc.py +++ b/serrure_biometrique/cine_doc.py @@ -1 +1 @@ -/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic-player/cine_doc.py \ No newline at end of file +/home/phroy/Bureau/seriousgames/blender-edutech/git/kinematic_player/cine_doc.py \ No newline at end of file diff --git a/serrure_biometrique/serrure_biometrique-37.blend b/serrure_biometrique/serrure_biometrique-37.blend index b4a0d6d..435aff7 100644 Binary files a/serrure_biometrique/serrure_biometrique-37.blend and b/serrure_biometrique/serrure_biometrique-37.blend differ diff --git a/serrure_biometrique/serrure_biometrique-37.blend1 b/serrure_biometrique/serrure_biometrique-37.blend1 new file mode 100644 index 0000000..1ba54ca Binary files /dev/null and b/serrure_biometrique/serrure_biometrique-37.blend1 differ