X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.cpp;h=cb96c305301f8c892d64037ee51d627bb3d484a3;hp=0770e46424d7b97fd8f1f816cbce19ee42c9a297;hb=4166b2c124b0bc652e9f8e5245488cdd2b86ebf0;hpb=2efd51d686e0dd911f0220ab2d595c0b3b0e18be

diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp
index 0770e46..cb96c30 100644
--- a/src/objectrenderer.cpp
+++ b/src/objectrenderer.cpp
@@ -31,10 +31,14 @@ ObjectRenderer::ObjectRenderer(const ObjectType & type,
  */
 void ObjectRenderer::RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id)
 {
+	// If we don't have anything to render, return.
+	if (first_obj_id == last_obj_id) return;
+	// If there are no objects of this type, return.
+	if (m_indexes.empty()) return;
 	unsigned first_index = 0;
-	while (m_indexes[first_index] < first_obj_id) first_index ++;
+	while (m_indexes.size() > first_index && m_indexes[first_index] < first_obj_id) first_index ++;
 	unsigned last_index = first_index;
-	while (m_indexes[last_index] < last_obj_id) last_index ++;
+	while (m_indexes.size() > last_index && m_indexes[last_index] < last_obj_id) last_index ++;
 
 	m_shader_program.Use();
 	m_ibo.Bind();
@@ -117,9 +121,9 @@ void RectFilledRenderer::RenderUsingCPU(const Objects & objects, const View & vi
 		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)
+		for (int64_t x = max((int64_t)0, bounds.x); x <= min(bounds.x+bounds.w, target.w-1); ++x)
 		{
-			for (int64_t y = max(0L, bounds.y); y <= min(bounds.y+bounds.h, target.h-1); ++y)
+			for (int64_t y = max((int64_t)0, bounds.y); y <= min(bounds.y+bounds.h, target.h-1); ++y)
 			{
 				int index = (x+target.w*y)*4;
 				target.pixels[index+0] = 0;
@@ -175,9 +179,9 @@ void CircleFilledRenderer::RenderUsingCPU(const Objects & objects, const View &
 		//Debug("Centre is %d, %d", centre_x, centre_y);
 		//Debug("Bounds are %d,%d,%d,%d", bounds.x, bounds.y, bounds.w, bounds.h);
 		//Debug("Windos is %d,%d", target.w, target.h);
-		for (int64_t x = max(0L, bounds.x); x <= min(bounds.x+bounds.w, target.w-1); ++x)
+		for (int64_t x = max((int64_t)0, bounds.x); x <= min(bounds.x+bounds.w, target.w-1); ++x)
 		{
-			for (int64_t y = max(0L, bounds.y); y <= min(bounds.y + bounds.h, target.h-1); ++y)
+			for (int64_t y = max((int64_t)0, bounds.y); y <= min(bounds.y + bounds.h, target.h-1); ++y)
 			{
 				Real dx(2); dx *= Real(x - centre_x)/Real(bounds.w);
 				Real dy(2); dy *= Real(y - centre_y)/Real(bounds.h);
@@ -237,9 +241,12 @@ void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view,
 		
 		Real x[2]; Real y[2];
 		control.Evaluate(x[0], y[0], Real(0));
-		int64_t blen = max(2L, min(100L, pix_bounds.w));
+		//Debug("target is (%lu, %lu)", target.w, target.h);
+		int64_t blen = 100;
+		//blen = min(max((int64_t)2, (int64_t)(target.w/view.GetBounds().w)), (int64_t)100);
+		
 		Real invblen(1); invblen /= blen;
-		Debug("Using %li lines, inverse %f", blen, Double(invblen));
+		//Debug("Using %li lines, inverse %f", blen, Double(invblen));
 		for (int64_t j = 1; j <= blen; ++j)
 		{
 			control.Evaluate(x[j % 2],y[j % 2], invblen*j);
@@ -277,8 +284,9 @@ void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects)
 	{
 		GPUBezierCoeffs coeffs = {
 			Float(bez->x0), Float(bez->y0),
-			Float(bez->x1 - bez->x0), Float(bez->y1 - bez->y0),
-			Float(bez->x2 - bez->x0), Float(bez->y2 - bez->y0)
+			Float(bez->x1), Float(bez->y1),
+			Float(bez->x2), Float(bez->y2),
+			Float(bez->x3), Float(bez->y3)
 			};
 		builder.Add(coeffs);
 	}
@@ -303,10 +311,15 @@ void BezierRenderer::RenderUsingGPU(unsigned first_obj_id, unsigned last_obj_id)
 	if (!m_shader_program.Valid())
 		Warn("Shader is invalid (objects are of type %d)", m_type);
 
+	// If we don't have anything to render, return.
+	if (first_obj_id == last_obj_id) return;
+	// If there are no objects of this type, return.
+	if (m_indexes.empty()) return;
+
 	unsigned first_index = 0;
-	while (m_indexes[first_index] < first_obj_id) first_index ++;
+	while (m_indexes.size() > first_index && m_indexes[first_index] < first_obj_id) first_index ++;
 	unsigned last_index = first_index;
-	while (m_indexes[last_index] < last_obj_id) last_index ++;
+	while (m_indexes.size() > last_index && m_indexes[last_index] < last_obj_id) last_index ++;
 
 	m_shader_program.Use();
 	glUniform1i(m_shader_program.GetUniformLocation("bezier_buffer_texture"), 0);
@@ -410,7 +423,7 @@ void ObjectRenderer::RenderLineOnCPU(int64_t x0, int64_t y0, int64_t x1, int64_t
 			if (neg_m) --y; else ++y;
 			p += two_dxdy;
 		}
-	} while (++x < x_end);
+	} while (++x <= x_end);
 }
 
 }