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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-03 18:29:26 +00:00
parent b1e1ad4aea
commit cb6fe2b7ef
10 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qglengine/shaders/selection_halo.glsl
View File

@@ -34,11 +34,9 @@ void main(void) {
vec2 dp = diffPair(diffVector(fb_hover, hover_id));
float v = diffAlpha(dp, hover_fill);
qgl_FragData[2] = has_hover*hh*v*vec4(hover_color.bgr, hover_color.a);
qgl_FragData[0] = has_hover*hh*v*vec4(hover_color.bgr, hover_color.a);
dp = diffPair(diffVector(fb_selection, vec4(1)));
v = diffAlpha(dp, selection_fill);
qgl_FragData[3] = has_selection*v*vec4(selection_color.bgr, selection_color.a);
//qgl_FragData[3] = vec4(has_selection);
qgl_FragData[1] = has_selection*v*vec4(selection_color.bgr, selection_color.a);
}

2
qglengine/shaders/service_frame.glsl
View File

@@ -8,6 +8,8 @@ void main(void) {
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(determinant(mat3(qgl_ModelMatrix)), 0.333);
//mat3 mm = transpose(mat3(qgl_ModelMatrix));
//mat_scale = min(min(dot(vec3(1), mm[0]), dot(vec3(1), mm[1])), dot(vec3(1), mm[2]));
}