Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Romanov <a.romanov@blend4web.com>2016-07-04 11:19:13 +0300
committerAlexander Romanov <a.romanov@blend4web.com>2016-07-04 11:19:13 +0300
commitd4eb28ab7e486dad0d16e363f3576b19630a0aa4 (patch)
tree169b2f38b867eb2b49940ebe7e87bb90ea079d05 /source/blender/gpu/shaders
parent4aaf5baccf1b2f6bb0d618ab5005848431e168d0 (diff)
BI Viewport(GLSL): support for envmap in Texture node
This patch is another step to achieve BI and it's Viewport consistency for cubemap textures. {F318879} To test world_space_shading flag D2072 is required. Alexander (Blend4Web Team) Reviewers: campbellbarton, brecht Subscribers: homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D2074
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_material.glsl7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 02e9ba1c8c3..f3bd817a7cc 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1358,6 +1358,13 @@ void mtex_cube_map(vec3 co, samplerCube ima, out float value, out vec4 color)
value = 1.0;
}
+void mtex_cube_map_refl_from_refldir(
+ samplerCube ima, vec3 reflecteddirection, out float value, out vec4 color)
+{
+ color = textureCube(ima, reflecteddirection);
+ value = 1.0;
+}
+
void mtex_cube_map_refl(
samplerCube ima, vec3 vp, vec3 vn, mat4 viewmatrixinverse, mat4 viewmatrix,
out float value, out vec4 color)