X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.h;h=e43e3b9bdc4998fbc2141a3f11fb01d6f97f1f7c;hp=60cba6c03605b76ea5f5945e0b67a49da9de9f86;hb=35f1190c8c8036ed11180656769cf0c1cbf7c2b3;hpb=47c305b00cc92169d826b0ca5268c92b1d019e28

diff --git a/src/objectrenderer.h b/src/objectrenderer.h
index 60cba6c..e43e3b9 100644
--- a/src/objectrenderer.h
+++ b/src/objectrenderer.h
@@ -11,6 +11,7 @@
 #include "shaderprogram.h"
 #include "bufferbuilder.h"
 
+
 namespace IPDF
 {
 	class View;
@@ -46,20 +47,44 @@ 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);
+				return Colour(Real(target.pixels[index+0])/Real(255),
+					Real(target.pixels[index+1])/Real(255),
+					Real(target.pixels[index+2])/Real(255),
+					Real(target.pixels[index+3])/Real(255));
+			}
+			
+			static void SetColour(const CPURenderTarget & target, int64_t x, int64_t y, const Colour & c)
+			{
+				int64_t index = 4*(x+y*target.w);
+				target.pixels[index+0] = c.r*255;
+				target.pixels[index+1] = c.g*255;
+				target.pixels[index+2] = c.b*255;
+				target.pixels[index+3] = c.a*255;
+			}
+			
 			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)) {}
 			};
+			
+			typedef std::pair<int64_t, int64_t> 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) = 0;
+			virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) = 0;
 			
 			
 			
@@ -72,6 +97,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);
 
 			ShaderProgram m_shader_program; /** GLSL shaders for GPU **/
 			GraphicsBuffer m_ibo; /** Index Buffer Object for GPU rendering **/
@@ -85,7 +112,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);
+			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
@@ -93,7 +120,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);
+			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
@@ -101,7 +128,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);
+			virtual void RenderUsingCPU(const Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id);
 	};
 
 	/** Renderer for bezier curves **/
@@ -111,7 +138,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); 
-			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;
@@ -121,12 +148,25 @@ namespace IPDF
 				float x0, y0;
 				float x1, y1;
 				float x2, y2;
+				float x3, y3;
 			};
 
 			GLuint m_bezier_buffer_texture;
 			GLuint m_bezier_id_buffer_texture;
 
 	};
+	
+	/** Renderer for filled paths **/
+	class PathRenderer : public ObjectRenderer
+	{
+		public:
+			PathRenderer() : ObjectRenderer(PATH, "shaders/rect_vert.glsl", "shaders/rect_frag.glsl", "shaders/rect_outline_geom.glsl") {}
+			virtual ~PathRenderer() {}
+			virtual void RenderUsingCPU(const 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) {}
+	};
+	
 }
 
 #endif //_OBJECT_RENDERER_H