Rename blit to fill;

This commit is contained in:
bjorn 2018-03-19 12:12:34 -07:00
parent db756f347f
commit 988d8c7d23
8 changed files with 11 additions and 11 deletions

View File

@ -811,9 +811,9 @@ int l_lovrGraphicsStencil(lua_State* L) {
return 0; return 0;
} }
int l_lovrGraphicsBlit(lua_State* L) { int l_lovrGraphicsFill(lua_State* L) {
Texture* texture = luax_checktypeof(L, 1, Texture); Texture* texture = luax_checktypeof(L, 1, Texture);
lovrGraphicsBlit(texture); lovrGraphicsFill(texture);
return 0; return 0;
} }
@ -1173,7 +1173,7 @@ const luaL_Reg lovrGraphics[] = {
{ "skybox", l_lovrGraphicsSkybox }, { "skybox", l_lovrGraphicsSkybox },
{ "print", l_lovrGraphicsPrint }, { "print", l_lovrGraphicsPrint },
{ "stencil", l_lovrGraphicsStencil }, { "stencil", l_lovrGraphicsStencil },
{ "blit", l_lovrGraphicsBlit }, { "fill", l_lovrGraphicsFill },
{ "newAnimator", l_lovrGraphicsNewAnimator }, { "newAnimator", l_lovrGraphicsNewAnimator },
{ "newCanvas", l_lovrGraphicsNewCanvas }, { "newCanvas", l_lovrGraphicsNewCanvas },
{ "newFont", l_lovrGraphicsNewFont }, { "newFont", l_lovrGraphicsNewFont },

View File

@ -1068,7 +1068,7 @@ void lovrGraphicsStencil(StencilAction action, int replaceValue, StencilCallback
lovrGraphicsSetStencilTest(state.stencilMode, state.stencilValue); lovrGraphicsSetStencilTest(state.stencilMode, state.stencilValue);
} }
void lovrGraphicsBlit(Texture* texture) { void lovrGraphicsFill(Texture* texture) {
float vertices[] = { float vertices[] = {
-1, 1, 0, 0, 0, 0, 0, 1, -1, 1, 0, 0, 0, 0, 0, 1,
-1, -1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0,
@ -1076,7 +1076,7 @@ void lovrGraphicsBlit(Texture* texture) {
1, -1, 0, 0, 0, 0, 1, 0 1, -1, 0, 0, 0, 0, 1, 0
}; };
lovrGraphicsSetDefaultShader(SHADER_BLIT); lovrGraphicsSetDefaultShader(SHADER_FILL);
Material* material = lovrGraphicsGetDefaultMaterial(); Material* material = lovrGraphicsGetDefaultMaterial();
lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture); lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture);
VertexPointer vertexPointer = lovrGraphicsGetVertexPointer(4); VertexPointer vertexPointer = lovrGraphicsGetVertexPointer(4);

View File

@ -202,7 +202,7 @@ void lovrGraphicsSphere(Material* material, mat4 transform, int segments);
void lovrGraphicsSkybox(Texture* texture, float angle, float ax, float ay, float az); void lovrGraphicsSkybox(Texture* texture, float angle, float ax, float ay, float az);
void lovrGraphicsPrint(const char* str, mat4 transform, float wrap, HorizontalAlign halign, VerticalAlign valign); void lovrGraphicsPrint(const char* str, mat4 transform, float wrap, HorizontalAlign halign, VerticalAlign valign);
void lovrGraphicsStencil(StencilAction action, int replaceValue, StencilCallback callback, void* userdata); void lovrGraphicsStencil(StencilAction action, int replaceValue, StencilCallback callback, void* userdata);
void lovrGraphicsBlit(Texture* texture); void lovrGraphicsFill(Texture* texture);
// Internal State // Internal State
VertexPointer lovrGraphicsGetVertexPointer(uint32_t capacity); VertexPointer lovrGraphicsGetVertexPointer(uint32_t capacity);

View File

@ -271,7 +271,7 @@ Shader* lovrShaderCreateDefault(DefaultShader type) {
case SHADER_CUBE: return lovrShaderCreate(lovrCubeVertexShader, lovrCubeFragmentShader); break; case SHADER_CUBE: return lovrShaderCreate(lovrCubeVertexShader, lovrCubeFragmentShader); break;
case SHADER_PANO: return lovrShaderCreate(lovrCubeVertexShader, lovrPanoFragmentShader); break; case SHADER_PANO: return lovrShaderCreate(lovrCubeVertexShader, lovrPanoFragmentShader); break;
case SHADER_FONT: return lovrShaderCreate(NULL, lovrFontFragmentShader); case SHADER_FONT: return lovrShaderCreate(NULL, lovrFontFragmentShader);
case SHADER_BLIT: return lovrShaderCreate(lovrBlitVertexShader, NULL); case SHADER_FILL: return lovrShaderCreate(lovrFillVertexShader, NULL);
default: lovrThrow("Unknown default shader type"); default: lovrThrow("Unknown default shader type");
} }
} }

View File

@ -37,7 +37,7 @@ typedef enum {
SHADER_CUBE, SHADER_CUBE,
SHADER_PANO, SHADER_PANO,
SHADER_FONT, SHADER_FONT,
SHADER_BLIT SHADER_FILL
} DefaultShader; } DefaultShader;
typedef struct { typedef struct {

View File

@ -732,7 +732,7 @@ static void openvrRenderTo(void (*callback)(void*), void* userdata) {
Shader* lastShader = lovrGraphicsGetShader(); Shader* lastShader = lovrGraphicsGetShader();
lovrRetain(lastShader); lovrRetain(lastShader);
lovrGraphicsSetShader(NULL); lovrGraphicsSetShader(NULL);
lovrGraphicsBlit(&state.canvas->texture); lovrGraphicsFill(&state.canvas->texture);
lovrGraphicsSetShader(lastShader); lovrGraphicsSetShader(lastShader);
lovrRelease(lastShader); lovrRelease(lastShader);
lovrGraphicsSetColor(oldColor); lovrGraphicsSetColor(oldColor);

View File

@ -155,7 +155,7 @@ const char* lovrFontFragmentShader = ""
" return vec4(graphicsColor.rgb, graphicsColor.a * alpha); \n" " return vec4(graphicsColor.rgb, graphicsColor.a * alpha); \n"
"}"; "}";
const char* lovrBlitVertexShader = "" const char* lovrFillVertexShader = ""
"#define MONOSCOPIC \n" "#define MONOSCOPIC \n"
"vec4 position(mat4 projection, mat4 transform, vec4 vertex) { \n" "vec4 position(mat4 projection, mat4 transform, vec4 vertex) { \n"
" return vertex; \n" " return vertex; \n"

View File

@ -13,4 +13,4 @@ extern const char* lovrCubeVertexShader;
extern const char* lovrCubeFragmentShader; extern const char* lovrCubeFragmentShader;
extern const char* lovrPanoFragmentShader; extern const char* lovrPanoFragmentShader;
extern const char* lovrFontFragmentShader; extern const char* lovrFontFragmentShader;
extern const char* lovrBlitVertexShader; extern const char* lovrFillVertexShader;