X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.h;h=6592f4b9d1257248c41b551a256e6c8449fdf405;hp=8f2c0875edec5d0b0eae4cbc7ca030e6f4cc893d;hb=e88c1ef58e2446cf57d5f7b0d5d4e5bfff0b8c37;hpb=1ba642be477818ba73be34b5e96484b5e91d8c66

diff --git a/src/document.h b/src/document.h
index 8f2c087..6592f4b 100644
--- a/src/document.h
+++ b/src/document.h
@@ -11,6 +11,19 @@ typedef struct stbtt_fontinfo stbtt_fontinfo;
 
 namespace IPDF
 {
+	struct SVGMatrix
+	{
+		Real a; // width
+		Real c; // skew x by y
+		Real e; // translate x
+		
+		Real b; // skew y by x
+		Real d; // height
+		Real f; // translate y
+	};
+	// SVG matrix transforms (x,y) <- (a x' + c y' + e, b x' + d y' + f)
+	// Equivelant to OpenGL 3d matrix transform ((a, c, e) (b, d, f) (0,0,1))
+	
 	class Document
 	{
 		public:
@@ -37,10 +50,16 @@ namespace IPDF
 			bool operator==(const Document & equ) const;
 			bool operator!=(const Document & equ) const {return !(this->operator==(equ));}
 
-			void Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
+			unsigned AddGroup(unsigned start_index, unsigned end_index);
+			unsigned AddBezier(const Bezier & bezier);
+			unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
 			unsigned AddBezierData(const Bezier & bezier);
 			
 
+
+			
+
+			
 			
 			/** SVG Related functions **/
 			
@@ -48,9 +67,12 @@ namespace IPDF
 			void LoadSVG(const std::string & filename, const Rect & bounds = Rect(0,0,1,1));
 			
 			/** Parse an SVG node or SVG-group node, adding children to the document **/
-			void ParseSVGNode(pugi::xml_node & root, const Rect & bounds, Real & width, Real & height);
+			void ParseSVGNode(pugi::xml_node & root, SVGMatrix & transform);
 			/** Parse an SVG path with string **/
-			void ParseSVGPathData(const std::string & d, const Rect & bounds);
+			std::pair<unsigned, unsigned> ParseSVGPathData(const std::string & d, const SVGMatrix & transform);
+			
+			/** Modify an SVG transformation matrix **/
+			static void ParseSVGTransform(const std::string & s, SVGMatrix & transform);
 
 			/** Font related functions **/
 			void SetFont(const std::string & font_filename);
@@ -62,6 +84,8 @@ namespace IPDF
 			inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
 			QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);
 			QuadTreeIndex GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren mytype);
+			// Returns the number of objects the current object formed when clipped, the objects in question are added to the end of the document.
+			int ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type);
 #endif
 
 		private: