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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-01 16:52:10 +00:00
parent 09298fadcd
commit 385070f70f
33 changed files with 226 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglengine/shaders/ds_geom.glsl
View File

@@ -52,8 +52,8 @@ void main(void) {
float height = dot(qgl_materialTexture(QGL_MAP_RELIEF, tc, vec4(0)).rgb, luma);
qgl_FragData[0] = vec4(diffuse .rgb, roughness );
qgl_FragData[1] = vec4(normal .xyz, reflectivity);
qgl_FragData[0] = vec4(diffuse .rgb, reflectivity);
qgl_FragData[1] = vec4(normal .xyz, roughness );
qgl_FragData[2] = vec4(specular.rgb, height );
qgl_FragData[3] = vec4(emission.rgb, 0/*bn.x*/);
//qgl_FragData[4] = vec4(speed.xy, bn.yz);

4
qglengine/shaders/ds_light.glsl
View File

@@ -113,8 +113,8 @@ void main(void) {
vec3 normal = v1.xyz;
vec3 specular = v2.rgb;
vec3 emission = v3.rgb;
float roughness = v0.w;
float reflectivity = v1.w;
float reflectivity = v0.w;
float roughness = v1.w;
float height = v2.w;
//bn = normalize(vec3(v3.w, v4.zw));
//bn2 = normalize(cross(n, bn));

3
qglengine/shaders/service_frame.glsl
View File

@@ -6,7 +6,8 @@ out float mat_scale;
void main(void) {
gl_Position = qgl_ftransform();
object_color_g = qgl_ObjectColor;
mat_scale = pow(qgl_ModelMatrix[0][0] * qgl_ModelMatrix[1][1] * qgl_ModelMatrix[2][2], 0.3333);
//mat_scale = pow(qgl_ModelMatrix[0][0] * qgl_ModelMatrix[1][1] * qgl_ModelMatrix[2][2], 0.3333);
mat_scale = pow(determinant(mat3(qgl_ModelMatrix)), 0.333);
}