From bbc5cf2143c8e6201ebe13d905842f8826902227 Mon Sep 17 00:00:00 2001 From: gtaaas Date: Thu, 12 Mar 2015 12:41:58 -0300 Subject: [PATCH] Corrige função do movimento circular --- Makefile | 2 +- controller.py | 0 libras.py | 7 +------ moves.py | 12 ++++++------ 4 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 controller.py diff --git a/Makefile b/Makefile index 71dad6e..5f82ff4 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CLEAR = @echo -n "\033c" CACHE = __pycache__ SCRIPT = libras.py AVATAR = avatar_Hozana_wikiLibras.blend -JSON = '{"userId": 4,"rightHand": ["circular", "perpendicular", "horario", 0.6, 1, 20, 4, 6], "leftHand":["pontual", 10, 3, 3], "facialExp": [6], "signName":"teste_circular"}' +JSON = '{"userId": 2,"rightHand": ["circular", "plano", "horario", 1, 2, 0, 50, 20], "leftHand":[], "facialExp": [6], "signName":"teste_circular"}' default: main diff --git a/controller.py b/controller.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/controller.py diff --git a/libras.py b/libras.py index cdc5e81..8fd61ed 100644 --- a/libras.py +++ b/libras.py @@ -83,21 +83,16 @@ 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(pose, orientation, direction, radius, laps, 5) + endFrame = moves.circular_or_semiCircular(pose, orientation, direction, radius, laps, 5) generationConfigurations(actions[i], json_input[hands[i]][-3:], [endFrame], bones_[i]) 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]) -<<<<<<< HEAD - - -======= elif(json_input[hands[i]][0] == "senoidal"): 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]) ->>>>>>> 4973c0eb8bf544c810f4405a8974cf6e962d7bd4 # Função que inicia a configuração da face def configureFace(): global endFrame diff --git a/moves.py b/moves.py index 8eafd37..f8d97dc 100644 --- a/moves.py +++ b/moves.py @@ -6,19 +6,19 @@ def circular_or_semiCircular(pose, orientation, direction, radius, laps, intensi center = pose.location.x, pose.location.y, pose.location.z if(orientation == 'perpendicular'): if(direction == 'horario'): - endFrame = moves.locationCircular(center, radius, 1, 0, 2, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 1, 0, 2, pose, 0, laps, intensity, initialFrame,turn) else: - endFrame = moves.locationCircular(center, radius, 0, 1, 2, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 0, 1, 2, pose, 0, laps, intensity, initialFrame,turn) elif(orientation == 'paralelo'): if(direction == 'horario'): - endFrame = moves.locationCircular(center, radius, 1, 2, 0, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 1, 2, 0, pose, 0, laps, intensity, initialFrame,turn) else: - endFrame = moves.locationCircular(center, radius, 2, 1, 0, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 2, 1, 0, pose, 0, laps, intensity, initialFrame,turn) elif(orientation == 'plano'): if(direction == 'horario'): - endFrame = moves.locationCircular(center, radius, 2, 0, 1, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 2, 0, 1, pose, 0, laps, intensity, initialFrame,turn) else: - endFrame = moves.locationCircular(center, radius, 0, 2, 1, pose, 0, laps, intensity, initialFrame,turn) + endFrame = locationCircular(center, radius, 0, 2, 1, pose, 0, laps, intensity, initialFrame,turn) return endFrame # center[3]: float vector (posição xyz centro) -- libgit2 0.21.2