pub_soft/pymol-open-source
3
0
Fork 0
mirror of https://github.com/schrodinger/pymol-open-source.git synced 2026-06-03 19:54:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix broken label scaling on Linux

Browse Source 
- label scaling became distorted on window resizing
- minor readability update in label.vs (no change)
This commit is contained in:
Thomas Holder
2014-03-10 15:50:16 +00:00
parent fad02f13af
commit 1cb98e4f57
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/shaders/label.vs
View File

@@ -21,16 +21,15 @@ uniform float fog_enabled; // actually bool
void main()
{
vec4 transformedPosition = gl_ModelViewProjectionMatrix * attr_worldpos;
transformedPosition.xyz = transformedPosition.xyz/transformedPosition.w;
transformedPosition.w = 1.;
transformedPosition.xy = transformedPosition.xy + attr_screenworldoffset.xy/(screenSize*screenOriginVertexScale);
transformedPosition.z = transformedPosition.z + attr_screenworldoffset.z/(screenSize.x*screenOriginVertexScale);
transformedPosition.x = transformedPosition.x + aspectRatioAdjustment * attr_screenoffset.x * 2./screenSize.x;
transformedPosition.y = transformedPosition.y + attr_screenoffset.y * 2./screenSize.y;
gl_Position = transformedPosition;
vec4 pos = gl_ModelViewProjectionMatrix * attr_worldpos;
pos /= pos.w;
pos.xyz += attr_screenworldoffset / (screenSize.xyx * screenOriginVertexScale);
pos.xy += attr_screenoffset.xy * 2. / screenSize * vec2(aspectRatioAdjustment, 1.);
gl_Position = pos;
textureLookup = attr_texcoords;
normalizedViewCoordinate = (gl_Position.xyz/gl_Position.w) / 2.0 + 0.5;
normalizedViewCoordinate = pos.xyz / 2.0 + 0.5;
if (fog_enabled > 0.5) {
vec3 eye_pos = vec3(gl_ModelViewMatrix * attr_worldpos);
fog = max(0.0, (gl_Fog.end - abs(eye_pos.z)) * gl_Fog.scale);