Skip to content

Commit

Permalink
Merge pull request #89 from 2Swon/main
Browse files Browse the repository at this point in the history
gif 9
  • Loading branch information
2Swon authored Feb 28, 2024
2 parents 82478f2 + 87f6aad commit aa7fa52
Show file tree
Hide file tree
Showing 25 changed files with 2,249 additions and 57 deletions.
589 changes: 589 additions & 0 deletions AnimatedDrawings/examples/bvh/rokoko/clap_mixamo.bvh

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions AnimatedDrawings/examples/bvh/rokoko/cry_mixamo.bvh

Large diffs are not rendered by default.

498 changes: 498 additions & 0 deletions AnimatedDrawings/examples/bvh/rokoko/surprise_mixamo.bvh

Large diffs are not rendered by default.

537 changes: 537 additions & 0 deletions AnimatedDrawings/examples/bvh/rokoko/wave_dj_mixamo.bvh

Large diffs are not rendered by default.

62 changes: 31 additions & 31 deletions AnimatedDrawings/examples/characters/GreeChar/char_cfg.yaml
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
height: 400
skeleton:
- loc:
- 166
- 296
- 178
- 218
name: root
parent: null
- loc:
- 173
- 299
- 179
- 219
name: hip
parent: root
- loc:
- 171
- 245
- 178
- 132
name: torso
parent: hip
- loc:
- 170
- 144
- 179
- 74
name: neck
parent: torso
- loc:
- 120
- 242
- 137
- 130
name: right_shoulder
parent: torso
- loc:
- 72
- 252
- 103
- 169
name: right_elbow
parent: right_shoulder
- loc:
- 35
- 292
- 68
- 204
name: right_hand
parent: right_elbow
- loc:
- 226
- 229
- 133
name: left_shoulder
parent: torso
- loc:
- 272
- 241
- 269
- 173
name: left_elbow
parent: left_shoulder
- loc:
- 318
- 282
- 319
- 221
name: left_hand
parent: left_elbow
- loc:
- 133
- 301
- 147
- 223
name: right_hip
parent: root
- loc:
- 99
- 340
- 142
- 284
name: right_knee
parent: right_hip
- loc:
- 80
- 388
- 125
- 343
name: right_foot
parent: right_knee
- loc:
- 212
- 302
- 219
- 220
name: left_hip
parent: root
- loc:
- 229
- 336
- 226
- 279
name: left_knee
parent: left_hip
- loc:
- 262
- 377
- 240
- 341
name: left_foot
parent: left_knee
width: 400
Binary file modified AnimatedDrawings/examples/characters/GreeChar/mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AnimatedDrawings/examples/characters/GreeChar/texture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions AnimatedDrawings/examples/config/motion/greeClap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
filepath: examples/bvh/rokoko/clap_mixamo.bvh
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.05
up: +y
11 changes: 11 additions & 0 deletions AnimatedDrawings/examples/config/motion/greeCry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
filepath: examples/bvh/rokoko/cry_mixamo.bvh
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.05
up: +y
8 changes: 4 additions & 4 deletions AnimatedDrawings/examples/config/motion/greeDance.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/dance_mixamo.bvh
start_frame_idx: 150
end_frame_idx: 654
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
8 changes: 4 additions & 4 deletions AnimatedDrawings/examples/config/motion/greeJump.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/jump_mixamo.bvh
start_frame_idx: 150
end_frame_idx: 654
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
8 changes: 4 additions & 4 deletions AnimatedDrawings/examples/config/motion/greeLay.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/lay_mixamo.bvh
start_frame_idx: 150
end_frame_idx: 654
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
8 changes: 4 additions & 4 deletions AnimatedDrawings/examples/config/motion/greeScratch.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/head_mixamo.bvh
start_frame_idx: 150
end_frame_idx: 654
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
11 changes: 11 additions & 0 deletions AnimatedDrawings/examples/config/motion/greeSurprise.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
filepath: examples/bvh/rokoko/surprise_mixamo.bvh
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.05
up: +y
8 changes: 4 additions & 4 deletions AnimatedDrawings/examples/config/motion/greeUmpa.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/umpa_ji_mixamo.bvh
start_frame_idx: 150
end_frame_idx: 654
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
2 changes: 1 addition & 1 deletion AnimatedDrawings/examples/config/motion/greeWalk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ forward_perp_joint_vectors:
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.005
scale: 0.05
up: +y
2 changes: 1 addition & 1 deletion AnimatedDrawings/examples/config/motion/greeWave.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ forward_perp_joint_vectors:
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.005
scale: 0.05
up: +y
11 changes: 11 additions & 0 deletions AnimatedDrawings/examples/config/motion/greeWave2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
filepath: examples/bvh/rokoko/wave_dj_mixamo.bvh
start_frame_idx: 0
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.05
up: +y
6 changes: 3 additions & 3 deletions AnimatedDrawings/examples/config/motion/greeWow.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
filepath: examples/bvh/rokoko/wow_mixamo.bvh
start_frame_idx: 0
end_frame_idx: 839
end_frame_idx: null
groundplane_joint: LeftFoot
forward_perp_joint_vectors:
- - LeftShoulder
- RightShoulder
- - LeftUpLeg
- RightUpLeg
scale: 0.025
up: +z
scale: 0.05
up: +y
9 changes: 9 additions & 0 deletions AnimatedDrawings/examples/config/mvc/gree_bigwave.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
scene:
ANIMATED_CHARACTERS:
- character_cfg: examples/characters/GreeChar/char_cfg.yaml
motion_cfg: examples/config/motion/greeWave2.yaml
retarget_cfg: examples/config/retarget/mixamo_fff.yaml

controller:
MODE: video_render
OUTPUT_VIDEO_PATH: temp/bigwave.gif
9 changes: 9 additions & 0 deletions AnimatedDrawings/examples/config/mvc/gree_clap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
scene:
ANIMATED_CHARACTERS:
- character_cfg: examples/characters/GreeChar/char_cfg.yaml
motion_cfg: examples/config/motion/greeClap.yaml
retarget_cfg: examples/config/retarget/mixamo_fff.yaml

controller:
MODE: video_render
OUTPUT_VIDEO_PATH: temp/clap.gif
9 changes: 9 additions & 0 deletions AnimatedDrawings/examples/config/mvc/gree_cry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
scene:
ANIMATED_CHARACTERS:
- character_cfg: examples/characters/GreeChar/char_cfg.yaml
motion_cfg: examples/config/motion/greeCry.yaml
retarget_cfg: examples/config/retarget/mixamo_fff.yaml

controller:
MODE: video_render
OUTPUT_VIDEO_PATH: temp/cry.gif
9 changes: 9 additions & 0 deletions AnimatedDrawings/examples/config/mvc/gree_surprise.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
scene:
ANIMATED_CHARACTERS:
- character_cfg: examples/characters/GreeChar/char_cfg.yaml
motion_cfg: examples/config/motion/greeSurprise.yaml
retarget_cfg: examples/config/retarget/mixamo_fff.yaml

controller:
MODE: video_render
OUTPUT_VIDEO_PATH: temp/surprise.gif
2 changes: 1 addition & 1 deletion app/api/api_v1/endpoints/gree.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ async def create_and_upload_assets(
texture_file_path = os.path.join(base_path, 'texture.png')
await download_and_save_file(gree.raw_img, texture_file_path)

gif_list = ['walk', 'dab', 'hello']
gif_list = ['walk', 'dab', 'hello', 'surprise', 'cry', 'wow', 'dance', 'jump', 'scratch', 'bigwave']

gif_paths = await run_create_gif(gif_list)

Expand Down
Binary file modified temp/Largest_Contour_Mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit aa7fa52

Please sign in to comment.