diff --git a/monte_charge/montchg.py b/monte_charge/montchg.py index f4ed3ad..2b9e91d 100644 --- a/monte_charge/montchg.py +++ b/monte_charge/montchg.py @@ -245,13 +245,12 @@ def system_reset (): scene.objects['Led niveau 1-on'].setVisible(False,False) # Cabine - # applyRotationTo(scene.objects['System'], 0, 0, 0) - scene.objects['Cabine'].worldPosition.x = scene.objects['Cabine']['init_lx'] - scene.objects['Cabine'].worldPosition.y = scene.objects['Cabine']['init_ly'] - scene.objects['Cabine'].worldPosition.z = scene.objects['Cabine']['init_lz'] - scene.objects['Contrepoids'].worldPosition.x = scene.objects['Contrepoids']['init_lx'] - scene.objects['Contrepoids'].worldPosition.y = scene.objects['Contrepoids']['init_ly'] - scene.objects['Contrepoids'].worldPosition.z = scene.objects['Contrepoids']['init_lz'] + scene.objects['Cabine'].worldPosition.x = scene.objects['Cabine']['init_lx']-scene.objects['System']['init_lx']+scene.objects['System'].worldPosition.x + scene.objects['Cabine'].worldPosition.y = scene.objects['Cabine']['init_ly']-scene.objects['System']['init_ly']+scene.objects['System'].worldPosition.y + scene.objects['Cabine'].worldPosition.z = scene.objects['Cabine']['init_lz']-scene.objects['System']['init_lz']+scene.objects['System'].worldPosition.z + scene.objects['Contrepoids'].worldPosition.x = scene.objects['Contrepoids']['init_lx']-scene.objects['System']['init_lx']+scene.objects['System'].worldPosition.x + scene.objects['Contrepoids'].worldPosition.y = scene.objects['Contrepoids']['init_ly']-scene.objects['System']['init_ly']+scene.objects['System'].worldPosition.y + scene.objects['Contrepoids'].worldPosition.z = scene.objects['Contrepoids']['init_lz']-scene.objects['System']['init_lz']+scene.objects['System'].worldPosition.z # Moteur à l'état initial : pas utile diff --git a/monte_charge/monte_charge-3.blend b/monte_charge/monte_charge-3.blend index d97f6c2..3fbace3 100644 Binary files a/monte_charge/monte_charge-3.blend and b/monte_charge/monte_charge-3.blend differ diff --git a/monte_charge/monte_charge-4.blend b/monte_charge/monte_charge-4.blend new file mode 100644 index 0000000..c88560e Binary files /dev/null and b/monte_charge/monte_charge-4.blend differ diff --git a/portail_coulissant/porcou.py b/portail_coulissant/porcou.py index 7be30ca..effd88b 100644 --- a/portail_coulissant/porcou.py +++ b/portail_coulissant/porcou.py @@ -230,10 +230,9 @@ def system_init (): def system_reset (): # Grille à l'état initial - # applyRotationTo(scene.objects['System'], 0, 0, 0) - scene.objects['Portail'].worldPosition.x = scene.objects['Portail']['init_lx'] - scene.objects['Portail'].worldPosition.y = scene.objects['Portail']['init_ly'] - scene.objects['Portail'].worldPosition.z = scene.objects['Portail']['init_lz'] + scene.objects['Portail'].worldPosition.x = scene.objects['Portail']['init_lx']-scene.objects['System']['init_lx']+scene.objects['System'].worldPosition.x + scene.objects['Portail'].worldPosition.y = scene.objects['Portail']['init_ly']-scene.objects['System']['init_ly']+scene.objects['System'].worldPosition.y + scene.objects['Portail'].worldPosition.z = scene.objects['Portail']['init_lz']-scene.objects['System']['init_lz']+scene.objects['System'].worldPosition.z # Moteur à l'état initial rres=0.001 # resolution rotation diff --git a/portail_coulissant/portail_coulissant-15.blend b/portail_coulissant/portail_coulissant-15.blend index 7bad47f..7aa3da1 100644 Binary files a/portail_coulissant/portail_coulissant-15.blend and b/portail_coulissant/portail_coulissant-15.blend differ diff --git a/twin.py b/twin.py index 31c61ba..f3356a3 100644 --- a/twin.py +++ b/twin.py @@ -507,6 +507,13 @@ def cycle_run (): # FIXME : Relancer la maquette pass +def light_refresh(cont): + pass + # scene.objects['Sun'].applyMovement((0, 0, 0), True) + # scene.objects['System'].applyRotation((0, 0, 0), False) + # scene.objects['System'].applyMovement((0,0,0), False) + # pass + ## # Arrêt et réinitialisation du cycle (forçage) ## diff --git a/twin_config.xml b/twin_config.xml index 7435a83..a7460b3 100644 --- a/twin_config.xml +++ b/twin_config.xml @@ -1,7 +1,7 @@ - 1480 - 832 + 1458 + 821 1 \ No newline at end of file diff --git a/volet_roulant/volet_roulant-17.blend b/volet_roulant/volet_roulant-17.blend index fc83625..534839a 100644 Binary files a/volet_roulant/volet_roulant-17.blend and b/volet_roulant/volet_roulant-17.blend differ diff --git a/volet_roulant/volrou.py b/volet_roulant/volrou.py index f0c72a4..ff6afa3 100644 --- a/volet_roulant/volrou.py +++ b/volet_roulant/volrou.py @@ -73,11 +73,10 @@ def voy_auto (cont): def mot (cont): if scene.objects['System']['run']: + # scene.objects['System'].applyMovement((0, 0, 0), False) + # scene.objects['System'].applyRotation((0, 0, 0), True) obj = cont.owner - # print (obj['frame_up'], obj['frame_down']) layer = 0 - # bge.render.drawLine([0,0,0],[1,1,1], (0.8, 0.8, 0.8, 1)) # Redraw pour l'éclairage de la scène - # Monter if obj['up']: if obj['frame_down']<105: # Volet pas cassé