Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-30 05:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use C++11 raw literals for shader code to improve readability

Browse source 
In files that have lots of branching, `\t` was replaced with a
tab character instead.
This commit is contained in:
Hugo Locurcio 2021-07-19 08:06:51 +02:00
parent b76dfde329
commit abc38b8d66
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
17 changed files with 1146 additions and 1040 deletions
Download patch file Download diff file Expand all files Collapse all files

63
editor/plugins/texture_layered_editor_plugin.cpp
View file

@ -104,43 +104,46 @@ void TextureLayeredEditor::_update_material() {
}
void TextureLayeredEditor::_make_shaders() {
String shader_2d_array = ""
"shader_type canvas_item;\n"
"uniform sampler2DArray tex;\n"
"uniform float layer;\n"
"void fragment() {\n"
" COLOR = textureLod(tex,vec3(UV,layer),0.0);\n"
"}";
shaders[0].instantiate();
shaders[0]->set_code(shader_2d_array);
shaders[0]->set_code(R"(
shader_type canvas_item;
String shader_cube = ""
"shader_type canvas_item;\n"
"uniform samplerCube tex;\n"
"uniform vec3 normal;\n"
"uniform mat3 rot;\n"
"void fragment() {\n"
" vec3 n = rot * normalize(vec3(normal.xy*(UV * 2.0 - 1.0),normal.z));\n"
" COLOR = textureLod(tex,n,0.0);\n"
"}";
uniform sampler2DArray tex;
uniform float layer;
void fragment() {
COLOR = textureLod(tex, vec3(UV, layer), 0.0);
}
)");
shaders[1].instantiate();
shaders[1]->set_code(shader_cube);
shaders[1]->set_code(R"(
shader_type canvas_item;
String shader_cube_array = ""
"shader_type canvas_item;\n"
"uniform samplerCubeArray tex;\n"
"uniform vec3 normal;\n"
"uniform mat3 rot;\n"
"uniform float layer;\n"
"void fragment() {\n"
" vec3 n = rot * normalize(vec3(normal.xy*(UV * 2.0 - 1.0),normal.z));\n"
" COLOR = textureLod(tex,vec4(n,layer),0.0);\n"
"}";
uniform samplerCube tex;
uniform vec3 normal;
uniform mat3 rot;
void fragment() {
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
COLOR = textureLod(tex, n, 0.0);
}
)");
shaders[2].instantiate();
shaders[2]->set_code(shader_cube_array);
shaders[2]->set_code(R"(
shader_type canvas_item;
uniform samplerCubeArray tex;
uniform vec3 normal;
uniform mat3 rot;
uniform float layer;
void fragment() {
vec3 n = rot * normalize(vec3(normal.xy * (UV * 2.0 - 1.0), normal.z));
COLOR = textureLod(tex, vec4(n, layer), 0.0);
}
)");
for (int i = 0; i < 3; i++) {
materials[i].instantiate();