Render object range on the CPU

diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp
index 86b6430..4dcfc1c 100644 (file)
--- a/src/objectrenderer.cpp
+++ b/src/objectrenderer.cpp
@@ -45,7 +45,7 @@ void ObjectRenderer::RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id)
 /**
  * Default implementation for rendering using CPU
  */
 /**
  * Default implementation for rendering using CPU
  */

-void ObjectRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target)
+void ObjectRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id)

 {
        Error("Cannot render objects of type %d on CPU", m_type);
        //TODO: Render a rect or something instead?
 {
        Error("Cannot render objects of type %d on CPU", m_type);
        //TODO: Render a rect or something instead?


@@ -110,10 +110,12 @@ void ObjectRenderer::FinaliseBuffers()
 /**
  * Rectangle (filled)
  */
 /**
  * Rectangle (filled)
  */

-void RectFilledRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target)
+void RectFilledRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id)

 {
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {
 {
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {

+               if (m_indexes[i] < first_obj_id) continue;
+               if (m_indexes[i] > last_obj_id) continue;

                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                for (int64_t x = max(0L, bounds.x); x <= min(bounds.x+bounds.w, target.w-1); ++x)
                {
                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                for (int64_t x = max(0L, bounds.x); x <= min(bounds.x+bounds.w, target.w-1); ++x)
                {


@@ -132,11 +134,13 @@ void RectFilledRenderer::RenderUsingCPU(const Objects & objects, const View & vi
 /**
  * Rectangle (outine)
  */
 /**
  * Rectangle (outine)
  */

-void RectOutlineRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target)
+void RectOutlineRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id)

 {
        //Debug("Render %u outlined rectangles on CPU", m_indexes.size());
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {
 {
        //Debug("Render %u outlined rectangles on CPU", m_indexes.size());
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {

+               if (m_indexes[i] < first_obj_id) continue;
+               if (m_indexes[i] > last_obj_id) continue;

                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                
                // Using bresenham's lines now mainly because I want to see if they work
                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                
                // Using bresenham's lines now mainly because I want to see if they work


@@ -158,10 +162,12 @@ void RectOutlineRenderer::RenderUsingCPU(const Objects & objects, const View & v
 /**
  * Circle (filled)
  */
 /**
  * Circle (filled)
  */

-void CircleFilledRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target)
+void CircleFilledRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id)

 {
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {
 {
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {

+               if (m_indexes[i] < first_obj_id) continue;
+               if (m_indexes[i] > last_obj_id) continue;

                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                int64_t centre_x = bounds.x + bounds.w / 2;
                int64_t centre_y = bounds.y + bounds.h / 2;
                PixelBounds bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                int64_t centre_x = bounds.x + bounds.w / 2;
                int64_t centre_y = bounds.y + bounds.h / 2;


@@ -205,11 +211,13 @@ Rect ObjectRenderer::CPURenderBounds(const Rect & bounds, const View & view, con
  * Bezier curve
  * Not sure how to apply De'Casteljau, will just use a bunch of Bresnham lines for now.
  */
  * Bezier curve
  * Not sure how to apply De'Casteljau, will just use a bunch of Bresnham lines for now.
  */

-void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target)
+void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id)

 {
        //Warn("Rendering Beziers on CPU. Things may explode.");
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {
 {
        //Warn("Rendering Beziers on CPU. Things may explode.");
        for (unsigned i = 0; i < m_indexes.size(); ++i)
        {

+               if (m_indexes[i] < first_obj_id) continue;
+               if (m_indexes[i] > last_obj_id) continue;

                Rect bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                PixelBounds pix_bounds(bounds);
 
                Rect bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target));
                PixelBounds pix_bounds(bounds);
 

diff --git a/src/objectrenderer.h b/src/objectrenderer.h
index 60cba6c..602b461 100644 (file)
--- a/src/objectrenderer.h
+++ b/src/objectrenderer.h
@@ -59,7 +59,7 @@ namespace IPDF
                        static void SaveBMP(const CPURenderTarget & target, const char * filename);
 
 
                        static void SaveBMP(const CPURenderTarget & target, const char * filename);
 
 

-                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target) = 0;
+                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) = 0;

                        
                        
                        
                        
                        
                        


@@ -85,7 +85,7 @@ namespace IPDF
                public:
                        RectFilledRenderer() : ObjectRenderer(RECT_FILLED, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl","shaders/rect_filled_geom.glsl") {}
                        virtual ~RectFilledRenderer() {}
                public:
                        RectFilledRenderer() : ObjectRenderer(RECT_FILLED, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl","shaders/rect_filled_geom.glsl") {}
                        virtual ~RectFilledRenderer() {}

-                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target);
+                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id);

        };
        /** Renderer for outlined rectangles **/
        class RectOutlineRenderer : public ObjectRenderer
        };
        /** Renderer for outlined rectangles **/
        class RectOutlineRenderer : public ObjectRenderer


@@ -93,7 +93,7 @@ namespace IPDF
                public:
                        RectOutlineRenderer() : ObjectRenderer(RECT_OUTLINE, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/rect_outline_geom.glsl") {}
                        virtual ~RectOutlineRenderer() {}
                public:
                        RectOutlineRenderer() : ObjectRenderer(RECT_OUTLINE, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/rect_outline_geom.glsl") {}
                        virtual ~RectOutlineRenderer() {}

-                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target);
+                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id);

        };
        /** Renderer for filled circles **/
        class CircleFilledRenderer : public ObjectRenderer
        };
        /** Renderer for filled circles **/
        class CircleFilledRenderer : public ObjectRenderer


@@ -101,7 +101,7 @@ namespace IPDF
                public:
                        CircleFilledRenderer() : ObjectRenderer(CIRCLE_FILLED, "shaders/rect_vert.glsl", "shaders/circle_frag.glsl", "shaders/circle_filled_geom.glsl") {}
                        virtual ~CircleFilledRenderer() {}
                public:
                        CircleFilledRenderer() : ObjectRenderer(CIRCLE_FILLED, "shaders/rect_vert.glsl", "shaders/circle_frag.glsl", "shaders/circle_filled_geom.glsl") {}
                        virtual ~CircleFilledRenderer() {}

-                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target);
+                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id);

        };
 
        /** Renderer for bezier curves **/
        };
 
        /** Renderer for bezier curves **/


@@ -111,7 +111,7 @@ namespace IPDF
                        BezierRenderer() : ObjectRenderer(BEZIER, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/bezier_texbuf_geom.glsl") {}
                        virtual ~BezierRenderer() {}
                        virtual void RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id); 
                        BezierRenderer() : ObjectRenderer(BEZIER, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/bezier_texbuf_geom.glsl") {}
                        virtual ~BezierRenderer() {}
                        virtual void RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id); 

-                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target);
+                       virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id);

                        void PrepareBezierGPUBuffer(const Objects & objects);
                private:
                        GraphicsBuffer m_bezier_coeffs;
                        void PrepareBezierGPUBuffer(const Objects & objects);
                private:
                        GraphicsBuffer m_bezier_coeffs;

diff --git a/src/view.cpp b/src/view.cpp
index 4dbe5df..eb269a2 100644 (file)
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -206,7 +206,7 @@ void View::Render(int width, int height)
 
                for (unsigned i = 0; i < m_object_renderers.size(); ++i)
                {
 
                for (unsigned i = 0; i < m_object_renderers.size(); ++i)
                {

-                       m_object_renderers[i]->RenderUsingCPU(m_document.m_objects, *this, {m_cpu_rendering_pixels, width, height});
+                       m_object_renderers[i]->RenderUsingCPU(m_document.m_objects, *this, {m_cpu_rendering_pixels, width, height}, first_obj, last_obj);

                }
                m_screen.RenderPixels(0,0,width, height, m_cpu_rendering_pixels); //TODO: Make this work :(
                // Debug for great victory (do something similar for GPU and compare?)
                }
                m_screen.RenderPixels(0,0,width, height, m_cpu_rendering_pixels); //TODO: Make this work :(
                // Debug for great victory (do something similar for GPU and compare?)