SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@672 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-10 19:03:26 +00:00
parent 16146ae6fd
commit ac1f1ab22d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qglengine/core/glshaders_headers.h
View File

@@ -43,7 +43,8 @@ const char qgl_vertex_head[] =
"flat out uint qgl_MaterialIndex;\n" "flat out uint qgl_MaterialIndex;\n"
"uniform mat4 qgl_ViewMatrix;\n" "uniform mat4 qgl_ViewMatrix;\n"
"uniform mat4 qgl_ViewProjMatrix;\n" "uniform mat4 qgl_ViewProjMatrix;\n"
"mat3 qgl_getNormalMatrix() {return mat3(qgl_ViewMatrix * qgl_ModelMatrix);}\n" "mat3 qgl_getNormalMatrix() {return inverse(mat3(qgl_ViewMatrix * qgl_ModelMatrix));}\n"
"mat3 qgl_getTangentMatrix() {return mat3(qgl_ViewMatrix * qgl_ModelMatrix);}\n"
"vec4 qgl_ftransform() {return qgl_ViewProjMatrix * (qgl_ModelMatrix * vec4(qgl_Vertex, 1));}\n" "vec4 qgl_ftransform() {return qgl_ViewProjMatrix * (qgl_ModelMatrix * vec4(qgl_Vertex, 1));}\n"
""; "";

5
qglengine/shaders/ds_geom.glsl
View File

@@ -9,9 +9,8 @@ void main(void) {
qgl_FragTexture = qgl_Texture; qgl_FragTexture = qgl_Texture;
gl_Position = qgl_ftransform(); gl_Position = qgl_ftransform();
mat3 nmat = qgl_getNormalMatrix(); geom_normal = normalize(qgl_Normal * qgl_getNormalMatrix());
geom_normal = normalize(nmat * qgl_Normal); TBN = qgl_getTangentMatrix() * mat3(qgl_Tangent, qgl_Bitangent, qgl_Normal);
TBN = nmat * mat3(qgl_Tangent, qgl_Bitangent, qgl_Normal);
object_color = qgl_ObjectColor; object_color = qgl_ObjectColor;
} }