omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove line thickness from the grid, add ambient light, fix lightmap texture resize

Browse Source
This commit is contained in:
omigamedev
2019-01-19 17:32:19 +01:00
parent d8c8a4b7ed
commit 7980fd4c37
8 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app_shaders.cpp
View File

@@ -168,7 +168,7 @@ void App::initShaders()
" }\n"
" }\n"
" float edge = (zero_count > 1 && zero_count < 9) ? 0.75 : 0.0;\n"
" frag = vec4(col.rgb, edge);\n"
" frag = vec4(col.rgb, edge * (1.0 - zero_count / 9.f));\n"
"}\n";
// TEXTURE COMP ERASE
static const char* shader_comp_erase_f =
@@ -525,11 +525,12 @@ void App::initShaders()
static const char* shader_lambert_f =
SHADER_VERSION
"uniform mediump vec3 light_dir;\n"
"uniform mediump float ambient;\n"
"in mediump vec3 n;\n"
"out mediump vec4 frag;\n"
"void main() {\n"
" mediump float d = max(0.0, dot(normalize(n), light_dir));\n"
" frag = vec4(vec3(d), 1.0);\n"
" frag = vec4(vec3(d) + ambient, 1.0);\n"
//" frag = vec4(normalize(n) * 0.5 + 0.5, 1.0);\n"
"}\n";
@@ -551,13 +552,14 @@ void App::initShaders()
SHADER_VERSION
"uniform mediump sampler2D tex;\n"
"uniform mediump vec3 light_dir;\n"
"uniform mediump float ambient;\n"
"in mediump vec3 n;\n"
"in mediump vec2 uv;\n"
"out mediump vec4 frag;\n"
"void main() {\n"
" mediump float d = max(0.0, dot(normalize(n), normalize(light_dir)));\n"
" mediump vec4 c = texture(tex, uv);\n"
" frag = vec4(c.rgb * d, 1.0);\n"
" frag = vec4(c.rgb * d + ambient, 1.0);\n"
"}\n";
// BAKE UVS