From 7357e74e1ed0290db566aa307605db40135e8faf Mon Sep 17 00:00:00 2001
From: gtaaas <gtaaas@gtaaas.lavid.ufpb.br>
Date: Thu, 19 Feb 2015 11:53:50 -0300
Subject: [PATCH] Corrige função do movimento cicular

---
 avatar_Hozana_wikiLibras.blend | Bin 11825452 -> 0 bytes
 libras.py                      | 15 +++++++++------
 moves.py                       |  5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/avatar_Hozana_wikiLibras.blend b/avatar_Hozana_wikiLibras.blend
index a0c5e0b..6f314b6 100644
Binary files a/avatar_Hozana_wikiLibras.blend and b/avatar_Hozana_wikiLibras.blend differ
diff --git a/libras.py b/libras.py
index c62c882..013ae06 100644
--- a/libras.py
+++ b/libras.py
@@ -4,6 +4,7 @@
 import sys
 import os
 
+
 # insere o diretorio atual no path
 # permite que o código seja executado de qualquer diretório, possibilitando acesso aos modulos locais
 sys.path.append(os.getcwd())
@@ -15,12 +16,12 @@ import json
 # importa modulos locais
 import util
 import moves
-'''
+
 # verifica a quantidade de argumentos recebidos
 if (len(sys.argv) != 6):
     print ("WikiLibras: Invalid number of arguments")
     exit(1)
-'''
+
 # tenta decodificar o argumento JSON recebido
 try:
     json_input = json.loads(sys.argv[5])
@@ -32,7 +33,7 @@ except (ValueError, KeyError, TypeError):
 util.outconf()
 
 # define a posição dos keyframes
-hands_default_frames = [15, 18]
+hands_default_frames = [15,18]
 
 # Carrega o objeto presente no avatar
 armature = bpy.context.scene.objects.get('Armature.001')
@@ -114,7 +115,8 @@ def configureHands():
                 generationConfigurations(actions[i], json_input[hands[i]][-3:], hands_default_frames, bones_[i])
                 if(move == "circular" or move == "semicircular"):
                     orientation, direction, radius, laps = json_input[hands[i]][1:5]
-                    endFrame = circular_or_semiCircular(handRight, pose, orientation, direction, radius, laps, 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"):
                     pass 
 
@@ -125,10 +127,11 @@ def configureFace():
         # Set face
         faceConfiguration(json_input["facialExp"], [endFrame/2], util.faceBonesConf) 
 
+# Default Pose
+poseDefault([1, endFrame+15], util.allBones)
 configureHands()
 configureFace()
 
-# Default Pose
-poseDefault([0, endFrame+15], util.allBones)
+
 
 util.render_sign(json_input["userId"], json_input["signName"], 1, endFrame + 25)
diff --git a/moves.py b/moves.py
index 72f8b0a..c4098a0 100644
--- a/moves.py
+++ b/moves.py
@@ -1,7 +1,8 @@
 # -*- coding: UTF-8 -*-
+import math
 
-def locationCircular(self, center, radius, i_axis, j_axis, k_axis, pose, initialPosition, laps, frameJump = 5, initialFrame = 15, turn = None):
-        sqrt22 = radius * math.sqrt(2) / 2
+def locationCircular(center, radius, i_axis, j_axis, k_axis, pose, initialPosition, laps, frameJump = 10, initialFrame = 15, turn = None):
+        sqrt22 = radius * (math.sqrt(2) / 2)
         rad2 = (radius/2)
         currentFrame = initialFrame
         for l in range(initialPosition, initialPosition + math.floor(8 * laps) + 1):
--
libgit2 0.21.2