It now is all the working.

[ipdf/code.git] / src / view.cpp

diff --git a/src/view.cpp b/src/view.cpp
index 40262ac..9e832d2 100644 (file)
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -10,12 +10,7 @@ void View::Render()
        static bool debug_output_done = false;
        if (!debug_output_done)
        {
-               Debug("Bounds are %s", m_bounds.Str().c_str());
-               Debug("Objects are:");
-               for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
-               {
-                       Debug("%u\t%s", id, m_document.m_objects.bounds[id].Str().c_str());
-               }
+               m_document.DebugDumpObjects();
                debug_output_done = true;
        }
 
@@ -32,6 +27,8 @@ void View::Render()
        glBegin(GL_QUADS);
        for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
        {
+               if (m_document.m_objects.types[id] == RECT_FILLED)
+                       continue;
                Rect obj_bounds = m_document.m_objects.bounds[id];
                glVertex2f(obj_bounds.x, obj_bounds.y);
                glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);
@@ -40,4 +37,17 @@ void View::Render()
        }
        glEnd();
 
+       for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
+       {
+               if (m_document.m_objects.types[id] == RECT_OUTLINE)
+                       continue;
+               Rect obj_bounds = m_document.m_objects.bounds[id];
+               glBegin(GL_LINE_LOOP);
+               glVertex2f(obj_bounds.x, obj_bounds.y);
+               glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y);
+               glVertex2f(obj_bounds.x + obj_bounds.w, obj_bounds.y + obj_bounds.h);
+               glVertex2f(obj_bounds.x, obj_bounds.y + obj_bounds.h);
+               glEnd();
+       }
+
 }