Projection is transform state;

This commit is contained in:
bjorn 2017-08-08 01:37:23 -07:00
parent 6077cae95a
commit ef58eea4b8
2 changed files with 10 additions and 10 deletions

View File

@ -364,14 +364,6 @@ void lovrGraphicsBindTexture(Texture* texture) {
}
}
mat4 lovrGraphicsGetProjection() {
return state.canvases[state.canvas].projection;
}
void lovrGraphicsSetProjection(mat4 projection) {
memcpy(state.canvases[state.canvas].projection, projection, 16 * sizeof(float));
}
int lovrGraphicsGetWidth() {
int width, height;
glfwGetFramebufferSize(state.window, &width, &height);
@ -447,6 +439,14 @@ void lovrGraphicsMatrixTransform(mat4 transform) {
mat4_multiply(state.transforms[state.transform], transform);
}
mat4 lovrGraphicsGetProjection() {
return state.canvases[state.canvas].projection;
}
void lovrGraphicsSetProjection(mat4 projection) {
memcpy(state.canvases[state.canvas].projection, projection, 16 * sizeof(float));
}
// Primitives
static void lovrGraphicsSetShapeData(float* data, int length) {

View File

@ -137,8 +137,6 @@ int lovrGraphicsIsWireframe();
void lovrGraphicsSetWireframe(int wireframe);
Texture* lovrGraphicsGetTexture();
void lovrGraphicsBindTexture(Texture* texture);
mat4 lovrGraphicsGetProjection();
void lovrGraphicsSetProjection(mat4 projection);
int lovrGraphicsGetWidth();
int lovrGraphicsGetHeight();
void lovrGraphicsPushCanvas();
@ -154,6 +152,8 @@ void lovrGraphicsTranslate(float x, float y, float z);
void lovrGraphicsRotate(float angle, float ax, float ay, float az);
void lovrGraphicsScale(float x, float y, float z);
void lovrGraphicsMatrixTransform(mat4 transform);
mat4 lovrGraphicsGetProjection();
void lovrGraphicsSetProjection(mat4 projection);
// Primitives
void lovrGraphicsPoints(float* points, int count);