Skip to content

Commit 92ee54f

Browse files
eduardodoriaeduardodoria
committed
Fixed terrain texture shader and removed one default shader
1 parent 9905ceb commit 92ee54f

7 files changed

Lines changed: 1 addition & 236 deletions

File tree

‎engine/core/subsystem/RenderSystem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ bool RenderSystem::loadMesh(Entity entity, MeshComponent& mesh, uint8_t pipeline
718718
if (mesh.submeshes[i].hasTexCoord1 && hasPBRTextures){
719719
p_hasTexture1 = true;
720720
}
721-
if (terrain && !terrain->blendMap.empty()){
721+
if (terrain && (!terrain->blendMap.empty() || hasPBRTextures)){
722722
p_hasTexture1 = true;
723723
}
724724
if (hasLights && mesh.receiveLights){

‎engine/shaders/glsl300es.h‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17808,41 +17808,6 @@ static const std::string ui_Vc4_glsl300es =
1780817808
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABY29sb3IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
1780917809
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZMVDQBAAAAAAAAAA==";
1781017810

17811-
static const std::string mesh_UltVc4Txr_glsl300es =
17812-
"U0JTIAAAAACCAAAAR0xTTCwBAAABAFNUQUf+BQAAVkVSVENPREUBAwAAI3ZlcnNpb24gMzAwIGVzCgp1bmlmb3JtIHZlYzQgdV92"
17813-
"c19wYnJQYXJhbXNbMTJdOwpsYXlvdXQobG9jYXRpb24gPSAwKSBpbiB2ZWMzIGFfcG9zaXRpb247Cm91dCB2ZWM0IHZfY29sb3I7"
17814-
"CmxheW91dChsb2NhdGlvbiA9IDEpIGluIHZlYzQgYV9jb2xvcjsKCm1hdDQgZ2V0Qm9uZVRyYW5zZm9ybSgpCnsKICAgIHJldHVy"
17815-
"biBtYXQ0KHZlYzQoMC4wKSwgdmVjNCgwLjApLCB2ZWM0KDAuMCksIHZlYzQoMC4wKSk7Cn0KCnZlYzMgZ2V0TW9ycGhQb3NpdGlv"
17816-
"bih2ZWMzIHBvcykKewogICAgcmV0dXJuIHBvczsKfQoKdmVjMyBnZXRTa2luUG9zaXRpb24odmVjMyBwb3MsIG1hdDQgYm9uZVRy"
17817-
"YW5zZm9ybSkKewogICAgcmV0dXJuIHBvczsKfQoKdmVjNCBnZXRQb3NpdGlvbihtYXQ0IGJvbmVUcmFuc2Zvcm0pCnsKICAgIHZl"
17818-
"YzMgcGFyYW0gPSBhX3Bvc2l0aW9uOwogICAgdmVjMyBwYXJhbV8xID0gZ2V0TW9ycGhQb3NpdGlvbihwYXJhbSk7CiAgICBtYXQ0"
17819-
"IHBhcmFtXzIgPSBib25lVHJhbnNmb3JtOwogICAgcmV0dXJuIHZlYzQoZ2V0U2tpblBvc2l0aW9uKHBhcmFtXzEsIHBhcmFtXzIp"
17820-
"LCAxLjApOwp9Cgp2b2lkIG1haW4oKQp7CiAgICBtYXQ0IHBhcmFtID0gZ2V0Qm9uZVRyYW5zZm9ybSgpOwogICAgdl9jb2xvciA9"
17821-
"IGFfY29sb3I7CiAgICBnbF9Qb3NpdGlvbiA9IG1hdDQodV92c19wYnJQYXJhbXNbOF0sIHVfdnNfcGJyUGFyYW1zWzldLCB1X3Zz"
17822-
"X3BiclBhcmFtc1sxMF0sIHVfdnNfcGJyUGFyYW1zWzExXSkgKiBnZXRQb3NpdGlvbihwYXJhbSk7Cn0KClJFRkzpAgAAbWVzaF9V"
17823-
"bHRWYzRUeHJfZ2xzbDMwMGVzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAB"
17824-
"AAAAAwAAAAAAAABhX3Bvc2l0aW9uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17825-
"AAAAAFBPU0lUSU9OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkxU"
17826-
"M2FfY29sb3IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAATk9STUFM"
17827-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTFQ0AwAAAHVfdnNf"
17828-
"cGJyUGFyYW1zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwYnJQYXJhbXMAAAAAAAAA"
17829-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAW1vZGVsTWF0cml4AAAA"
17830-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNQVQ0AQAAAAAAAABub3JtYWxNYXRyaXgA"
17831-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATUFUNAEAAABAAAAAbXZwTWF0cml4AAAA"
17832-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE1BVDQBAAAAgAAAAFNUQUd1AwAARlJB"
17833-
"R0NPREUoAgAAI3ZlcnNpb24gMzAwIGVzCnByZWNpc2lvbiBtZWRpdW1wIGZsb2F0OwpwcmVjaXNpb24gaGlnaHAgaW50OwoKdW5p"
17834-
"Zm9ybSBoaWdocCB2ZWM0IHVfZnNfcGJyUGFyYW1zWzFdOwppbiBoaWdocCB2ZWM0IHZfY29sb3I7CmxheW91dChsb2NhdGlvbiA9"
17835-
"IDApIG91dCBoaWdocCB2ZWM0IGdfZmluYWxDb2xvcjsKCmhpZ2hwIHZlYzQgZ2V0VmVydGV4Q29sb3IoKQp7CiAgICByZXR1cm4g"
17836-
"dl9jb2xvcjsKfQoKaGlnaHAgdmVjNCBnZXRCYXNlQ29sb3IoKQp7CiAgICByZXR1cm4gdV9mc19wYnJQYXJhbXNbMF0gKiBnZXRW"
17837-
"ZXJ0ZXhDb2xvcigpOwp9CgpoaWdocCB2ZWMzIGxpbmVhclRvc1JHQihoaWdocCB2ZWMzIGNvbG9yKQp7CiAgICByZXR1cm4gcG93"
17838-
"KGNvbG9yLCB2ZWMzKDAuNDU0NTQ1NDY4MDkxOTY0NzIxNjc5Njg3NSkpOwp9Cgp2b2lkIG1haW4oKQp7CiAgICBoaWdocCB2ZWM0"
17839-
"IF81MCA9IGdldEJhc2VDb2xvcigpOwogICAgaGlnaHAgdmVjMyBwYXJhbSA9IF81MC54eXo7CiAgICBnX2ZpbmFsQ29sb3IgPSB2"
17840-
"ZWM0KGxpbmVhclRvc1JHQihwYXJhbSksIF81MC53KTsKfQoKUkVGTDkBAABtZXNoX1VsdFZjNFR4cl9nbHNsMzAwZXMAAAAAAAAA"
17841-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAAEAAAB1X2ZzX3BiclBh"
17842-
"cmFtcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcGJyUGFyYW1zAAAAAAAAAAAAAAAA"
17843-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAFiYXNlQ29sb3JGYWN0b3IAAAAA"
17844-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkxUNAEAAAAAAAAA";
17845-
1784617811
std::string getBase64Shader(std::string name) {
1784717812
if (name == "depth_Ist_glsl300es") {
1784817813
return depth_Ist_glsl300es;
@@ -17926,8 +17891,6 @@ std::string getBase64Shader(std::string name) {
1792617891
return mesh_UltUv1_glsl300es;
1792717892
} else if (name == "mesh_UltVc4Ski_glsl300es") {
1792817893
return mesh_UltVc4Ski_glsl300es;
17929-
} else if (name == "mesh_UltVc4Txr_glsl300es") {
17930-
return mesh_UltVc4Txr_glsl300es;
1793117894
} else if (name == "mesh_UltVc4_glsl300es") {
1793217895
return mesh_UltVc4_glsl300es;
1793317896
} else if (name == "mesh_Ult_glsl300es") {

‎engine/shaders/glsl410.h‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16983,40 +16983,6 @@ static const std::string ui_Vc4_glsl410 =
1698316983
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAFjb2xvcgAAAAAAAAAAAAAAAAAAAAAAAAAA"
1698416984
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkxUNAEAAAAAAAAA";
1698516985

16986-
static const std::string mesh_UltVc4Txr_glsl410 =
16987-
"U0JTIAAAAACCAAAAR0xTTJoBAAAAAFNUQUcQBgAAVkVSVENPREUTAwAAI3ZlcnNpb24gNDEwCgp1bmlmb3JtIHZlYzQgdV92c19w"
16988-
"YnJQYXJhbXNbMTJdOwpsYXlvdXQobG9jYXRpb24gPSAwKSBpbiB2ZWMzIGFfcG9zaXRpb247CmxheW91dChsb2NhdGlvbiA9IDAp"
16989-
"IG91dCB2ZWM0IHZfY29sb3I7CmxheW91dChsb2NhdGlvbiA9IDEpIGluIHZlYzQgYV9jb2xvcjsKCm1hdDQgZ2V0Qm9uZVRyYW5z"
16990-
"Zm9ybSgpCnsKICAgIHJldHVybiBtYXQ0KHZlYzQoMC4wKSwgdmVjNCgwLjApLCB2ZWM0KDAuMCksIHZlYzQoMC4wKSk7Cn0KCnZl"
16991-
"YzMgZ2V0TW9ycGhQb3NpdGlvbih2ZWMzIHBvcykKewogICAgcmV0dXJuIHBvczsKfQoKdmVjMyBnZXRTa2luUG9zaXRpb24odmVj"
16992-
"MyBwb3MsIG1hdDQgYm9uZVRyYW5zZm9ybSkKewogICAgcmV0dXJuIHBvczsKfQoKdmVjNCBnZXRQb3NpdGlvbihtYXQ0IGJvbmVU"
16993-
"cmFuc2Zvcm0pCnsKICAgIHZlYzMgcGFyYW0gPSBhX3Bvc2l0aW9uOwogICAgdmVjMyBwYXJhbV8xID0gZ2V0TW9ycGhQb3NpdGlv"
16994-
"bihwYXJhbSk7CiAgICBtYXQ0IHBhcmFtXzIgPSBib25lVHJhbnNmb3JtOwogICAgcmV0dXJuIHZlYzQoZ2V0U2tpblBvc2l0aW9u"
16995-
"KHBhcmFtXzEsIHBhcmFtXzIpLCAxLjApOwp9Cgp2b2lkIG1haW4oKQp7CiAgICBtYXQ0IHBhcmFtID0gZ2V0Qm9uZVRyYW5zZm9y"
16996-
"bSgpOwogICAgdl9jb2xvciA9IGFfY29sb3I7CiAgICBnbF9Qb3NpdGlvbiA9IG1hdDQodV92c19wYnJQYXJhbXNbOF0sIHVfdnNf"
16997-
"cGJyUGFyYW1zWzldLCB1X3ZzX3BiclBhcmFtc1sxMF0sIHVfdnNfcGJyUGFyYW1zWzExXSkgKiBnZXRQb3NpdGlvbihwYXJhbSk7"
16998-
"Cn0KClJFRkzpAgAAbWVzaF9VbHRWYzRUeHJfZ2xzbDQxMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
16999-
"AAIAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAAAAABhX3Bvc2l0aW9uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17000-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBPU0lUSU9OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17001-
"AAAAAAAAAAAAAAAAAAAARkxUM2FfY29sb3IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17002-
"AAAAAAAAAAABAAAATk9STUFMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17003-
"AAAAAABGTFQ0AwAAAHVfdnNfcGJyUGFyYW1zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
17004-
"AABwYnJQYXJhbXMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADA"
17005-
"AAAAAW1vZGVsTWF0cml4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNQVQ0AQAA"
17006-
"AAAAAABub3JtYWxNYXRyaXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATUFUNAEA"
17007-
"AABAAAAAbXZwTWF0cml4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE1BVDQB"
17008-
"AAAAgAAAAFNUQUcjAwAARlJBR0NPREXWAQAAI3ZlcnNpb24gNDEwCgp1bmlmb3JtIHZlYzQgdV9mc19wYnJQYXJhbXNbMV07Cmxh"
17009-
"eW91dChsb2NhdGlvbiA9IDApIGluIHZlYzQgdl9jb2xvcjsKbGF5b3V0KGxvY2F0aW9uID0gMCkgb3V0IHZlYzQgZ19maW5hbENv"
17010-
"bG9yOwoKdmVjNCBnZXRWZXJ0ZXhDb2xvcigpCnsKICAgIHJldHVybiB2X2NvbG9yOwp9Cgp2ZWM0IGdldEJhc2VDb2xvcigpCnsK"
17011-
"ICAgIHJldHVybiB1X2ZzX3BiclBhcmFtc1swXSAqIGdldFZlcnRleENvbG9yKCk7Cn0KCnZlYzMgbGluZWFyVG9zUkdCKHZlYzMg"
17012-
"Y29sb3IpCnsKICAgIHJldHVybiBwb3coY29sb3IsIHZlYzMoMC40NTQ1NDU0NjgwOTE5NjQ3MjE2Nzk2ODc1KSk7Cn0KCnZvaWQg"
17013-
"bWFpbigpCnsKICAgIHZlYzQgXzUwID0gZ2V0QmFzZUNvbG9yKCk7CiAgICB2ZWMzIHBhcmFtID0gXzUwLnh5ejsKICAgIGdfZmlu"
17014-
"YWxDb2xvciA9IHZlYzQobGluZWFyVG9zUkdCKHBhcmFtKSwgXzUwLncpOwp9CgpSRUZMOQEAAG1lc2hfVWx0VmM0VHhyX2dsc2w0"
17015-
"MTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAQAA"
17016-
"AHVfZnNfcGJyUGFyYW1zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwYnJQYXJhbXMA"
17017-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAWJhc2VDb2xv"
17018-
"ckZhY3RvcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTFQ0AQAAAAAAAAA=";
17019-
1702016986
std::string getBase64Shader(std::string name) {
1702116987
if (name == "depth_Ist_glsl410") {
1702216988
return depth_Ist_glsl410;
@@ -17100,8 +17066,6 @@ std::string getBase64Shader(std::string name) {
1710017066
return mesh_UltUv1_glsl410;
1710117067
} else if (name == "mesh_UltVc4Ski_glsl410") {
1710217068
return mesh_UltVc4Ski_glsl410;
17103-
} else if (name == "mesh_UltVc4Txr_glsl410") {
17104-
return mesh_UltVc4Txr_glsl410;
1710517069
} else if (name == "mesh_UltVc4_glsl410") {
1710617070
return mesh_UltVc4_glsl410;
1710717071
} else if (name == "mesh_Ult_glsl410") {

‎engine/shaders/hlsl5.h‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19535,55 +19535,6 @@ static const std::string ui_Vc4_hlsl5 =
1953519535
"cmFtcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAWNv"
1953619536
"bG9yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTFQ0AQAAAAAAAAA=";
1953719537

19538-
static const std::string mesh_UltVc4Txr_hlsl5 =
19539-
"U0JTIAAAAACCAAAASExTTDIAAAAAAFNUQUfPCAAAVkVSVENPREXSBQAAY2J1ZmZlciB1X3ZzX3BiclBhcmFtcyA6IHJlZ2lzdGVy"
19540-
"KGIwKQp7CiAgICByb3dfbWFqb3IgZmxvYXQ0eDQgcGJyUGFyYW1zX21vZGVsTWF0cml4IDogcGFja29mZnNldChjMCk7CiAgICBy"
19541-
"b3dfbWFqb3IgZmxvYXQ0eDQgcGJyUGFyYW1zX25vcm1hbE1hdHJpeCA6IHBhY2tvZmZzZXQoYzQpOwogICAgcm93X21ham9yIGZs"
19542-
"b2F0NHg0IHBiclBhcmFtc19tdnBNYXRyaXggOiBwYWNrb2Zmc2V0KGM4KTsKfTsKCgpzdGF0aWMgZmxvYXQ0IGdsX1Bvc2l0aW9u"
19543-
"OwpzdGF0aWMgZmxvYXQzIGFfcG9zaXRpb247CnN0YXRpYyBmbG9hdDQgdl9jb2xvcjsKc3RhdGljIGZsb2F0NCBhX2NvbG9yOwoK"
19544-
"c3RydWN0IFNQSVJWX0Nyb3NzX0lucHV0CnsKICAgIGZsb2F0MyBhX3Bvc2l0aW9uIDogUE9TSVRJT047CiAgICBmbG9hdDQgYV9j"
19545-
"b2xvciA6IE5PUk1BTDsKfTsKCnN0cnVjdCBTUElSVl9Dcm9zc19PdXRwdXQKewogICAgZmxvYXQ0IHZfY29sb3IgOiBURVhDT09S"
19546-
"RDA7CiAgICBmbG9hdDQgZ2xfUG9zaXRpb24gOiBTVl9Qb3NpdGlvbjsKfTsKCmZsb2F0NHg0IGdldEJvbmVUcmFuc2Zvcm0oKQp7"
19547-
"CiAgICByZXR1cm4gZmxvYXQ0eDQoMC4wZi54eHh4LCAwLjBmLnh4eHgsIDAuMGYueHh4eCwgMC4wZi54eHh4KTsKfQoKZmxvYXQz"
19548-
"IGdldE1vcnBoUG9zaXRpb24oZmxvYXQzIHBvcykKewogICAgcmV0dXJuIHBvczsKfQoKZmxvYXQzIGdldFNraW5Qb3NpdGlvbihm"
19549-
"bG9hdDMgcG9zLCBmbG9hdDR4NCBib25lVHJhbnNmb3JtKQp7CiAgICByZXR1cm4gcG9zOwp9CgpmbG9hdDQgZ2V0UG9zaXRpb24o"
19550-
"ZmxvYXQ0eDQgYm9uZVRyYW5zZm9ybSkKewogICAgZmxvYXQzIHBhcmFtID0gYV9wb3NpdGlvbjsKICAgIGZsb2F0MyBwYXJhbV8x"
19551-
"ID0gZ2V0TW9ycGhQb3NpdGlvbihwYXJhbSk7CiAgICBmbG9hdDR4NCBwYXJhbV8yID0gYm9uZVRyYW5zZm9ybTsKICAgIHJldHVy"
19552-
"biBmbG9hdDQoZ2V0U2tpblBvc2l0aW9uKHBhcmFtXzEsIHBhcmFtXzIpLCAxLjBmKTsKfQoKdm9pZCB2ZXJ0X21haW4oKQp7CiAg"
19553-
"ICBmbG9hdDR4NCBwYXJhbSA9IGdldEJvbmVUcmFuc2Zvcm0oKTsKICAgIHZfY29sb3IgPSBhX2NvbG9yOwogICAgZ2xfUG9zaXRp"
19554-
"b24gPSBtdWwoZ2V0UG9zaXRpb24ocGFyYW0pLCBwYnJQYXJhbXNfbXZwTWF0cml4KTsKICAgIGdsX1Bvc2l0aW9uLnogPSAoZ2xf"
19555-
"UG9zaXRpb24ueiArIGdsX1Bvc2l0aW9uLncpICogMC41Owp9CgpTUElSVl9Dcm9zc19PdXRwdXQgbWFpbihTUElSVl9Dcm9zc19J"
19556-
"bnB1dCBzdGFnZV9pbnB1dCkKewogICAgYV9wb3NpdGlvbiA9IHN0YWdlX2lucHV0LmFfcG9zaXRpb247CiAgICBhX2NvbG9yID0g"
19557-
"c3RhZ2VfaW5wdXQuYV9jb2xvcjsKICAgIHZlcnRfbWFpbigpOwogICAgU1BJUlZfQ3Jvc3NfT3V0cHV0IHN0YWdlX291dHB1dDsK"
19558-
"ICAgIHN0YWdlX291dHB1dC5nbF9Qb3NpdGlvbiA9IGdsX1Bvc2l0aW9uOwogICAgc3RhZ2Vfb3V0cHV0LnZfY29sb3IgPSB2X2Nv"
19559-
"bG9yOwogICAgcmV0dXJuIHN0YWdlX291dHB1dDsKfQpSRUZM6QIAAG1lc2hfVWx0VmM0VHhyX2hsc2w1AAAAAAAAAAAAAAAAAAAA"
19560-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQAAAAMAAAAAAAAAYV9wb3NpdGlvbgAAAAAAAAAA"
19561-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQT1NJVElPTgAAAAAAAAAAAAAAAAAAAAAA"
19562-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZMVDNhX2NvbG9yAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19563-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAE5PUk1BTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19564-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkxUNAMAAAB1X3ZzX3BiclBhcmFtcwAAAAAAAAAAAAAAAAAAAAAAAAAA"
19565-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcGJyUGFyYW1zAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19566-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAFtb2RlbE1hdHJpeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19567-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAATUFUNAEAAAAAAAAAbm9ybWFsTWF0cml4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19568-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAE1BVDQBAAAAQAAAAG12cE1hdHJpeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19569-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABNQVQ0AQAAAIAAAABTVEFHtAQAAEZSQUdDT0RFZwMAAGNidWZmZXIgdV9mc19wYnJQYXJh"
19570-
"bXMgOiByZWdpc3RlcihiMCkKewogICAgZmxvYXQ0IHBiclBhcmFtc19iYXNlQ29sb3JGYWN0b3IgOiBwYWNrb2Zmc2V0KGMwKTsK"
19571-
"fTsKCgpzdGF0aWMgZmxvYXQ0IHZfY29sb3I7CnN0YXRpYyBmbG9hdDQgZ19maW5hbENvbG9yOwoKc3RydWN0IFNQSVJWX0Nyb3Nz"
19572-
"X0lucHV0CnsKICAgIGZsb2F0NCB2X2NvbG9yIDogVEVYQ09PUkQwOwp9OwoKc3RydWN0IFNQSVJWX0Nyb3NzX091dHB1dAp7CiAg"
19573-
"ICBmbG9hdDQgZ19maW5hbENvbG9yIDogU1ZfVGFyZ2V0MDsKfTsKCmZsb2F0NCBnZXRWZXJ0ZXhDb2xvcigpCnsKICAgIHJldHVy"
19574-
"biB2X2NvbG9yOwp9CgpmbG9hdDQgZ2V0QmFzZUNvbG9yKCkKewogICAgcmV0dXJuIHBiclBhcmFtc19iYXNlQ29sb3JGYWN0b3Ig"
19575-
"KiBnZXRWZXJ0ZXhDb2xvcigpOwp9CgpmbG9hdDMgbGluZWFyVG9zUkdCKGZsb2F0MyBjb2xvcikKewogICAgcmV0dXJuIHBvdyhj"
19576-
"b2xvciwgMC40NTQ1NDU0NjgwOTE5NjQ3MjE2Nzk2ODc1Zi54eHgpOwp9Cgp2b2lkIGZyYWdfbWFpbigpCnsKICAgIGZsb2F0NCBf"
19577-
"NTAgPSBnZXRCYXNlQ29sb3IoKTsKICAgIGZsb2F0MyBwYXJhbSA9IF81MC54eXo7CiAgICBnX2ZpbmFsQ29sb3IgPSBmbG9hdDQo"
19578-
"bGluZWFyVG9zUkdCKHBhcmFtKSwgXzUwLncpOwp9CgpTUElSVl9Dcm9zc19PdXRwdXQgbWFpbihTUElSVl9Dcm9zc19JbnB1dCBz"
19579-
"dGFnZV9pbnB1dCkKewogICAgdl9jb2xvciA9IHN0YWdlX2lucHV0LnZfY29sb3I7CiAgICBmcmFnX21haW4oKTsKICAgIFNQSVJW"
19580-
"X0Nyb3NzX091dHB1dCBzdGFnZV9vdXRwdXQ7CiAgICBzdGFnZV9vdXRwdXQuZ19maW5hbENvbG9yID0gZ19maW5hbENvbG9yOwog"
19581-
"ICAgcmV0dXJuIHN0YWdlX291dHB1dDsKfQpSRUZMOQEAAG1lc2hfVWx0VmM0VHhyX2hsc2w1AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19582-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAQAAAHVfZnNfcGJyUGFyYW1zAAAAAAAA"
19583-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwYnJQYXJhbXMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
19584-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAWJhc2VDb2xvckZhY3RvcgAAAAAAAAAAAAAAAAAA"
19585-
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTFQ0AQAAAAAAAAA=";
19586-
1958719538
std::string getBase64Shader(std::string name) {
1958819539
if (name == "depth_Ist_hlsl5") {
1958919540
return depth_Ist_hlsl5;
@@ -19667,8 +19618,6 @@ std::string getBase64Shader(std::string name) {
1966719618
return mesh_UltUv1_hlsl5;
1966819619
} else if (name == "mesh_UltVc4Ski_hlsl5") {
1966919620
return mesh_UltVc4Ski_hlsl5;
19670-
} else if (name == "mesh_UltVc4Txr_hlsl5") {
19671-
return mesh_UltVc4Txr_hlsl5;
1967219621
} else if (name == "mesh_UltVc4_hlsl5") {
1967319622
return mesh_UltVc4_hlsl5;
1967419623
} else if (name == "mesh_Ult_hlsl5") {

0 commit comments

Comments
 (0)