Download as
Browse Code »

Commit 7c8f46481787d7720adbfea636e9989d76dcc599

Authored by gtaaas
1 parent 28995370
Exists in master

realiza merge em libras.py

Showing 2 changed files with 35 additions and 34 deletions   Show diff stats
libras.py
  Diff comments   View file @7c8f464
... ... @@ -90,9 +90,10 @@ def configureHands():
90 90 orientation, direction, radius, laps = json_input[hands[i]][1:5]
91 91 endFrame = circular_or_semiCircular(pose, orientation, direction, radius, laps, 5)
92 92 generationConfigurations(actions[i], json_input[hands[i]][-3:], [endFrame], bones_[i])
93   - elif(json_input[hands[i]][0] == "retilineo"):
  93 + elif(move == "retilineo"):
94 94 generationConfigurations(actions[i], json_input[hands[i]][-6:-3], hands_default_frames, bones_[i])
95 95 generationConfigurations(actions[i], json_input[hands[i]][-3:],hands_frames_retilineo, bones_[i])
  96 +
96 97  
97 98 # Função que inicia a configuração da face
98 99 def configureFace():
... ...
moves.py
  Diff comments   View file @7c8f464
... ... @@ -126,7 +126,7 @@ def locationCircular(center, radius, i_axis, j_axis, k_axis, pose, initialPositi
126 126  
127 127  
128 128 # testing . . .
129   -def locationHelicoidal(center, startRadius, incRadius, x, y, z, currentLoc, laps, frameJump):
  129 +def locationHelicoidal(center, startRadius, incRadius, x, y, z,pose, currentLoc, laps, frameJump):
130 130 sqrt22 = radius * math.sqrt(2) / 2
131 131 allLaps = math.floor(8 * laps) + 1
132 132  
... ... @@ -134,59 +134,59 @@ def locationHelicoidal(center, startRadius, incRadius, x, y, z, currentLoc, laps
134 134 for i in range(currentLoc, currentLoc + allLaps):
135 135 print("All Laps:", allLaps)
136 136 if ((i % 8) == 0 ):
137   - obj.location[x] = center[x] + radius
138   - obj.location[y] = center[y]
139   - obj.location[z] += incRadius /allLaps
140   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  137 + pose.location[x] = center[x] + radius
  138 + pose.location[y] = center[y]
  139 + pose.location[z] += incRadius /allLaps
  140 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
141 141 bpy.context.scene.frame_end += frameJump
142 142  
143 143 if ((i % 8) == 1):
144   - obj.location[x] = center[x] + sqrt22
145   - obj.location[y] = center[y] + sqrt22
146   - obj.location[z] += incRadius /allLaps
147   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  144 + pose.location[x] = center[x] + sqrt22
  145 + pose.location[y] = center[y] + sqrt22
  146 + pose.location[z] += incRadius /allLaps
  147 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
148 148 bpy.context.scene.frame_end += frameJump
149 149  
150 150 if ((i % 8) == 2):
151   - obj.location[x] = center[x]
152   - obj.location[y] = center[y] + radius
153   - obj.location[z] += incRadius /allLaps
154   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  151 + pose.location[x] = center[x]
  152 + pose.location[y] = center[y] + radius
  153 + pose.location[z] += incRadius /allLaps
  154 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
155 155 bpy.context.scene.frame_end += frameJump
156 156  
157 157 if ((i % 8) == 3):
158   - obj.location[x] = center[x] - sqrt22
159   - obj.location[y] = center[y] + sqrt22
160   - obj.location[z] += incRadius /allLaps
161   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  158 + pose.location[x] = center[x] - sqrt22
  159 + pose.location[y] = center[y] + sqrt22
  160 + pose.location[z] += incRadius /allLaps
  161 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
162 162 bpy.context.scene.frame_end += frameJump
163 163  
164 164 if ((i % 8) == 4):
165   - obj.location[x] = center[x] - radius
166   - obj.location[y] = center[y]
167   - obj.location[z] += incRadius /allLaps
168   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  165 + pose.location[x] = center[x] - radius
  166 + pose.location[y] = center[y]
  167 + pose.location[z] += incRadius /allLaps
  168 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
169 169 bpy.context.scene.frame_end += frameJump
170 170  
171 171 if ((i % 8) == 5):
172   - obj.location[x] = center[x] - sqrt22
173   - obj.location[y] = center[y] - sqrt22
174   - obj.location[z] += incRadius /allLaps
175   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  172 + pose.location[x] = center[x] - sqrt22
  173 + pose.location[y] = center[y] - sqrt22
  174 + pose.location[z] += incRadius /allLaps
  175 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
176 176 bpy.context.scene.frame_end += frameJump
177 177  
178 178 if ((i % 8) == 6):
179   - obj.location[x] = center[x]
180   - obj.location[y] = center[y] - radius
181   - obj.location[z] += incRadius /allLaps
182   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  179 + pose.location[x] = center[x]
  180 + pose.location[y] = center[y] - radius
  181 + pose.location[z] += incRadius /allLaps
  182 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
183 183 bpy.context.scene.frame_end += frameJump
184 184  
185 185 if ((i % 8) == 7):
186   - obj.location[x] = center[x] + sqrt22
187   - obj.location[y] = center[y] - sqrt22
188   - obj.location[z] += incRadius /allLaps
189   - obj.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
  186 + pose.location[x] = center[x] + sqrt22
  187 + pose.location[y] = center[y] - sqrt22
  188 + pose.location[z] += incRadius /allLaps
  189 + pose.keyframe_insert(frame = bpy.context.scene.frame_end, index = -1, data_path = 'location')
190 190 bpy.context.scene.frame_end += frameJump
191 191  
192 192 bpy.context.scene.frame_end -= frameJump
... ...