mirror of https://github.com/bjornbytes/lovr.git
Fix some gcc warnings;
This commit is contained in:
parent
115465b201
commit
c52f09cdc2
|
@ -2247,20 +2247,20 @@ static bool openxr_animateFB(Model* model, const ModelInfo* info) {
|
||||||
XR_HAND_JOINT_LITTLE_DISTAL_EXT
|
XR_HAND_JOINT_LITTLE_DISTAL_EXT
|
||||||
};
|
};
|
||||||
|
|
||||||
|
float position[4], orientation[4];
|
||||||
float scale[4] = { 1.f, 1.f, 1.f, 1.f };
|
float scale[4] = { 1.f, 1.f, 1.f, 1.f };
|
||||||
|
|
||||||
// The following can be optimized a lot (ideally we would set the global transform for the nodes)
|
|
||||||
for (uint32_t i = 0; i < HAND_JOINT_COUNT; i++) {
|
for (uint32_t i = 0; i < HAND_JOINT_COUNT; i++) {
|
||||||
if (jointParents[i] == ~0u) {
|
if (jointParents[i] == ~0u) {
|
||||||
XrPosef* pose = &joints[i].pose;
|
XrPosef* pose = &joints[i].pose;
|
||||||
lovrModelSetNodeTransform(model, i, &pose->position.x, scale, &pose->orientation.x, 1.f);
|
vec3_init(position, &pose->position.x);
|
||||||
|
quat_init(orientation, &pose->orientation.x);
|
||||||
|
lovrModelSetNodeTransform(model, i, position, scale, orientation, 1.f);
|
||||||
} else {
|
} else {
|
||||||
XrPosef* parent = &joints[jointParents[i]].pose;
|
XrPosef* parent = &joints[jointParents[i]].pose;
|
||||||
XrPosef* pose = &joints[i].pose;
|
XrPosef* pose = &joints[i].pose;
|
||||||
|
|
||||||
// Convert global pose to parent-local pose (premultiply with inverse of parent pose)
|
// Convert global pose to parent-local pose (premultiply with inverse of parent pose)
|
||||||
// TODO there should be maf for this
|
// TODO there should be maf for this
|
||||||
float position[4], orientation[4];
|
|
||||||
vec3_init(position, &pose->position.x);
|
vec3_init(position, &pose->position.x);
|
||||||
vec3_sub(position, &parent->position.x);
|
vec3_sub(position, &parent->position.x);
|
||||||
|
|
||||||
|
@ -2391,10 +2391,10 @@ static Pass* openxr_getPass(void) {
|
||||||
lovrPassReset(state.pass);
|
lovrPassReset(state.pass);
|
||||||
lovrPassSetCanvas(state.pass, textures, depth, state.depthFormat, state.config.antialias ? 4 : 1);
|
lovrPassSetCanvas(state.pass, textures, depth, state.depthFormat, state.config.antialias ? 4 : 1);
|
||||||
|
|
||||||
float background[4];
|
float background[4][4];
|
||||||
LoadAction load = LOAD_CLEAR;
|
LoadAction loads[4] = { LOAD_CLEAR };
|
||||||
lovrGraphicsGetBackgroundColor(background);
|
lovrGraphicsGetBackgroundColor(background[0]);
|
||||||
lovrPassSetClear(state.pass, &load, &background, LOAD_CLEAR, 0.f);
|
lovrPassSetClear(state.pass, loads, background, LOAD_CLEAR, 0.f);
|
||||||
|
|
||||||
uint32_t count;
|
uint32_t count;
|
||||||
XrView views[2];
|
XrView views[2];
|
||||||
|
|
|
@ -273,10 +273,10 @@ static Pass* simulator_getPass(void) {
|
||||||
lovrPassSetCanvas(state.pass, textures, NULL, state.depthFormat, state.config.antialias ? 4 : 1);
|
lovrPassSetCanvas(state.pass, textures, NULL, state.depthFormat, state.config.antialias ? 4 : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
float background[4];
|
float background[4][4];
|
||||||
LoadAction load = LOAD_CLEAR;
|
LoadAction loads[4] = { LOAD_CLEAR };
|
||||||
lovrGraphicsGetBackgroundColor(background);
|
lovrGraphicsGetBackgroundColor(background[0]);
|
||||||
lovrPassSetClear(state.pass, &load, &background, LOAD_CLEAR, 0.f);
|
lovrPassSetClear(state.pass, loads, background, LOAD_CLEAR, 0.f);
|
||||||
|
|
||||||
float viewMatrix[16];
|
float viewMatrix[16];
|
||||||
mat4_fromPose(viewMatrix, state.headPosition, state.headOrientation);
|
mat4_fromPose(viewMatrix, state.headPosition, state.headOrientation);
|
||||||
|
|
Loading…
Reference in New Issue