X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.h;h=85a413b40a564b9613d190f3b916f51031ce7a8f;hp=8f52aa00c95065b6ed99a92e6ee9b6a52cdb0aa6;hb=64b7c42c71c35d520424cf4ca5ecaa99faef8b26;hpb=85336af25da0c613460bbeda4ff7553933e13064 diff --git a/src/objectrenderer.h b/src/objectrenderer.h index 8f52aa0..85a413b 100644 --- a/src/objectrenderer.h +++ b/src/objectrenderer.h @@ -10,7 +10,9 @@ #include "graphicsbuffer.h" #include "shaderprogram.h" #include "bufferbuilder.h" +#include +#define BEZIER_CPU_DECASTELJAU namespace IPDF { @@ -28,7 +30,7 @@ namespace IPDF { public: /** Construct the ObjectRenderer **/ - ObjectRenderer(const ObjectType & type, const char * vert_glsl_file, const char * frag_glsl_file, const char * geom_glsl_file = ""); + ObjectRenderer(const ObjectType & type, const char * vert_glsl_file="", const char * frag_glsl_file="", const char * geom_glsl_file = ""); virtual ~ObjectRenderer() {} /** @@ -47,20 +49,46 @@ namespace IPDF uint8_t * pixels; int64_t w; int64_t h; + + + }; + + static Colour GetColour(const CPURenderTarget & target, int64_t x, int64_t y) + { + int64_t index = 4*(x+y*target.w); + if (index < 0 || index >= 4*(target.w*target.h)) + return Colour(0,0,0,0); + return Colour(target.pixels[index+0],target.pixels[index+1],target.pixels[index+2],target.pixels[index+3]); + } + + static void SetColour(const CPURenderTarget & target, int64_t x, int64_t y, const Colour & c) + { + int64_t index = 4*(x+y*target.w); + if (index < 0 || index >= 4*(target.w*target.h)) + return; + + target.pixels[index+0] = c.r; + target.pixels[index+1] = c.g; + target.pixels[index+2] = c.b; + target.pixels[index+3] = c.a; + } + struct PixelBounds { int64_t x; int64_t y; int64_t w; int64_t h; - PixelBounds(const Rect & bounds) : x(Double(bounds.x)), y(Double(bounds.y)), w(Double(bounds.w)), h(Double(bounds.h)) {} + PixelBounds(const Rect & bounds); }; + + typedef std::pair PixelPoint; static Rect CPURenderBounds(const Rect & bounds, const View & view, const CPURenderTarget & target); - + static PixelPoint CPUPointLocation(const Vec2 & point, const View & view, const CPURenderTarget & target); static void SaveBMP(const CPURenderTarget & target, const char * filename); - virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) = 0; + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) = 0; @@ -73,6 +101,8 @@ namespace IPDF /** Helper for CPU rendering that will render a line using Bresenham's algorithm. Do not use the transpose argument. **/ static void RenderLineOnCPU(int64_t x0, int64_t y0, int64_t x1, int64_t y1, const CPURenderTarget & target, const Colour & colour = Colour(0,0,0,1), bool transpose = false); + + static void FloodFillOnCPU(int64_t x0, int64_t y0, const PixelBounds & bounds, const CPURenderTarget & target, const Colour & fill, const Colour & stroke=Colour(0,0,0,0)); ShaderProgram m_shader_program; /** GLSL shaders for GPU **/ GraphicsBuffer m_ibo; /** Index Buffer Object for GPU rendering **/ @@ -86,7 +116,7 @@ namespace IPDF 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, unsigned first_obj_id, unsigned last_obj_id); + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); }; /** Renderer for outlined rectangles **/ class RectOutlineRenderer : public ObjectRenderer @@ -94,7 +124,7 @@ namespace IPDF 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, unsigned first_obj_id, unsigned last_obj_id); + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); }; /** Renderer for filled circles **/ class CircleFilledRenderer : public ObjectRenderer @@ -102,7 +132,7 @@ namespace IPDF 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, unsigned first_obj_id, unsigned last_obj_id); + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); }; /** Renderer for bezier curves **/ @@ -112,8 +142,11 @@ 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); - 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); + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); + void PrepareBezierGPUBuffer(Objects & objects); + + static void RenderBezierOnCPU(const Bezier & relative, const Rect & bounds, const View & view, const CPURenderTarget & target, const Colour & c=Colour(0,0,0,255)); + private: GraphicsBuffer m_bezier_coeffs; GraphicsBuffer m_bezier_ids; @@ -130,15 +163,25 @@ namespace IPDF }; - /** Renderer for filled circles **/ - class GroupRenderer : public ObjectRenderer + /** Renderer for filled paths **/ + class PathRenderer : public ObjectRenderer { public: - GroupRenderer() : ObjectRenderer(GROUP, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/rect_outline_geom.glsl") {} - virtual ~GroupRenderer() {} - virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); + PathRenderer() : ObjectRenderer(PATH, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/bezier_texbug_geom.glsl") {} + virtual ~PathRenderer() {} + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id); // do nothing on GPU virtual void RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id) {} + + }; + + class FakeRenderer : public ObjectRenderer + { + public: + FakeRenderer() : ObjectRenderer(PATH,NULL,NULL,NULL) {} + ~FakeRenderer() {} + virtual void RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) {} + virtual void RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id) {} }; }