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

Reset camera after lovr.headset.renderTo;

This commit is contained in:
bjorn 2020-10-02 19:36:01 -06:00
parent 11d088babd
commit 0388213be4
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/l_headset.c
View File

@ -1,6 +1,7 @@
#include "api.h"
#include "headset/headset.h"
#include "data/modelData.h"
#include "graphics/graphics.h"
#include "graphics/model.h"
#include "graphics/texture.h"
#include "core/arr.h"
@ -645,6 +646,10 @@ static int l_lovrHeadsetRenderTo(lua_State* L) {
headsetRenderData.L = L;
#endif
lovrHeadsetDisplayDriver->renderTo(renderHelper, &headsetRenderData);
lovrGraphicsSetViewMatrix(0, NULL);
lovrGraphicsSetViewMatrix(1, NULL);
lovrGraphicsSetProjection(0, NULL);
lovrGraphicsSetProjection(1, NULL);
return 0;
}

25
src/modules/graphics/graphics.c
View File

@ -316,7 +316,11 @@ void lovrGraphicsGetViewMatrix(uint32_t index, float* viewMatrix) {
void lovrGraphicsSetViewMatrix(uint32_t index, float* viewMatrix) {
lovrAssert(index < 2, "Invalid view index %d", index);
lovrGraphicsFlush();
mat4_init(state.frameData.viewMatrix[index], viewMatrix);
if (viewMatrix) {
mat4_init(state.frameData.viewMatrix[index], viewMatrix);
} else {
mat4_identity(state.frameData.viewMatrix[index]);
}
state.frameDataDirty = true;
}
@ -328,7 +332,13 @@ void lovrGraphicsGetProjection(uint32_t index, float* projection) {
void lovrGraphicsSetProjection(uint32_t index, float* projection) {
lovrAssert(index < 2, "Invalid view index %d", index);
lovrGraphicsFlush();
mat4_init(state.frameData.projection[index], projection);
if (projection) {
mat4_init(state.frameData.projection[index], projection);
} else {
float fov = 67.f * (float) M_PI / 180.f;
float aspect = (float) state.width / state.height;
mat4_perspective(state.frameData.projection[index], .01f, 100.f, fov, aspect);
}
state.frameDataDirty = true;
}
@ -340,13 +350,10 @@ Buffer* lovrGraphicsGetIdentityBuffer() {
void lovrGraphicsReset() {
state.transform = 0;
float viewMatrix[16], projection[16];
mat4_identity(viewMatrix);
mat4_perspective(projection, .01f, 100.f, 67.f * (float) M_PI / 180.f, (float) state.width / state.height);
lovrGraphicsSetViewMatrix(0, viewMatrix);
lovrGraphicsSetViewMatrix(1, viewMatrix);
lovrGraphicsSetProjection(0, projection);
lovrGraphicsSetProjection(1, projection);
lovrGraphicsSetViewMatrix(0, NULL);
lovrGraphicsSetViewMatrix(1, NULL);
lovrGraphicsSetProjection(0, NULL);
lovrGraphicsSetProjection(1, NULL);
lovrGraphicsSetAlphaSampling(false);
lovrGraphicsSetBackgroundColor((Color) { 0, 0, 0, 1 });
lovrGraphicsSetBlendMode(BLEND_ALPHA, BLEND_ALPHA_MULTIPLY);