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

Move color out of Pipeline;

This commit is contained in:
bjorn 2018-12-24 18:57:27 -08:00 committed by Bjorn Swenson
parent dffcc8c295
commit 29748dc0db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/graphics.c
View File

@ -250,11 +250,11 @@ void lovrGraphicsSetCanvas(Canvas* canvas) {
}
Color lovrGraphicsGetColor() {
return state.pipeline->color;
return state.color;
}
void lovrGraphicsSetColor(Color color) {
state.pipeline->color = color;
state.color = color;
}
bool lovrGraphicsIsCullingEnabled() {
@ -583,7 +583,7 @@ void lovrGraphicsDraw(DrawRequest* draw) {
memcpy(drawData->model[state.batchSize], state.transforms[state.transform], 16 * sizeof(float));
if (draw->transform) { mat4_multiply(drawData->model[state.batchSize], draw->transform); }
memcpy(drawData->color[state.batchSize], (float*) &state.pipeline->color, 4 * sizeof(float));
memcpy(drawData->color[state.batchSize], (float*) &state.color, 4 * sizeof(float));
if (++state.batchSize >= MAX_BATCH_SIZE) {
lovrGraphicsFlush();

2
src/graphics/graphics.h
View File

@ -103,7 +103,6 @@ typedef struct {
bool alphaSampling;
BlendMode blendMode;
BlendAlphaMode blendAlphaMode;
Color color;
bool culling;
CompareMode depthTest;
bool depthWrite;
@ -151,6 +150,7 @@ typedef struct {
int pipelineIndex;
Color backgroundColor;
Canvas* canvas;
Color color;
DrawRequest batch;
int batchVertex;
int batchIndex;