From 0ab45b018fa98e9ef6cffd70178f208eb4f16550 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 25 Sep 2014 15:04:44 +0300 Subject: Implement zooming to cursor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/shaders/colorandposition.vert | 10 ---------- src/datavisualization/engine/shaders/position.vert | 10 ++++++++++ src/datavisualization/engine/shaders/positionmap.frag | 11 +++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 src/datavisualization/engine/shaders/colorandposition.vert create mode 100644 src/datavisualization/engine/shaders/position.vert create mode 100644 src/datavisualization/engine/shaders/positionmap.frag (limited to 'src/datavisualization/engine/shaders') diff --git a/src/datavisualization/engine/shaders/colorandposition.vert b/src/datavisualization/engine/shaders/colorandposition.vert deleted file mode 100644 index 34849eae..00000000 --- a/src/datavisualization/engine/shaders/colorandposition.vert +++ /dev/null @@ -1,10 +0,0 @@ -uniform highp mat4 MVP; - -attribute highp vec3 vertexPosition_mdl; - -varying highp vec3 pos; - -void main() { - gl_Position = MVP * vec4(vertexPosition_mdl, 1.0); - pos = vertexPosition_mdl; -} diff --git a/src/datavisualization/engine/shaders/position.vert b/src/datavisualization/engine/shaders/position.vert new file mode 100644 index 00000000..34849eae --- /dev/null +++ b/src/datavisualization/engine/shaders/position.vert @@ -0,0 +1,10 @@ +uniform highp mat4 MVP; + +attribute highp vec3 vertexPosition_mdl; + +varying highp vec3 pos; + +void main() { + gl_Position = MVP * vec4(vertexPosition_mdl, 1.0); + pos = vertexPosition_mdl; +} diff --git a/src/datavisualization/engine/shaders/positionmap.frag b/src/datavisualization/engine/shaders/positionmap.frag new file mode 100644 index 00000000..9a277ab8 --- /dev/null +++ b/src/datavisualization/engine/shaders/positionmap.frag @@ -0,0 +1,11 @@ +varying highp vec3 pos; + +void main() { + // This shader encodes the axis position into the vertex color, assuming the object + // is a cube filling the entire data area of the graph + gl_FragColor = vec4((pos.x + 1.0) / 2.0, + (pos.y + 1.0) / 2.0, + (-pos.z + 1.0) / 2.0, + 0.0); +} + -- cgit v1.2.3