diff --git a/addons/material_maker/nodes/japanese_glyphs.mmg b/addons/material_maker/nodes/japanese_glyphs.mmg index d26cf50b..705e0fa0 100644 --- a/addons/material_maker/nodes/japanese_glyphs.mmg +++ b/addons/material_maker/nodes/japanese_glyphs.mmg @@ -18,7 +18,7 @@ "global": [ "float s(vec2 uv, vec2 A, vec2 B, vec2 C) { return abs(sdBezier(uv, A, B, C).y); }", "float l(vec2 uv, vec2 A, vec2 B) { return sdLine(uv, A, B).x; }", - "float box(vec2 p, float r) { p = abs(p) - r; return step(max(p.x,p.y),0.0);}", + "float box(vec2 p, float r) { p = abs(p) - r; return step(max(p.x,p.y),0.0); }", "", "vec3 grid(vec2 p, int gs) {", "\tfloat g = float(gs);", @@ -39,14 +39,14 @@ "", "float k2(vec2 uv) { // i", "\tfloat d = s(uv, vec2(0.264, -0.319), vec2(0, -0.051),vec2(-0.309, 0.045));", - "\treturn min(d, l(uv, vec2(0.0385, 0.3155), vec2(0.0385, -0.1088)));", + "\treturn min(d, l(uv, vec2(0.0385, 0.3155), vec2(0.0385, -0.126)));", "}", "", "float k3(vec2 uv) { // u", - "\tfloat d = s(uv, vec2(0.289, -0.194), vec2(0.297, 0.234),vec2(-0.117, 0.324));", + "\tfloat d = s(uv, vec2(0.289, -0.21), vec2(0.297, 0.234),vec2(-0.117, 0.324));", "\td = min(d, l(uv, vec2(0, -0.21), vec2(0, -0.3281)));", - "\td = min(d, l(uv, vec2(-0.27, -0.21), vec2(0.2878, -0.21)));", - "\treturn min(d, l(uv, vec2(-0.28, 0), vec2(-0.28, -0.2066)));", + "\td = min(d, l(uv, vec2(-0.28, -0.21), vec2(0.289, -0.21)));", + "\treturn min(d, l(uv, vec2(-0.28, 0), vec2(-0.28, -0.21)));", "}", "", "float k4(vec2 uv) { // e", @@ -56,7 +56,7 @@ "}", "", "float k5(vec2 uv) { // o", - "\tfloat d = s(uv, vec2(0.09, -0.183), vec2(-0.013, 0.065),vec2(-0.325, 0.228));", + "\tfloat d = s(uv, vec2(0.09, -0.19), vec2(-0.013, 0.065),vec2(-0.325, 0.228));", "\td = min(d, l(uv, vec2(0.12, -0.33), vec2(0.12, 0.33)));", "\treturn min(d, l(uv, vec2(-0.31, -0.19), vec2(0.31, -0.19)));", "}", @@ -75,86 +75,75 @@ "}", "", "float k8(vec2 uv) { // ku", - "\tfloat d = s(uv, vec2(-0.212, 0.319), vec2(0.281, 0.158),vec2(0.259, -0.21));", + "\tfloat d = s(uv, vec2(-0.212, 0.319), vec2(0.281, 0.158),vec2(0.259, -0.22));", "\td = min(d, s(uv, vec2(-0.053, -0.328), vec2(-0.141, -0.11),vec2(-0.295, -0.023)));", - "\treturn min(d, l(uv, vec2(0.2565, -0.22), vec2(-0.0918, -0.2193)));", + "\treturn min(d, l(uv, vec2(0.2566, -0.22), vec2(-0.105, -0.2193)));", "}", "", - "float k9(vec2 uv) // ke", - "{", - "\tfloat d = s(uv, vec2(-0.192, 0.319), vec2(0.136, 0.167),vec2(0.128, -0.181));", + "float k9(vec2 uv) { // ke", + "\tfloat d = s(uv, vec2(-0.192, 0.319), vec2(0.136, 0.167),vec2(0.128, -0.189));", "\td = min(d, s(uv, vec2(-0.124, -0.332), vec2(-0.198, -0.131),vec2(-0.336, -0.01)));", "\treturn min(d, l(uv, vec2(0.3279, -0.19), vec2(-0.19, -0.19)));", "}", "", - "float k10(vec2 uv) // ko", - "{", + "float k10(vec2 uv) { // ko", "\tfloat d = l(uv, vec2(0.25, -0.24), vec2(-0.27, -0.24));", "\td = min(d, l(uv, vec2(0.25, -0.24), vec2(0.25, 0.25)));", "\treturn min(d, l(uv, vec2(-0.28, 0.25), vec2(0.25, 0.25)));", "}", "", - "float k11(vec2 uv) // sa", - "{", + "float k11(vec2 uv) { // sa", "\tfloat d = l(uv, vec2(-0.342, -0.1604), vec2(0.34, -0.16));", "\td = min(d, l(uv, vec2(-0.17, -0.33), vec2(-0.17, 0.0844)));", "\td = min(d, s(uv, vec2(0.17, -0.068), vec2(0.176, 0.287),vec2(-0.11, 0.315)));", "\treturn min(d, l(uv, vec2(0.17, -0.33), vec2(0.17, -0.03)));", "}", "", - "float k12(vec2 uv) // shi", - "{", + "float k12(vec2 uv) { // shi", "\tfloat d = s(uv, vec2(-0.22, -0.306), vec2(-0.117, -0.267),vec2(-0.03, -0.204));", "\td = min(d, s(uv, vec2(0.313, -0.153), vec2(0.177, 0.267),vec2(-0.273, 0.299)));", "\treturn min(d, s(uv, vec2(-0.289, -0.098), vec2(-0.154, -0.05),vec2(-0.087, 0.013)));", "}", "", - "float k13(vec2 uv) // su", - "{", + "float k13(vec2 uv) { // su", "\tfloat d = s(uv, vec2(0.057, 0.044), vec2(0.195, 0.126),vec2(0.314, 0.286));", "\td = min(d, s(uv, vec2(0.221, -0.269), vec2(0.1, 0.14),vec2(-0.316, 0.288)));", "\treturn min(d, l(uv, vec2(-0.27, -0.27), vec2(0.22, -0.27)));", "}", "", - "float k14(vec2 uv) // se", - "{", + "float k14(vec2 uv) { // se", "\tfloat d = s(uv, vec2(0.252, -0.182), vec2(0.41, -0.176),vec2(0.119, 0.078));", "\td = min(d, s(uv, vec2(-0.137, 0.15), vec2(-0.142, 0.352),vec2(0.278, 0.269)));", "\td = min(d, l(uv, vec2(-0.1353, -0.3247), vec2(-0.1373, 0.1509)));", "\treturn min(d, l(uv, vec2(-0.3301, -0.0978), vec2(0.2521, -0.1818)));", "}", "", - "float k15(vec2 uv) // so", - "{", + "float k15(vec2 uv) { // so", "\tfloat d = s(uv, vec2(0.265, -0.28), vec2(0.257, 0.135),vec2(-0.194, 0.309));", "\treturn min(d, s(uv, vec2(-0.276, -0.285), vec2(-0.199, -0.188),vec2(-0.148, -0.033)));", "}", "", - "float k16(vec2 uv) // ta", - "{", - "\tfloat d = s(uv, vec2(-0.212, 0.319), vec2(0.281, 0.158),vec2(0.259, -0.21));", + "float k16(vec2 uv) { // ta", + "\tfloat d = s(uv, vec2(-0.212, 0.319), vec2(0.281, 0.158),vec2(0.259, -0.22));", "\td = min(d, s(uv, vec2(-0.053, -0.328), vec2(-0.141, -0.11),vec2(-0.295, -0.023)));", - "\td = min(d, l(uv, vec2(0.2565, -0.22), vec2(-0.0918, -0.2193)));", - "\treturn min(d, s(uv, vec2(-0.102, -0.058), vec2(0.028, 0.025),vec2(0.126, 0.122)));", + "\td = min(d, l(uv, vec2(0.2575, -0.22), vec2(-0.1038, -0.2193)));", + "\treturn min(d, s(uv, vec2(-0.102, -0.058), vec2(0.028, 0.025),vec2(0.126, 0.132)));", "}", "", - "float k17(vec2 uv) // chi", - "{", + "float k17(vec2 uv) { // chi", "\tfloat d = s(uv, vec2(-0.269, -0.23), vec2(0.044, -0.237),vec2(0.265, -0.316));", "\td = min(d, l(uv, vec2(0.338, -0.04), vec2(-0.3238, -0.04)));", "\td = min(d, s(uv, vec2(-0.213, 0.324), vec2(0.044, 0.229),vec2(0.04, -0.038)));", - "\treturn min(d, l(uv, vec2(0.04, -0.249), vec2(0.04, -0.0363)));", + "\treturn min(d, l(uv, vec2(0.04, -0.258), vec2(0.04, -0.0363)));", "}", "", - "float k18(vec2 uv) // tsu", - "{", + "float k18(vec2 uv) { // tsu", "\tfloat d = s(uv, vec2(-0.175, 0.296), vec2(0.228, 0.222),vec2(0.292, -0.271));\t", "\td = min(d, s(uv, vec2(-0.071, -0.297), vec2(0, -0.144),vec2(0.013, -0.068)));", "\treturn min(d, s(uv, vec2(-0.29, -0.253), vec2(-0.222, -0.11),vec2(-0.204, -0.032)));", "}", "", - "float k19(vec2 uv) // te", - "{", + "float k19(vec2 uv) { // te", "\tfloat d = l(uv, vec2(-0.25, -0.29), vec2(0.25, -0.29));", "\td = min(d, l(uv, vec2(-0.33, -0.0704), vec2(0.33, -0.07)));", "\treturn min(d, s(uv, vec2(-0.225, 0.32), vec2(0.029, 0.261),vec2(0.03, -0.068)));", @@ -330,7 +319,7 @@ "\td = min(d, s(uv, vec2(-0.175, 0.287), vec2(0.013, 0.225),vec2(0.105, -0.135)));", "\td = min(d, s(uv, vec2(-0.292, -0.237), vec2(0.022, -0.228),vec2(0.243, -0.266)));", "\td = min(d, s(uv, vec2(-0.097, -0.348), vec2(-0.131, 0.113),vec2(-0.035, 0.28)));", - "\treturn min(d, s(uv, vec2(0.033, 0.333), vec2(0.313, 0.299),vec2(0.297, 0.073)));", + "\treturn min(d, s(uv, vec2(0.033, 0.333), vec2(0.333, 0.299),vec2(0.297, 0.071)));", "}", "", "float h2(vec2 uv) { // i", @@ -389,22 +378,19 @@ "\treturn min(d, s(uv, vec2(-0.19, 0.026), vec2(0.028947, 0.168335),vec2(0.183612, 0.325139)));", "}", "", - "float h9(vec2 uv) // ke", - "{", + "float h9(vec2 uv) { // ke", "\tfloat d = s(uv, vec2(0.183, -0.332), vec2(0.265, 0.268),vec2(-0.009, 0.328));", "\td = min(d, s(uv, vec2(-0.099, -0.136), vec2(0.076, -0.12),vec2(0.332, -0.158)));", "\treturn min(d, s(uv, vec2(-0.229, -0.323), vec2(-0.309, 0.089),vec2(-0.235, 0.298)));", "}", "", - "float h10(vec2 uv) // ko", - "{", + "float h10(vec2 uv) { // ko", "\tfloat d = s(uv, vec2(-0.225, -0.272), vec2(0.00429, -0.252796),vec2(0.208268, -0.268477));", "\td = min(d, s(uv, vec2(-0.002435, -0.145273), vec2(0.093951, -0.205755),vec2(0.208268, -0.266237)));", "\treturn min(d, s(uv, vec2(0.266548, 0.255698), vec2(-0.452981, 0.36098),vec2(-0.195206, 0.009291)));", "}", "", - "float h11(vec2 uv) // sa", - "{", + "float h11(vec2 uv) { // sa", "\tfloat d = s(uv, vec2(-0.048, -0.349), vec2(0.091, -0.023),vec2(0.239, 0.124));", "\td = min(d, s(uv, vec2(-0.149, 0.087), vec2(0.033, 0.036),vec2(0.239, 0.124)));", "\td = min(d, s(uv, vec2(-0.241, 0.176), vec2(-0.237, 0.116),vec2(-0.149, 0.087)));", @@ -412,27 +398,24 @@ "\treturn min(d, s(uv, vec2(0.201, 0.288), vec2(-0.252, 0.38),vec2(-0.241, 0.176)));", "}", "", - "float h12(vec2 uv) // shi", - "{", + "float h12(vec2 uv) { // shi", "\tfloat d = s(uv, vec2(-0.068, 0.306), vec2(-0.201, 0.289),vec2(-0.2, 0.072));", "\td = min(d, s(uv, vec2(-0.065, 0.306), vec2(0.201, 0.343),vec2(0.306895, 0.038412)));", "\treturn min(d, l(uv, vec2(-0.2, 0.07), vec2(-0.19, -0.33)));", "}", "", - "float h13(vec2 uv) // su", - "{", + "float h13(vec2 uv) { // su", "\tfloat d = s(uv, vec2(0.08, -0.056), vec2(0.076019, 0.125774),vec2(-0.051748, 0.136974));", "\td = min(d, s(uv, vec2(-0.053, 0.137), vec2(-0.191, 0.142),vec2(-0.18, 0.004)));", "\td = min(d, s(uv, vec2(-0.18, 0.004), vec2(-0.172, -0.057),vec2(-0.126, -0.082)));", "\td = min(d, s(uv, vec2(0.044, -0.048), vec2(-0.038, -0.126),vec2(-0.124, -0.083)));", - "\td = min(d, s(uv, vec2(0.046, -0.052), vec2(0.124, 0.039),vec2(0.088, 0.146)));", + "\td = min(d, s(uv, vec2(0.04, -0.052), vec2(0.124, 0.039),vec2(0.088, 0.146)));", "\td = min(d, s(uv, vec2(0.087226, 0.148175), vec2(0.046, 0.276),vec2(-0.149, 0.316)));", "\td = min(d,s(uv, vec2(0.336035, -0.230396), vec2(-0.002435, -0.234876),vec2(-0.340905, -0.214715)));", "\treturn min(d, l(uv, vec2(0.08, -0.0559), vec2(0.08, -0.35)));", "}", "", - "float h14(vec2 uv) // se", - "{", + "float h14(vec2 uv) { // se", "\tfloat d = s(uv, vec2(0.353967, -0.147513), vec2(0.015497, -0.136313),vec2(-0.352113, -0.113912));", "\td = min(d, s(uv, vec2(-0.18, 0.163), vec2(-0.179515, 0.3565),vec2(0.282239, 0.264658)));", "\td = min(d, s(uv, vec2(0.146, 0.08), vec2(0.188095, 0.027211),vec2(0.179129, -0.328958)));", @@ -440,25 +423,22 @@ "\treturn min(d, l(uv, vec2(-0.18, -0.31), vec2(-0.18, 0.16)));", "}", "", - "float h15(vec2 uv) // so", - "{", + "float h15(vec2 uv) { // so", "\tfloat d = s(uv, vec2(0.174646, -0.31), vec2(-0.015884, -0.291),vec2(-0.215, -0.299));", - "\td = min(d, s(uv, vec2(0.174, -0.308), vec2(-0.097, -0.062),vec2(-0.324, -0.006)));", + "\td = min(d, s(uv, vec2(0.174646, -0.31), vec2(-0.097, -0.062),vec2(-0.332, -0.006)));", "\td = min(d, s(uv, vec2(0.33, -0.062), vec2(0.042, -0.057),vec2(-0.332, -0.006)));", "\td = min(d, s(uv, vec2(0.209, 0.309459), vec2(-0.077, 0.313),vec2(-0.068, 0.163)));", "\treturn min(d, s(uv, vec2(-0.068, 0.162), vec2(-0.056231, 0.013771),vec2(0.33, -0.062)));", "}", "", - "float h16(vec2 uv) // ta", - "{", + "float h16(vec2 uv) { // ta", "\tfloat d = s(uv, vec2(0.067052, -0.223675), vec2(-0.139168, -0.190074),vec2(-0.331939, -0.194555));", "\td = min(d, s(uv, vec2(-0.309524, 0.296019), vec2(-0.192964, 0.058572),vec2(-0.114511, -0.353599)));", "\td = min(d, s(uv, vec2(0.291205, -0.104952), vec2(0.129815, -0.111672),vec2(0.008773, -0.087032)));", "\treturn min(d, s(uv, vec2(-0.015884, 0.103373), vec2(-0.177274, 0.36098),vec2(0.322586, 0.289298)));", "}", "", - "float h17(vec2 uv) // chi", - "{", + "float h17(vec2 uv) { // chi", "\tfloat d = s(uv, vec2(-0.237155, 0.111585), vec2(-0.124465, -0.108956),vec2(-0.054034, -0.343574));", "\td = min(d, s(uv, vec2(-0.305239, -0.205149), vec2(-0.082206, -0.193419),vec2(0.255865, -0.226265)));", "\td = min(d, s(uv, vec2(0.241779, 0.048238), vec2(0.061, -0.086),vec2(-0.236, 0.111)));", @@ -466,15 +446,13 @@ "\treturn min(d, s(uv, vec2(0.243, 0.23), vec2(0.323, 0.113),vec2(0.243, 0.049)));", "}", "", - "float h18(vec2 uv) // tsu", - "{", + "float h18(vec2 uv) { // tsu", "\tfloat d = s(uv, vec2(0.3, -0.072), vec2(0.237, -0.307),vec2(-0.324021, -0.165264));", "\td = min(d, s(uv, vec2(0.188, 0.182), vec2(0.324, 0.099),vec2(0.300471, -0.066725)));", "\treturn min(d, s(uv, vec2(-0.145594, 0.251), vec2(0.047, 0.253),vec2(0.186, 0.183)));", "}", "", - "float h19(vec2 uv) // te", - "{", + "float h19(vec2 uv) { // te", "\tfloat d = s(uv, vec2(0.326296, -0.275535), vec2(0.190129, -0.280227),vec2(-0.316978, -0.233304));", "\td = min(d, s(uv, vec2(0.324, -0.274), vec2(-0.063424, -0.179),vec2(-0.071, 0.045)));", "\treturn min(d, s(uv, vec2(-0.071, 0.048), vec2(-0.077, 0.259),vec2(0.227692, 0.292241)));", @@ -727,7 +705,7 @@ "\td = min(d, s(uv, vec2(-0.32093, 0.31), vec2(-0.145289, -0.068),vec2(-0.002, -0.027)));", "\td = min(d, s(uv, vec2(-0.002, -0.027), vec2(0.066, -0.011),vec2(0.060512, 0.18679)));", "\td = min(d, s(uv, vec2(0.146704, 0.305019), vec2(0.300997, 0.314903),vec2(0.332647, 0.081638)));", - "\treturn min(d, s(uv, vec2(0.060512, 0.18679), vec2(0.071536, 0.303042),vec2(0.146704, 0.305019)));", + "\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)", diff --git a/material_maker/doc/images/node_japanese_glyphs_samples.png b/material_maker/doc/images/node_japanese_glyphs_samples.png index 9b5c6905..13746bd6 100644 Binary files a/material_maker/doc/images/node_japanese_glyphs_samples.png and b/material_maker/doc/images/node_japanese_glyphs_samples.png differ