X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.h;h=56e80a3ce9beab5fc9e769ca335d9616c45f879a;hp=ff91f46517eec61f686e55b6fe76377c54553b01;hb=d83560835237d360f6d12776435e91676c8ab45f;hpb=d3e941df79b54b698a5b8a1d4763346c4d6eb3d7

diff --git a/src/view.h b/src/view.h
index ff91f46..56e80a3 100644
--- a/src/view.h
+++ b/src/view.h
@@ -6,8 +6,9 @@
 #include "framebuffer.h"
 #include "objectrenderer.h"
 
-#define USE_GPU_TRANSFORM true
-#define USE_GPU_RENDERING true
+#define USE_GPU_TRANSFORM false
+#define USE_GPU_RENDERING false
+#define USE_SHADING !(USE_GPU_RENDERING) && true
 
 namespace IPDF
 {
@@ -27,31 +28,41 @@ namespace IPDF
 			
 			void Translate(Real x, Real y);
 			void ScaleAroundPoint(Real x, Real y, Real scale_amount);
+			void SetBounds(const Rect & new_bounds);
 			
 			Rect TransformToViewCoords(const Rect& inp) const;
 			
 			const Rect& GetBounds() const { return m_bounds; }
 			
+			
 			const bool UsingGPUTransform() const { return m_use_gpu_transform; } // whether view transform calculated on CPU or GPU
 			const bool UsingGPURendering() const { return m_use_gpu_rendering; } // whether GPU shaders are used or CPU rendering
 			void ToggleGPUTransform() { m_use_gpu_transform = (!m_use_gpu_transform); m_bounds_dirty = true; m_buffer_dirty = true; }
 			void ToggleGPURendering() { m_use_gpu_rendering = (!m_use_gpu_rendering); m_bounds_dirty = true; m_buffer_dirty = true; }
+			
+			void SetGPURendering(bool state) {m_use_gpu_rendering = state; m_bounds_dirty = true; m_buffer_dirty = true;}
 
+			bool ShowingObjectBounds() const {return m_show_object_bounds;} // render bounds rectangles
+			void ShowObjectBounds(bool state) {m_show_object_bounds = state; m_bounds_dirty = true; m_buffer_dirty = true;}
+			
+			bool PerformingShading() const {return m_perform_shading;}
+			void PerformShading(bool state) {m_perform_shading = state; m_bounds_dirty = true; m_buffer_dirty = true;}
 
 			void ForceBoundsDirty() {m_bounds_dirty = true;}		
 			void ForceBufferDirty() {m_buffer_dirty = true;}		
 			void ForceRenderDirty() {m_render_dirty = true;}
 
-
 		private:
 			struct GPUObjBounds
 			{
 				float x0, y0;
 				float x1, y1;
-			};
+			} __attribute__((packed));
 
 			void PrepareRender(); // call when m_render_dirty is true
-			void UpdateObjBoundsVBO(); // call when m_buffer_dirty is true
+			void UpdateObjBoundsVBO(unsigned first_obj, unsigned last_obj); // call when m_buffer_dirty is true
+
+			void RenderRange(int width, int height, unsigned first_obj, unsigned last_obj);
 
 			bool m_use_gpu_transform;
 			bool m_use_gpu_rendering;
@@ -73,6 +84,17 @@ namespace IPDF
 			// Trust me it will be easier to generalise things this way. Even though there are pointers.
 			std::vector<ObjectRenderer*> m_object_renderers; 
 			uint8_t * m_cpu_rendering_pixels; // pixels to be used for CPU rendering
+			
+			// Debug rendering
+			bool m_show_object_bounds;
+			bool m_perform_shading;
+
+#ifndef QUADTREE_DISABLED
+			QuadTreeIndex m_current_quadtree_node;	// The highest node we will traverse.
+			int m_quadtree_max_depth;		// The maximum quadtree depth.
+			void RenderQuadtreeNode(int width, int height, QuadTreeIndex node, int remaining_depth);
+
+#endif
 	};
 }