X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FOpenGl%2FOpenGl_ShaderManager.cxx;h=d94768d4f2eebcf513a3fcced38ab65f4c4a259f;hb=5f4bd4d4d2737c7c3b1cfc54726c819bb1c5388c;hpb=bd6a84544101c3e8dce8414f32f79f5af06e93bc diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx index 2af3565..d94768d 100644 --- a/src/OpenGl/OpenGl_ShaderManager.cxx +++ b/src/OpenGl/OpenGl_ShaderManager.cxx @@ -83,7 +83,7 @@ const char THE_FUNC_pointLight[] = EOL" vec3 aLight = occLight_Position (theId).xyz;" EOL" if (occLight_IsHeadlight (theId) == 0)" EOL" {" - EOL" aLight = vec3 (occWorldViewMatrix * occModelWorldMatrix * vec4 (aLight, 1.0));" + EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));" EOL" }" EOL" aLight -= thePoint;" EOL @@ -121,8 +121,8 @@ const char THE_FUNC_spotLight[] = EOL" vec3 aSpotDir = occLight_SpotDirection (theId).xyz;" EOL" if (occLight_IsHeadlight (theId) == 0)" EOL" {" - EOL" aLight = vec3 (occWorldViewMatrix * occModelWorldMatrix * vec4 (aLight, 1.0));" - EOL" aSpotDir = vec3 (occWorldViewMatrix * occModelWorldMatrix * vec4 (aSpotDir, 0.0));" + EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));" + EOL" aSpotDir = vec3 (occWorldViewMatrix * vec4 (aSpotDir, 0.0));" EOL" }" EOL" aLight -= thePoint;" EOL @@ -171,7 +171,7 @@ const char THE_FUNC_directionalLight[] = EOL" vec3 aLight = normalize (occLight_Position (theId).xyz);" EOL" if (occLight_IsHeadlight (theId) == 0)" EOL" {" - EOL" aLight = vec3 (occWorldViewMatrix * occModelWorldMatrix * vec4 (aLight, 0.0));" + EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));" EOL" }" EOL EOL" vec3 aHalf = normalize (aLight + theView);" @@ -200,7 +200,7 @@ const char THE_FUNC_directionalLightFirst[] = EOL" vec3 aLight = normalize (occLightSources[1].xyz);" EOL" if (occLight_IsHeadlight (0) == 0)" EOL" {" - EOL" aLight = vec3 (occWorldViewMatrix * occModelWorldMatrix * vec4 (aLight, 0.0));" + EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));" EOL" }" EOL EOL" vec3 aHalf = normalize (aLight + theView);"