From 9c795bc55329d29cda37d8a485c8e67cdf45aeef Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Wed, 30 Jan 2019 15:16:05 -0800
Subject: [PATCH] text shader tweaks
---
src/mol-gl/shader/text.vert | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/mol-gl/shader/text.vert b/src/mol-gl/shader/text.vert
index e307dfb08..4bed4c542 100644
--- a/src/mol-gl/shader/text.vert
+++ b/src/mol-gl/shader/text.vert
@@ -45,12 +45,10 @@ void main(void){
float offsetX = uOffsetX * scale;
float offsetY = uOffsetY * scale;
float offsetZ = (uOffsetZ + aDepth * 0.95) * scale;
- if (vTexCoord.x == 10.0) {
- offsetZ -= 0.01;
- }
vec4 mvPosition = uModelView * aTransform * vec4(aPosition, 1.0);
+ // TODO
// #ifdef FIXED_SIZE
// if (ortho) {
// scale /= pixelRatio * ((uViewportHeight / 2.0) / -uCameraPosition.z) * 0.1;
@@ -60,9 +58,17 @@ void main(void){
// #endif
vec4 mvCorner = vec4(mvPosition.xyz, 1.0);
+
+ if (vTexCoord.x == 10.0) { // indicates background plane
+ // move a bit to the back, tkaing ditsnace to camera into account to avoid z-fighting
+ offsetZ -= 0.001 * distance(uCameraPosition, (uProjection * mvCorner).xyz);
+ }
+
mvCorner.xy += aMapping * size * scale;
mvCorner.x += offsetX;
mvCorner.y += offsetY;
+
+ // TODO
// if(ortho){
// mvCorner.xyz += normalize(-uCameraPosition) * offsetZ;
// } else {
--
GitLab