SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2015-12-09 15:44:03 +00:00
parent 64f21dc682
commit 458a516317
31 changed files with 1486 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qglview/shaders/dsl_pass_0.frag
View File

@@ -5,7 +5,7 @@
in vec3 src_normal, normal, binormal;//, et;
in vec4 pos, ppos;
in float fogCoord, logz;
in float fogCoord, FC, C;
in mat3 TBN;
uniform bool acc_fog;
@@ -16,6 +16,7 @@ const vec3 luma = vec3(0.299, 0.587, 0.114);
void main(void) {
//float z = pos.w;//((z_near / (z_near-z_far)) * z_far) / (pos.w - (z_far / (z_far-z_near)));
float logz = log(pos.w * C + 1.) * FC;
vec4 dc = qgl_FragColor;
vec2 tc = qgl_FragTexture.xy;
float hei = dot(texture(qgl_Material.map_relief.map, tc).rgb, luma) * qgl_Material.map_relief.amount + qgl_Material.map_relief.offset;

9
qglview/shaders/dsl_pass_0.vert
View File

@@ -2,7 +2,7 @@
out vec3 src_normal, normal, binormal;//, et;
out vec4 pos, ppos;
out float fogCoord, logz;
out float fogCoord, FC, C;
out mat3 TBN;
uniform bool acc_fog;
@@ -11,9 +11,6 @@ uniform vec3 eye;
uniform mat4 prev_ModelViewProjectioMatrix;
uniform float z_near, z_far;
const float C = 0.0001;
float FC = 1. / log(z_far * C + 1.);
void main(void) {
normal = qgl_Normal;//(qgl_NormalMatrix * qgl_Normal);
binormal = qgl_Bitangent;//(qgl_NormalMatrix * qgl_Normal);
@@ -39,7 +36,9 @@ void main(void) {
//pos *= pos.w;
//logz = gl_Position.w*C + 1; //version with fragment code
logz = log(pos.w * C + 1.) * FC;
C = 0.01;
FC = 1. / log(z_far * C + 1.);
//pos.z = (logz + logz - 1) * pos.w;
gl_Position = pos;