diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c index ce96076d..0c2ba0e6 100644 --- a/src/graphics/graphics.c +++ b/src/graphics/graphics.c @@ -121,10 +121,13 @@ void lovrGraphicsDestroy() { } void lovrGraphicsReset() { + int w = lovrGraphicsGetWidth(); + int h = lovrGraphicsGetHeight(); + float projection[16]; state.transform = 0; state.canvas = 0; - lovrGraphicsSetViewport(0, 0, lovrGraphicsGetWidth(), lovrGraphicsGetHeight()); - lovrGraphicsSetPerspective(.1f, 100.f, 67 * M_PI / 180); + lovrGraphicsSetViewport(0, 0, w, h); + lovrGraphicsSetProjection(mat4_perspective(projection, .01f, 100.f, 67 * M_PI / 180., (float) w / h)); lovrGraphicsSetShader(NULL); lovrGraphicsBindTexture(NULL); lovrGraphicsSetBackgroundColor(0, 0, 0, 255); @@ -295,12 +298,6 @@ void lovrGraphicsSetProjection(mat4 projection) { memcpy(state.canvases[state.canvas]->projection, projection, 16 * sizeof(float)); } -void lovrGraphicsSetPerspective(float near, float far, float fov) { - int width, height; - glfwGetWindowSize(state.window, &width, &height); - mat4_perspective(state.canvases[state.canvas]->projection, near, far, fov, (float) width / height); -} - float lovrGraphicsGetLineWidth() { return state.lineWidth; } diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h index 141020f0..211e0aea 100644 --- a/src/graphics/graphics.h +++ b/src/graphics/graphics.h @@ -120,7 +120,6 @@ Texture* lovrGraphicsGetTexture(); void lovrGraphicsBindTexture(Texture* texture); mat4 lovrGraphicsGetProjection(); void lovrGraphicsSetProjection(mat4 projection); -void lovrGraphicsSetPerspective(float near, float far, float fov); float lovrGraphicsGetLineWidth(); void lovrGraphicsSetLineWidth(float width); float lovrGraphicsGetPointSize();