realiza merge em libras.py

gtaaas
1 parent 28995370
Showing 2 changed files with 35 additions and 34 deletions Show diff stats
libras.py
moves.py
@@ -90,9 +90,10 @@ def configureHands():
                     orientation, direction, radius, laps = json_input[hands[i]][1:5]
                     endFrame = circular_or_semiCircular(pose, orientation, direction, radius, laps, 5)
                     generationConfigurations(actions[i], json_input[hands[i]][-3:], [endFrame], bones_[i])
-                elif(json_input[hands[i]][0] == "retilineo"):
+                elif(move == "retilineo"):
                     generationConfigurations(actions[i], json_input[hands[i]][-6:-3], hands_default_frames, bones_[i])
                     generationConfigurations(actions[i], json_input[hands[i]][-3:],hands_frames_retilineo, bones_[i])
+            
 # Função que inicia a configuração da face
 def configureFace(): 
@@ -126,7 +126,7 @@ def locationCircular(center, radius, i_axis, j_axis, k_axis, pose, initialPositi
 # testing . . .
-def locationHelicoidal(center, startRadius, incRadius, x, y, z, currentLoc, laps, frameJump):
+def locationHelicoidal(center, startRadius, incRadius, x, y, z,pose, currentLoc, laps, frameJump):
     sqrt22 = radius * math.sqrt(2) / 2
     allLaps = math.floor(8 * laps) + 1
@@ -134,59 +134,59 @@ def locationHelicoidal(center, startRadius, incRadius, x, y, z, currentLoc, laps
     for i in range(currentLoc, currentLoc + allLaps):
         print("All Laps:", allLaps)
         if ((i % 8) == 0 ):
-            obj.location[x] = center[x] + radius
-            obj.location[y] = center[y]
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] + radius
+            pose.location[y] = center[y]
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 1):
-            obj.location[x] = center[x] + sqrt22
-            obj.location[y] = center[y] + sqrt22
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] + sqrt22
+            pose.location[y] = center[y] + sqrt22
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 2):
-            obj.location[x] = center[x]
-            obj.location[y] = center[y] + radius
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x]
+            pose.location[y] = center[y] + radius
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 3):
-            obj.location[x] = center[x] - sqrt22
-            obj.location[y] = center[y] + sqrt22
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] - sqrt22
+            pose.location[y] = center[y] + sqrt22
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 4):
-            obj.location[x] = center[x] - radius
-            obj.location[y] = center[y]
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] - radius
+            pose.location[y] = center[y]
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 5):
-            obj.location[x] = center[x] - sqrt22
-            obj.location[y] = center[y] - sqrt22
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] - sqrt22
+            pose.location[y] = center[y] - sqrt22
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 6):
-            obj.location[x] = center[x]
-            obj.location[y] = center[y] - radius
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x]
+            pose.location[y] = center[y] - radius
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
         if ((i % 8) == 7):
-            obj.location[x] = center[x] + sqrt22
-            obj.location[y] = center[y] - sqrt22
-            obj.location[z] += incRadius /allLaps
-            obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
+            pose.location[x] = center[x] + sqrt22
+            pose.location[y] = center[y] - sqrt22
+            pose.location[z] += incRadius /allLaps
+            pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
             bpy.context.scene.frame_end += frameJump
     bpy.context.scene.frame_end -= frameJump