lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gltf: Support partially-keyed animation properties;

This commit is contained in:
bjorn 2019-05-18 22:19:28 -07:00
parent 8d1b335da4
commit 79ba7a7ad5
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/modelData.h
View File

@ -162,6 +162,9 @@ typedef struct {
typedef struct {
float transform[16];
float translation[3];
float rotation[4];
float scale[3];
uint32_t* children;
uint32_t childCount;
uint32_t primitiveIndex;

6
src/data/modelData_gltf.c
View File

@ -743,9 +743,9 @@ ModelData* lovrModelDataInitGltf(ModelData* model, Blob* source) {
jsmntok_t* token = info.nodes;
ModelNode* node = model->nodes;
for (int i = (token++)->size; i > 0; i--, node++) {
float translation[3] = { 0, 0, 0 };
float rotation[4] = { 0, 0, 0, 0 };
float scale[3] = { 1, 1, 1 };
vec3 translation = vec3_set(node->translation, 0.f, 0.f, 0.f);
quat rotation = quat_set(node->rotation, 0.f, 0.f, 0.f, 1.f);
vec3 scale = vec3_set(node->scale, 1.f, 1.f, 1.f);
bool matrix = false;
node->primitiveCount = 0;
node->skin = -1;

8
src/graphics/animator.c
View File

@ -68,7 +68,11 @@ void lovrAnimatorUpdate(Animator* animator, float dt) {
}
bool lovrAnimatorEvaluate(Animator* animator, int nodeIndex, mat4 transform) {
float properties[3][4] = { { 0, 0, 0 }, { 0, 0, 0, 1 }, { 1, 1, 1 } };
float properties[3][4];
ModelNode* node = &animator->data->nodes[nodeIndex];
vec3_init(properties[PROP_TRANSLATION], node->translation);
quat_init(properties[PROP_ROTATION], node->rotation);
vec3_init(properties[PROP_SCALE], node->scale);
bool touched = false;
for (int i = 0; i < animator->data->animationCount; i++) {
@ -138,6 +142,8 @@ bool lovrAnimatorEvaluate(Animator* animator, int nodeIndex, mat4 transform) {
mat4_translate(transform, T[0], T[1], T[2]);
mat4_rotateQuat(transform, R);
mat4_scale(transform, S[0], S[1], S[2]);
} else {
mat4_multiply(transform, node->transform);
}
return touched;

4
src/graphics/model.c
View File

@ -13,8 +13,8 @@ static void updateGlobalNodeTransform(Model* model, uint32_t nodeIndex, mat4 tra
mat4 globalTransform = model->globalNodeTransforms + 16 * nodeIndex;
mat4_set(globalTransform, transform);
if (!model->animator || !lovrAnimatorEvaluate(model->animator, nodeIndex, globalTransform)) {
mat4_multiply(globalTransform, node->transform);
if (model->animator) {
lovrAnimatorEvaluate(model->animator, nodeIndex, globalTransform);
}
for (uint32_t i = 0; i < node->childCount; i++) {