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

rm lovrGraphicsSetPerspective;

This commit is contained in:
bjorn 2017-08-01 23:52:03 -07:00
parent 38c5342d8a
commit f649a50264
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/graphics/graphics.c
View File

@ -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;
}

1
src/graphics/graphics.h
View File

@ -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();