indicator.vs (pymol-v2.1.0.tar.bz2) | : | indicator.vs (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
#ifdef PYMOL_IOS | #ifdef PYMOL_WEBGL_IOS | |||
precision highp float; | precision highp float; | |||
#else | #else | |||
#version 120 | #version 120 | |||
#endif | #endif | |||
#include webgl_header.vs | ||||
attribute vec4 a_Vertex; | attribute vec4 a_Vertex; | |||
attribute vec4 a_Color; | attribute vec4 a_Color; | |||
varying vec4 COLOR; | varying vec4 COLOR; | |||
varying vec4 POS; | ||||
#ifdef PYMOL_IOS | ||||
uniform mat4 g_ModelViewMatrix; | ||||
uniform mat4 g_ProjectionMatrix; | ||||
#endif | ||||
uniform float g_pointSize; | uniform float g_pointSize; | |||
void main() | void main() | |||
{ | { | |||
COLOR = a_Color; | COLOR = a_Color; | |||
gl_PointSize = g_pointSize; | gl_PointSize = g_pointSize; | |||
#ifdef PYMOL_IOS | ||||
gl_Position = g_ProjectionMatrix * g_ModelViewMatrix * a_Vertex; | gl_Position = g_ProjectionMatrix * g_ModelViewMatrix * a_Vertex; | |||
#else | POS = gl_Position; | |||
gl_Position = gl_ModelViewProjectionMatrix * a_Vertex; | ||||
#endif | ||||
} | } | |||
End of changes. 5 change blocks. | ||||
10 lines changed or deleted | 5 lines changed or added |