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

Fix WebVR;

This commit is contained in:
bjorn 2017-08-15 00:36:09 -07:00
parent 3f875118a9
commit e4a7c6bb47
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/graphics.c
View File

@ -51,7 +51,7 @@ void lovrGraphicsReset() {
state.transform = 0; state.transform = 0;
state.canvas = 0; state.canvas = 0;
state.defaultShader = -1; state.defaultShader = -1;
lovrGraphicsSetBackgroundColor((Color) { 0, 0, 0, 0 }); lovrGraphicsSetBackgroundColor((Color) { 0, 0, 0, 255 });
lovrGraphicsSetBlendMode(BLEND_ALPHA, BLEND_ALPHA_MULTIPLY); lovrGraphicsSetBlendMode(BLEND_ALPHA, BLEND_ALPHA_MULTIPLY);
lovrGraphicsSetColor((Color) { 255, 255, 255, 255 }); lovrGraphicsSetColor((Color) { 255, 255, 255, 255 });
lovrGraphicsSetCullingEnabled(0); lovrGraphicsSetCullingEnabled(0);
@ -301,7 +301,11 @@ void lovrGraphicsSetFont(Font* font) {
GraphicsLimits lovrGraphicsGetLimits() { GraphicsLimits lovrGraphicsGetLimits() {
if (!state.limits.initialized) { if (!state.limits.initialized) {
#ifdef EMSCRIPTEN
state.limits.pointSizes[0] = state.limits.pointSizes[1] = 1.f;
#else
glGetFloatv(GL_POINT_SIZE_RANGE, state.limits.pointSizes); glGetFloatv(GL_POINT_SIZE_RANGE, state.limits.pointSizes);
#endif
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &state.limits.textureSize); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &state.limits.textureSize);
glGetIntegerv(GL_MAX_SAMPLES, &state.limits.textureMSAA); glGetIntegerv(GL_MAX_SAMPLES, &state.limits.textureMSAA);
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &state.limits.textureAnisotropy); glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &state.limits.textureAnisotropy);

2
src/headset/webvr.c
View File

@ -34,7 +34,7 @@ static void onRequestAnimationFrame(void* userdata) {
mat4_multiply(transform, sittingToStanding); mat4_multiply(transform, sittingToStanding);
lovrGraphicsPush(); lovrGraphicsPush();
lovrGraphicsMatrixTransform(transform); lovrGraphicsMatrixTransform(MATRIX_VIEW, transform);
lovrGraphicsSetProjection(projection); lovrGraphicsSetProjection(projection);
if (isRight) { if (isRight) {