Merge branch 'master' of gitlab.aliens-lyon.fr:avatar-ensignes/software

user-interface/.gitignore

-.import/
+*.import/
 *.import

user-interface/Main.tscn

-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://scene-tree/sign/sign.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Node.gd" type="Script" id=2]
 
 [node name="Main" type="Node" index="0"]
 
 [node name="sign" parent="." index="0" instance=ExtResource( 1 )]
 
+[node name="Node" type="Node" parent="." index="1"]
+
+script = ExtResource( 2 )
+
 

user-interface/resources/signs-dictionary/Bonjour.yaml

@@ -23,12 +23,9 @@ InitialState:
 FinalState:
   NDH: ~
   DH:
-    shape: B
+    shape: ~
     Orientation:
-      palm:
-        r: 0
-        f: -1
-        u: 0
+      palm: ~
       fingertips:
         r: -1
         f: 0
@@ -38,8 +35,8 @@ FinalState:
       place: chest
       distance: 1
 Move:
-  trajectory: straight
-  INNER_repetition: 1
-  OUTER_repetition: 1
+  trajectory: ~
+  INNER_repetition: ~
+  OUTER_repetition: ~
 Face: ~
-shoulders: ~
\ No newline at end of file
+shoulders: ~

user-interface/scene-tree/sign/hand-state/location/chest.gd

@@ -3,8 +3,18 @@ extends WindowDialog
 var point
 var place
 export (bool) var displayed
-const NAMES = ["neck","jugular","sternum","right clavicle","left clavicle","right breast","left breast","right armpit","left armpit","right inner elbow","left inner elbow","right arm","left arm","stomach","right kidney","left kidney","belly","right hip","left hip"]
-const LOCS = [Vector2(351, 63),Vector2(350, 164),Vector2(345, 245),Vector2(224, 209),Vector2(468, 199),Vector2(250, 284),Vector2(449, 286),Vector2(185, 273),Vector2(514, 272),Vector2(133, 417),Vector2(558, 410),Vector2(134, 311),Vector2(556, 305),Vector2(348, 402),Vector2(257, 480),Vector2(439, 477),Vector2(347, 505),Vector2(178, 561),Vector2(514, 559)]
+const NAMES = ["neck","jugular","sternum","right clavicle","left clavicle",
+			   "right breast","left breast","right armpit","left armpit",
+			   "right inner elbow","left inner elbow","right arm","left arm",
+			   "stomach","right kidney","left kidney","belly","right hip",
+			   "left hip"]
+const LOCS = [Vector2(351, 63),Vector2(350, 164),Vector2(345, 245),
+              Vector2(224, 209),Vector2(468, 199),Vector2(250, 284),
+			  Vector2(449, 286),Vector2(185, 273),Vector2(514, 272),
+			  Vector2(133, 417),Vector2(558, 410),Vector2(134, 311),
+			  Vector2(556, 305),Vector2(348, 402),Vector2(257, 480),
+			  Vector2(439, 477),Vector2(347, 505),Vector2(178, 561),
+			  Vector2(514, 559)]
 var n = len(NAMES)
 
 func _ready():

user-interface/scene-tree/sign/hand-state/shape/shape.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://scene-tree/sign/hand-state/shape/shape.gd" type="Script" id=1]
 [ext_resource path="res://resources/pictures/signs.jpg" type="Texture" id=2]
 
-[node name="shape" type="Control"]
+[node name="shape" type="Control" index="0"]
 
 anchor_left = 0.0
 anchor_top = 0.0