Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix japanese glyphs shader compilation #776

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix japanese glyphs shader compilation #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2029bca
fix japanese glyphs shader compilation
williamchange Mar 11, 2025
eddb11c
fix old jp glyphs node
williamchange Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
200 changes: 100 additions & 100 deletions addons/material_maker/nodes/japanese_glyphs.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,66 +708,66 @@
"\treturn min(d, s(uv, vec2(0.060512, 0.18679), vec2(0.0605, 0.303042),vec2(0.146704, 0.305019)));",
"}",
"",
"float hiragana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
"float hiragana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
"{",
"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
"\t\t",
"\tfloat s = 1.0/scale;",
"\tp *= s;",
"\t",
"\tfloat d = 1.0;",
"\t",
"\tif (char == 1) d = h1(p);",
"\tif (char == 2) d = h2(p);",
"\tif (char == 3) d = h3(p);",
"\tif (char == 4) d = h4(p);",
"\tif (char == 5) d = h5(p);",
"\tif (char == 6) d = h6(p);",
"\tif (char == 7) d = h7(p);",
"\tif (char == 8) d = h8(p);",
"\tif (char == 9) d = h9(p);",
"\tif (char == 10) d = h10(p);",
"\tif (char == 11) d = h11(p);",
"\tif (char == 12) d = h12(p);",
"\tif (char == 13) d = h13(p);",
"\tif (char == 14) d = h14(p);",
"\tif (char == 15) d = h15(p);",
"\tif (char == 16) d = h16(p);",
"\tif (char == 17) d = h17(p);",
"\tif (char == 18) d = h18(p);",
"\tif (char == 19) d = h19(p);",
"\tif (char == 20) d = h20(p);",
"\tif (char == 21) d = h21(p);",
"\tif (char == 22) d = h22(p);",
"\tif (char == 23) d = h23(p);",
"\tif (char == 24) d = h24(p);",
"\tif (char == 25) d = h25(p);",
"\tif (char == 26) d = h26(p);",
"\tif (char == 27) d = h27(p);",
"\tif (char == 28) d = h28(p);",
"\tif (char == 29) d = h29(p);",
"\tif (char == 30) d = h30(p);",
"\tif (char == 31) d = h31(p);",
"\tif (char == 32) d = h32(p);",
"\tif (char == 33) d = h33(p);",
"\tif (char == 34) d = h34(p);",
"\tif (char == 35) d = h35(p);",
"\tif (char == 36) d = h36(p);",
"\tif (char == 37) d = h37(p);",
"\tif (char == 38) d = h38(p);",
"\tif (char == 39) d = h39(p);",
"\tif (char == 40) d = h40(p);",
"\tif (char == 41) d = h41(p);",
"\tif (char == 42) d = h42(p);",
"\tif (char == 43) d = h43(p);",
"\tif (char == 44) d = h44(p);",
"\tif (char == 45) d = h45(p);",
"\tif (char == 46) d = h46(p);",
"\tif (c == 1) d = h1(p);",
"\tif (c == 2) d = h2(p);",
"\tif (c == 3) d = h3(p);",
"\tif (c == 4) d = h4(p);",
"\tif (c == 5) d = h5(p);",
"\tif (c == 6) d = h6(p);",
"\tif (c == 7) d = h7(p);",
"\tif (c == 8) d = h8(p);",
"\tif (c == 9) d = h9(p);",
"\tif (c == 10) d = h10(p);",
"\tif (c == 11) d = h11(p);",
"\tif (c == 12) d = h12(p);",
"\tif (c == 13) d = h13(p);",
"\tif (c == 14) d = h14(p);",
"\tif (c == 15) d = h15(p);",
"\tif (c == 16) d = h16(p);",
"\tif (c == 17) d = h17(p);",
"\tif (c == 18) d = h18(p);",
"\tif (c == 19) d = h19(p);",
"\tif (c == 20) d = h20(p);",
"\tif (c == 21) d = h21(p);",
"\tif (c == 22) d = h22(p);",
"\tif (c == 23) d = h23(p);",
"\tif (c == 24) d = h24(p);",
"\tif (c == 25) d = h25(p);",
"\tif (c == 26) d = h26(p);",
"\tif (c == 27) d = h27(p);",
"\tif (c == 28) d = h28(p);",
"\tif (c == 29) d = h29(p);",
"\tif (c == 30) d = h30(p);",
"\tif (c == 31) d = h31(p);",
"\tif (c == 32) d = h32(p);",
"\tif (c == 33) d = h33(p);",
"\tif (c == 34) d = h34(p);",
"\tif (c == 35) d = h35(p);",
"\tif (c == 36) d = h36(p);",
"\tif (c == 37) d = h37(p);",
"\tif (c == 38) d = h38(p);",
"\tif (c == 39) d = h39(p);",
"\tif (c == 40) d = h40(p);",
"\tif (c == 41) d = h41(p);",
"\tif (c == 42) d = h42(p);",
"\tif (c == 43) d = h43(p);",
"\tif (c == 44) d = h44(p);",
"\tif (c == 45) d = h45(p);",
"\tif (c == 46) d = h46(p);",
"",
"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
"}",
"",
"float c_h(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
"float c_h(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
"\tif(gs > 1) {",
"\t\tif(box(p,0.5) > 0.0) {",
"\t\t\tvec3 gr = grid(p,gs);",
Expand All @@ -776,70 +776,70 @@
"\t\treturn 1.0;",
"\t}",
"\tif (box(p,0.5*scale) > 0.0)",
"\t\treturn hiragana(p,char,scale,gs,bevel,rad);",
"\t\treturn hiragana(p,c,scale,gs,bevel,rad);",
"\treturn 1.0;",
"}",
"",
"float katakana(vec2 p, int char, float scale, int gs, float bevel, float rad)",
"float katakana(vec2 p, int c, float scale, int gs, float bevel, float rad)",
"{",
"\tchar = int(fract(float(gs > 1 ? char: char - 1)/46.0)*47.0)+1;",
"\tc = int(fract(float(gs > 1 ? c: c - 1)/46.0)*47.0)+1;",
"\t\t",
"\tfloat s = 1.0/scale;",
"\tp *= s;",
"\t",
"\tfloat d = 1.0;",
"\t",
"\tif (char == 1) d = k1(p);",
"\tif (char == 2) d = k2(p);",
"\tif (char == 3) d = k3(p);",
"\tif (char == 4) d = k4(p);",
"\tif (char == 5) d = k5(p);",
"\tif (char == 6) d = k6(p);",
"\tif (char == 7) d = k7(p);",
"\tif (char == 8) d = k8(p);",
"\tif (char == 9) d = k9(p);",
"\tif (char == 10) d = k10(p);",
"\tif (char == 11) d = k11(p);",
"\tif (char == 12) d = k12(p);",
"\tif (char == 13) d = k13(p);",
"\tif (char == 14) d = k14(p);",
"\tif (char == 15) d = k15(p);",
"\tif (char == 16) d = k16(p);",
"\tif (char == 17) d = k17(p);",
"\tif (char == 18) d = k18(p);",
"\tif (char == 19) d = k19(p);",
"\tif (char == 20) d = k20(p);",
"\tif (char == 21) d = k21(p);",
"\tif (char == 22) d = k22(p);",
"\tif (char == 23) d = k23(p);",
"\tif (char == 24) d = k24(p);",
"\tif (char == 25) d = k25(p);",
"\tif (char == 26) d = k26(p);",
"\tif (char == 27) d = k27(p);",
"\tif (char == 28) d = k28(p);",
"\tif (char == 29) d = k29(p);",
"\tif (char == 30) d = k30(p);",
"\tif (char == 31) d = k31(p);",
"\tif (char == 32) d = k32(p);",
"\tif (char == 33) d = k33(p);",
"\tif (char == 34) d = k34(p);",
"\tif (char == 35) d = k35(p);",
"\tif (char == 36) d = k36(p);",
"\tif (char == 37) d = k37(p);",
"\tif (char == 38) d = k38(p);",
"\tif (char == 39) d = k39(p);",
"\tif (char == 40) d = k40(p);",
"\tif (char == 41) d = k41(p);",
"\tif (char == 42) d = k42(p);",
"\tif (char == 43) d = k43(p);",
"\tif (char == 44) d = k44(p);",
"\tif (char == 45) d = k45(p);",
"\tif (char == 46) d = k46(p);",
"\tif (c == 1) d = k1(p);",
"\tif (c == 2) d = k2(p);",
"\tif (c == 3) d = k3(p);",
"\tif (c == 4) d = k4(p);",
"\tif (c == 5) d = k5(p);",
"\tif (c == 6) d = k6(p);",
"\tif (c == 7) d = k7(p);",
"\tif (c == 8) d = k8(p);",
"\tif (c == 9) d = k9(p);",
"\tif (c == 10) d = k10(p);",
"\tif (c == 11) d = k11(p);",
"\tif (c == 12) d = k12(p);",
"\tif (c == 13) d = k13(p);",
"\tif (c == 14) d = k14(p);",
"\tif (c == 15) d = k15(p);",
"\tif (c == 16) d = k16(p);",
"\tif (c == 17) d = k17(p);",
"\tif (c == 18) d = k18(p);",
"\tif (c == 19) d = k19(p);",
"\tif (c == 20) d = k20(p);",
"\tif (c == 21) d = k21(p);",
"\tif (c == 22) d = k22(p);",
"\tif (c == 23) d = k23(p);",
"\tif (c == 24) d = k24(p);",
"\tif (c == 25) d = k25(p);",
"\tif (c == 26) d = k26(p);",
"\tif (c == 27) d = k27(p);",
"\tif (c == 28) d = k28(p);",
"\tif (c == 29) d = k29(p);",
"\tif (c == 30) d = k30(p);",
"\tif (c == 31) d = k31(p);",
"\tif (c == 32) d = k32(p);",
"\tif (c == 33) d = k33(p);",
"\tif (c == 34) d = k34(p);",
"\tif (c == 35) d = k35(p);",
"\tif (c == 36) d = k36(p);",
"\tif (c == 37) d = k37(p);",
"\tif (c == 38) d = k38(p);",
"\tif (c == 39) d = k39(p);",
"\tif (c == 40) d = k40(p);",
"\tif (c == 41) d = k41(p);",
"\tif (c == 42) d = k42(p);",
"\tif (c == 43) d = k43(p);",
"\tif (c == 44) d = k44(p);",
"\tif (c == 45) d = k45(p);",
"\tif (c == 46) d = k46(p);",
"",
"\treturn 1.0-clamp(0.0-(d-rad)/max(bevel, 0.00001), 0.0, 1.0);",
"}",
"",
"float c_k(vec2 p, int char, float scale, int gs, float bevel, float rad) {",
"float c_k(vec2 p, int c, float scale, int gs, float bevel, float rad) {",
"\tif(gs > 1) {",
"\t\tif(box(p,0.5) > 0.0) {",
"\t\t\tvec3 gr = grid(p,gs);",
Expand All @@ -848,7 +848,7 @@
"\t\treturn 1.0;",
"\t}",
"\tif (box(p,0.5*scale) > 0.0)",
"\t\treturn katakana(p,char,scale,gs,bevel,rad);",
"\t\treturn katakana(p,c,scale,gs,bevel,rad);",
"\treturn 1.0;",
"}"
],
Expand Down
Loading