diff --git a/apps/stage-web/public/assets/vrm/animations/Idle by Mixamo.vrma b/apps/stage-web/public/assets/vrm/animations/Idle by Mixamo.vrma new file mode 100644 index 000000000..a2cd423df Binary files /dev/null and b/apps/stage-web/public/assets/vrm/animations/Idle by Mixamo.vrma differ diff --git a/apps/stage-web/public/assets/vrm/animations/Standing Using Touchscreen Tablet by Mixamo.vrma b/apps/stage-web/public/assets/vrm/animations/Standing Using Touchscreen Tablet by Mixamo.vrma new file mode 100644 index 000000000..2895df4ac Binary files /dev/null and b/apps/stage-web/public/assets/vrm/animations/Standing Using Touchscreen Tablet by Mixamo.vrma differ diff --git a/apps/stage-web/public/assets/vrm/animations/Using A Filing Cabinet by Mixamo.vrma b/apps/stage-web/public/assets/vrm/animations/Using A Filing Cabinet by Mixamo.vrma new file mode 100644 index 000000000..2a180cc3e Binary files /dev/null and b/apps/stage-web/public/assets/vrm/animations/Using A Filing Cabinet by Mixamo.vrma differ diff --git a/docs/content/en/references/research/mocap.md b/docs/content/en/references/research/mocap.md index a352793e0..a1a44e72f 100644 --- a/docs/content/en/references/research/mocap.md +++ b/docs/content/en/references/research/mocap.md @@ -1 +1,11 @@ - [freemocap/freemocap: Free Motion Capture for Everyone 💀✨](https://github.com/freemocap/freemocap) + +https://quaternius.com/packs/universalanimationlibrary.html + +[Mocap Animations for 3D Characters | ActorCore](https://actorcore.reallusion.com/3d-motion?orderBy=Relevance&keyword=talk) + +[animation-library/feminine/fbx/expression at master · readyplayerme/animation-library](https://github.com/readyplayerme/animation-library/tree/master/feminine/fbx/expression) + +[Office Meeting Animations: 3D Character Animation Pack - 3ds Max – MoCap Online](https://mocaponline.com/products/meeting?variant=31814402375751) + +[Download 263 Rokoko motion capture assets](https://www.rokoko.com/resources/download-263-rokoko-motion-capture-assets#modal?popup=popup-sign-up) diff --git a/packages/stage-ui/src/components/DataPane/ColorPicker.vue b/packages/stage-ui/src/components/DataPane/ColorPicker.vue index cdf1c87e8..908899446 100644 --- a/packages/stage-ui/src/components/DataPane/ColorPicker.vue +++ b/packages/stage-ui/src/components/DataPane/ColorPicker.vue @@ -1,159 +1,628 @@ - - diff --git a/packages/stage-ui/src/components/DataPane/PropertyColor.vue b/packages/stage-ui/src/components/DataPane/PropertyColor.vue new file mode 100644 index 000000000..f3bfee3c2 --- /dev/null +++ b/packages/stage-ui/src/components/DataPane/PropertyColor.vue @@ -0,0 +1,23 @@ + + + diff --git a/packages/stage-ui/src/components/DataPane/index.story.vue b/packages/stage-ui/src/components/DataPane/index.story.vue index f6ed11d3c..9ce9c67a4 100644 --- a/packages/stage-ui/src/components/DataPane/index.story.vue +++ b/packages/stage-ui/src/components/DataPane/index.story.vue @@ -4,7 +4,8 @@ import type { Ref } from 'vue' import { ref } from 'vue' -import ColorPicker from './ColorPicker.vue' +import PropertyColor from './PropertyColor.vue' +import PropertyNumber from './PropertyNumber.vue' type DataPaneSchemaTypes = | DataPaneSchemaNumber @@ -147,13 +148,19 @@ const { data, schema } = useDataPane({ -
+