From 69b69714cba4a369fa4c7849aeed4ebbe5443ff2 Mon Sep 17 00:00:00 2001
From: Thomas Breloff <tom@breloff.com>
Date: Fri, 24 Jun 2016 12:15:21 -0400
Subject: [PATCH] working on glvisualize

---
 src/backends/glvisualize.jl | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/backends/glvisualize.jl b/src/backends/glvisualize.jl
index e3f00e08..8166ebe2 100644
--- a/src/backends/glvisualize.jl
+++ b/src/backends/glvisualize.jl
@@ -78,9 +78,17 @@ end
 
 function gl_display(plt::Plot{GLVisualizeBackend})
     screen = plt.o
-    for sp in plt.subplots
+    # for sp in plt.subplots
+    for (name, sp) in plt.spmap
         # TODO: setup subplot
 
+        f = rect -> gl_viewport(bbox(sp), rect)
+        sp_screen = Screen(
+            screen,
+            name = name,
+            area = GLVisualize.const_lift(f, screen.area)
+        )
+
         for series in series_list(sp)
             d = series.d
             st = d[:seriestype]
@@ -92,7 +100,7 @@ function gl_display(plt::Plot{GLVisualizeBackend})
                 ismatrix(y) || (y = repmat(y, 1, length(x)))
                 z = transpose_z(d, map(Float32, d[:z].surf), false)
                 viz = GLVisualize.visualize((x, y, z), :surface)
-                GLVisualize.view(viz, screen, camera = :perspective)
+                GLVisualize.view(viz, sp_screen, camera = :perspective)
 
             else
                 points = if is3d(st)
@@ -108,7 +116,7 @@ function gl_display(plt::Plot{GLVisualizeBackend})
                 if st in (:scatter, :scatter3d) || d[:markershape] != :none
                     marker = gl_marker(d[:markershape], msize, is3d(st))
                     viz = GLVisualize.visualize((marker, points), color = gl_color(d[:markercolor], d[:markeralpha]))
-                    GLVisualize.view(viz, screen, camera = camera)
+                    GLVisualize.view(viz, sp_screen, camera = camera)
 
                     # TODO: might need to switch to these forms later?
                     # GLVisualize.visualize((marker ,(x, y, z)))
@@ -121,7 +129,7 @@ function gl_display(plt::Plot{GLVisualizeBackend})
                 lw = d[:linewidth]
                 if !(st in (:scatter, :scatter3d)) && lw > 0
                     viz = GLVisualize.visualize(points, :lines) #, color=colors, model=rotation)
-                    GLVisualize.view(viz, screen, camera = camera)
+                    GLVisualize.view(viz, sp_screen, camera = camera)
                 end
             end
         end