zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dust3d/src/motionsgenerator.h

76 lines
3.5 KiB
C
Raw Normal View History

Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
#ifndef DUST3D_MOTIONS_GENERATOR_H
#define DUST3D_MOTIONS_GENERATOR_H
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
#include <QObject>
#include <vector>
#include <map>
#include <set>
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
#include "model.h"
Cleanup Refactor outcome. Move processes of outcome to separated files, and leave the outcome class as clean as possible. Normal export in glb format is been fixed. Ambient occlusion baker is been temporarily removed.
2018-10-26 23:04:45 +00:00
#include "rigger.h"
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
#include "jointnodetree.h"
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
#include "document.h"
Add new rig type: Generic The difference between tetrapod and generic is that, with tetrapod, all the bones need to be generated are know before mark, so if some marks are missing, there would be a message prompted; with generic, you can mark what ever marks as you wish, and the algorithm is try to create a spine and the limbs growing on the spine, that means, the generated skeleton would be some kind of creature.
2018-11-01 15:24:06 +00:00
#include "poser.h"
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
Fix rig
2020-02-19 11:05:16 +00:00
#define ENABLE_PROCEDURAL_DEBUG 1
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
class MotionsGenerator : public QObject
{
Q_OBJECT
public:
Add new rig type: Generic The difference between tetrapod and generic is that, with tetrapod, all the bones need to be generated are know before mark, so if some marks are missing, there would be a message prompted; with generic, you can mark what ever marks as you wish, and the algorithm is try to create a spine and the limbs growing on the spine, that means, the generated skeleton would be some kind of creature.
2018-11-01 15:24:06 +00:00
MotionsGenerator(RigType rigType,
const std::vector<RiggerBone> *rigBones,
Cleanup Refactor outcome. Move processes of outcome to separated files, and leave the outcome class as clean as possible. Normal export in glb format is been fixed. Ambient occlusion baker is been temporarily removed.
2018-10-26 23:04:45 +00:00
const std::map<int, RiggerVertexWeights> *rigWeights,
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
const Outcome &outcome);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
~MotionsGenerator();
Add new pose setting: yTranslationScale Normally, when pose been generated, foot is always been pulling to the ground by a y-translation. This setting could be used to scale the y-translation. It's usefull for birds fly kind of motion.
2019-06-19 12:57:38 +00:00
void addPoseToLibrary(const QUuid &poseId, const std::vector<std::pair<std::map<QString, QString>, std::map<QString, std::map<QString, QString>>>> &frames, float yTranslationScale);
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
void addMotionToLibrary(const QUuid &motionId, const std::vector<MotionClip> &clips);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
void addRequirement(const QUuid &motionId);
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
std::vector<std::pair<float, Model *>> takeResultPreviewMeshs(const QUuid &motionId);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
std::vector<std::pair<float, JointNodeTree>> takeResultJointNodeTrees(const QUuid &motionId);
const std::set<QUuid> &requiredMotionIds();
const std::set<QUuid> &generatedMotionIds();
void generate();
signals:
void finished();
public slots:
void process();
private:
Introduce bullet3 to support ragdoll procedural animation
2019-09-21 14:30:27 +00:00
void generateMotion(const QUuid &motionId, std::set<QUuid> &visited, std::vector<std::pair<float, JointNodeTree>> &outcomes,
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
std::vector<Model *> *previews=nullptr);
Add multiple frames per pose support Usually one pose consists of one frame, however, sometimes multiple frames per one reference sheet for a serial of action could be very useful, such as a sprite sheet. Multiple frames per pose is different with one motion, one motion could contains multiple poses. Currently, the duration of one frame is fixed to 0.042s, it's based on the 24 frames per second calculation.
2018-11-09 03:20:48 +00:00
const JointNodeTree &poseJointNodeTree(const QUuid &poseId, int frame);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
JointNodeTree generateInterpolation(InterpolationType interpolationType, const JointNodeTree &first, const JointNodeTree &second, float progress);
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
const JointNodeTree *findClipBeginJointNodeTree(const MotionClip &clip);
const JointNodeTree *findClipEndJointNodeTree(const MotionClip &clip);
std::vector<MotionClip> *findMotionClips(const QUuid &motionId);
Add multiple frames per pose support Usually one pose consists of one frame, however, sometimes multiple frames per one reference sheet for a serial of action could be very useful, such as a sprite sheet. Multiple frames per pose is different with one motion, one motion could contains multiple poses. Currently, the duration of one frame is fixed to 0.042s, it's based on the 24 frames per second calculation.
2018-11-09 03:20:48 +00:00
std::vector<std::pair<std::map<QString, QString>, std::map<QString, std::map<QString, QString>>>> *findPoseFrames(const QUuid &poseId);
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
void generatePreviewsForOutcomes(const std::vector<std::pair<float, JointNodeTree>> &outcomes, std::vector<std::pair<float, Model *>> &previews);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
float calculateMotionDuration(const QUuid &motionId, std::set<QUuid> &visited);
Add multiple frames per pose support Usually one pose consists of one frame, however, sometimes multiple frames per one reference sheet for a serial of action could be very useful, such as a sprite sheet. Multiple frames per pose is different with one motion, one motion could contains multiple poses. Currently, the duration of one frame is fixed to 0.042s, it's based on the 24 frames per second calculation.
2018-11-09 03:20:48 +00:00
float calculatePoseDuration(const QUuid &poseId);
Fix pose editor
2019-11-09 08:15:49 +00:00
float calculateProceduralAnimationDuration(ProceduralAnimation proceduralAnimation,
const JointNodeTree *initialJointNodeTree=nullptr);
const std::vector<std::pair<float, JointNodeTree>> &getProceduralAnimation(ProceduralAnimation proceduralAnimation,
const JointNodeTree *initialJointNodeTree=nullptr);
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
Add new rig type: Generic The difference between tetrapod and generic is that, with tetrapod, all the bones need to be generated are know before mark, so if some marks are missing, there would be a message prompted; with generic, you can mark what ever marks as you wish, and the algorithm is try to create a spine and the limbs growing on the spine, that means, the generated skeleton would be some kind of creature.
2018-11-01 15:24:06 +00:00
RigType m_rigType = RigType::None;
Cleanup Refactor outcome. Move processes of outcome to separated files, and leave the outcome class as clean as possible. Normal export in glb format is been fixed. Ambient occlusion baker is been temporarily removed.
2018-10-26 23:04:45 +00:00
std::vector<RiggerBone> m_rigBones;
std::map<int, RiggerVertexWeights> m_rigWeights;
Introduce bullet3 to support ragdoll procedural animation
2019-09-21 14:30:27 +00:00
std::map<int, std::vector<std::pair<float, JointNodeTree>>> m_proceduralAnimations;
Fix rig
2020-02-19 11:05:16 +00:00
#if ENABLE_PROCEDURAL_DEBUG
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
std::map<int, std::vector<Model *>> m_proceduralDebugPreviews;
Fix rig
2020-02-19 11:05:16 +00:00
#endif
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
Outcome m_outcome;
Add multiple frames per pose support Usually one pose consists of one frame, however, sometimes multiple frames per one reference sheet for a serial of action could be very useful, such as a sprite sheet. Multiple frames per pose is different with one motion, one motion could contains multiple poses. Currently, the duration of one frame is fixed to 0.042s, it's based on the 24 frames per second calculation.
2018-11-09 03:20:48 +00:00
std::map<QUuid, std::vector<std::pair<std::map<QString, QString>, std::map<QString, std::map<QString, QString>>>>> m_poses;
Add new pose setting: yTranslationScale Normally, when pose been generated, foot is always been pulling to the ground by a y-translation. This setting could be used to scale the y-translation. It's usefull for birds fly kind of motion.
2019-06-19 12:57:38 +00:00
std::map<QUuid, float> m_posesYtranslationScales;
Cleanup Many source file name and data type are prefixed by "skeleton" before, now all are refactored. The class MeshResultContext represents the outcome of mesh generation before, now we have material, pose and animation, so we just rename it as Outcome.
2018-10-25 00:19:38 +00:00
std::map<QUuid, std::vector<MotionClip>> m_motions;
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
std::set<QUuid> m_requiredMotionIds;
std::set<QUuid> m_generatedMotionIds;
Support importing another Dust3D document as a part - Add example model: Backpacker To demonstrate the importing function - Add menu: Reverse Reverse selected edges. The direction of edge decide the base normal of generated mesh. - Refactor stroke mesh builder Remove recursive calls, more consistant generated result - Add menu: Import
2020-04-07 23:15:20 +00:00
std::map<QUuid, std::vector<std::pair<float, Model *>>> m_resultPreviewMeshs;
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
std::map<QUuid, std::vector<std::pair<float, JointNodeTree>>> m_resultJointNodeTrees;
Add multiple frames per pose support Usually one pose consists of one frame, however, sometimes multiple frames per one reference sheet for a serial of action could be very useful, such as a sprite sheet. Multiple frames per pose is different with one motion, one motion could contains multiple poses. Currently, the duration of one frame is fixed to 0.042s, it's based on the 24 frames per second calculation.
2018-11-09 03:20:48 +00:00
std::map<std::pair<QUuid, int>, JointNodeTree> m_poseJointNodeTreeMap;
Add new rig type: Generic The difference between tetrapod and generic is that, with tetrapod, all the bones need to be generated are know before mark, so if some marks are missing, there would be a message prompted; with generic, you can mark what ever marks as you wish, and the algorithm is try to create a spine and the limbs growing on the spine, that means, the generated skeleton would be some kind of creature.
2018-11-01 15:24:06 +00:00
Poser *m_poser = nullptr;
Rewrite the motion manager Curve editor has been removed from this commit. Instead of let user edit customized curve for motion, we provider presets. It's much more easy to add motion than before.
2018-10-23 14:57:47 +00:00
int m_fps = 30;
};
#endif