Merge branch 'GreeDot:main' into main

GreeDot · Feb 23, 2024 · 42c00e0 · 42c00e0
2 parents 87ec6a1 + 6d6c385
commit 42c00e0
Show file tree

Hide file tree

Showing 65 changed files with 3,340 additions and 2,571 deletions.
diff --git a/AnimatedDrawings/examples/bvh/cmu1/jumping_jacks.bvh b/AnimatedDrawings/examples/bvh/cmu1/jumping_jacks.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/bounce_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/bounce_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/dance_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/dance_mixamo.bvh
diff --git a/...wings/examples/bvh/rokoko/wave_mixamo.bvh → ...ings/examples/bvh/rokoko/hello_mixamo.bvh b/...wings/examples/bvh/rokoko/wave_mixamo.bvh → ...ings/examples/bvh/rokoko/hello_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/jump_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/jump_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/lay_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/lay_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/laydown_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/laydown_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/umpa_ji_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/umpa_ji_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/walk_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/walk_mixamo.bvh
diff --git a/AnimatedDrawings/examples/bvh/rokoko/wow_mixamo.bvh b/AnimatedDrawings/examples/bvh/rokoko/wow_mixamo.bvh
diff --git a/...s/examples/characters/char7/char_cfg.yaml → ...xamples/characters/GreeChar/char_cfg.yaml b/...s/examples/characters/char7/char_cfg.yaml → ...xamples/characters/GreeChar/char_cfg.yaml
@@ -1,83 +1,83 @@
 height: 400
 skeleton:
 - loc:
-  - 163
-  - 211
+  - 166
+  - 296
   name: root
   parent: null
 - loc:
-  - 166
-  - 289
+  - 173
+  - 299
   name: hip
   parent: root
 - loc:
-  - 167
-  - 192
+  - 171
+  - 245
   name: torso
   parent: hip
 - loc:
-  - 162
-  - 123
+  - 170
+  - 144
   name: neck
   parent: torso
 - loc:
-  - 124
-  - 117
+  - 120
+  - 242
   name: right_shoulder
   parent: torso
 - loc:
-  - 101
-  - 158
+  - 72
+  - 252
   name: right_elbow
   parent: right_shoulder
 - loc:
-  - 82
-  - 207
+  - 35
+  - 292
   name: right_hand
   parent: right_elbow
 - loc:
-  - 207
-  - 113
+  - 226
+  - 229
   name: left_shoulder
   parent: torso
 - loc:
+  - 272
   - 241
-  - 140
   name: left_elbow
   parent: left_shoulder
 - loc:
-  - 279
-  - 179
+  - 318
+  - 282
   name: left_hand
   parent: left_elbow
 - loc:
-  - 129
-  - 283
+  - 133
+  - 301
   name: right_hip
   parent: root
 - loc:
-  - 127
-  - 333
+  - 99
+  - 340
   name: right_knee
   parent: right_hip
 - loc:
-  - 68
-  - 359
+  - 80
+  - 388
   name: right_foot
   parent: right_knee
 - loc:
-  - 199
-  - 287
+  - 212
+  - 302
   name: left_hip
   parent: root
 - loc:
-  - 200
-  - 326
+  - 229
+  - 336
   name: left_knee
   parent: left_hip
 - loc:
-  - 227
-  - 380
+  - 262
+  - 377
   name: left_foot
   parent: left_knee
 width: 400
diff --git a/AnimatedDrawings/examples/characters/GreeChar/mask.png b/AnimatedDrawings/examples/characters/GreeChar/mask.png
diff --git a/AnimatedDrawings/examples/characters/GreeChar/texture.png b/AnimatedDrawings/examples/characters/GreeChar/texture.png
diff --git a/AnimatedDrawings/examples/characters/char1/char_cfg.yaml b/AnimatedDrawings/examples/characters/char1/char_cfg.yaml
diff --git a/AnimatedDrawings/examples/characters/char1/joint_overlay.png b/AnimatedDrawings/examples/characters/char1/joint_overlay.png
diff --git a/AnimatedDrawings/examples/characters/char1/mask.png b/AnimatedDrawings/examples/characters/char1/mask.png
diff --git a/AnimatedDrawings/examples/characters/char1/texture.png b/AnimatedDrawings/examples/characters/char1/texture.png
diff --git a/AnimatedDrawings/examples/characters/char2/char_cfg.yaml b/AnimatedDrawings/examples/characters/char2/char_cfg.yaml
diff --git a/AnimatedDrawings/examples/characters/char2/joint_overlay.png b/AnimatedDrawings/examples/characters/char2/joint_overlay.png
diff --git a/AnimatedDrawings/examples/characters/char2/mask.png b/AnimatedDrawings/examples/characters/char2/mask.png
diff --git a/AnimatedDrawings/examples/characters/char2/texture.png b/AnimatedDrawings/examples/characters/char2/texture.png
diff --git a/AnimatedDrawings/examples/characters/char3/char_cfg.yaml b/AnimatedDrawings/examples/characters/char3/char_cfg.yaml
diff --git a/AnimatedDrawings/examples/characters/char3/joint_overlay.png b/AnimatedDrawings/examples/characters/char3/joint_overlay.png
diff --git a/AnimatedDrawings/examples/characters/char3/mask.png b/AnimatedDrawings/examples/characters/char3/mask.png
diff --git a/AnimatedDrawings/examples/characters/char3/texture.png b/AnimatedDrawings/examples/characters/char3/texture.png
diff --git a/AnimatedDrawings/examples/characters/char4/background.png b/AnimatedDrawings/examples/characters/char4/background.png