diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-10-14 19:44:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-10-14 19:44:41 -0300 |
| commit | cd218b8c09482f9f9f2d15285d55ad955673697f (patch) | |
| tree | 60a09595de85ac63027b916dc2344b6612975bf1 /servers/visual | |
| parent | 94e35ef316caa0f713eef1c3823c8fa035508090 (diff) | |
Fixes
-=-=-
-Fixed normalmap depth parameter
-Fixes to DirAccess on Windows
-Double click on resource dock will open them
-Fixes to doc generator (should make github wiki on class list more up to date)
Diffstat (limited to 'servers/visual')
| -rw-r--r-- | servers/visual/rasterizer.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/shader_language.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp index 64247c1f2a..5e81bc960a 100644 --- a/servers/visual/rasterizer.cpp +++ b/servers/visual/rasterizer.cpp @@ -102,6 +102,8 @@ RID Rasterizer::_create_shader(const FixedMaterialShaderKey& p_key) { } else { scode+="NORMALMAP=tex( fmp_normal_tex,"+uv_str+").xyz * vec3(2.0,2.0,1.0) - vec3(1.0,1.0,0.0);\n"; } + scode+="NORMALMAP_DEPTH=fmp_normal;\n"; + code+=scode; } diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 49420b51c0..ca219b13a4 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -1043,6 +1043,7 @@ const ShaderLanguage::BuiltinsDef ShaderLanguage::fragment_builtins_defs[]={ { "TANGENT", TYPE_VEC3}, { "BINORMAL", TYPE_VEC3}, { "NORMALMAP", TYPE_VEC3}, + { "NORMALMAP_DEPTH", TYPE_FLOAT}, { "UV", TYPE_VEC2}, { "UV2", TYPE_VEC2}, { "COLOR", TYPE_VEC4}, |