From d8c970c02e166538ba277d93791455b17917f369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= Date: Wed, 14 Aug 2013 10:06:21 -0300 Subject: [PATCH] towards passing automatically ZB parameters --- openglcanvas.cpp | 6 ++++++ shaders/test_vertex_shader.vert | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openglcanvas.cpp b/openglcanvas.cpp index 2288d04..b18d881 100644 --- a/openglcanvas.cpp +++ b/openglcanvas.cpp @@ -709,6 +709,12 @@ void OpenGLCanvas::setShaders() { GLuint p = glCreateProgram(); + // Bind attributes zblambda and zbR to the vertex shader + glVertexAttrib1f(0,zblambda); + glBindAttribLocation(p,0,"zblambda"); + glVertexAttrib1f(1,zbR); + glBindAttribLocation(p,1,"zbR"); + glAttachShader(p,v); glAttachShader(p,f); diff --git a/shaders/test_vertex_shader.vert b/shaders/test_vertex_shader.vert index 40a5290..6f057b2 100644 --- a/shaders/test_vertex_shader.vert +++ b/shaders/test_vertex_shader.vert @@ -6,7 +6,9 @@ float u, v, x, y, z; varying float r, theta, s; float lambda, phi; float extent, scale, vis_mode, center_lambda, center_phi; -varying float zblambda,zbr,zbR,zbalpha,zbrho; +float zbr,zbalpha,zbrho; +/*attribute*/ float zblambda; +/*attribute*/ float zbR; void main(void){ @@ -85,7 +87,6 @@ void main(void){ u=x/(-z); v=y/(-z); // Z-B transformation - // TODO: read zblambda and zbR from the interface zblambda=0.1; zbR=1.0; zbalpha=atan(v,u); -- GitLab