X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.cpp;h=21c9648c49629ca1526c69e02988f12a0a712b44;hp=f2f0fdd7aaedaad33b091d9794def54e2ba6d80f;hb=58a6719da2337b3e6e20b581885f170bbe5fc480;hpb=e7066887c0d142ddef87ec9ae07ef08ff31573dc diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp index f2f0fdd..21c9648 100644 --- a/src/objectrenderer.cpp +++ b/src/objectrenderer.cpp @@ -24,9 +24,12 @@ ObjectRenderer::ObjectRenderer(const ObjectType & type, const char * vert_glsl_file, const char * frag_glsl_file, const char * geom_glsl_file) : m_type(type), m_shader_program(), m_indexes(), m_buffer_builder(NULL) { - m_shader_program.InitialiseShaders(vert_glsl_file, frag_glsl_file, geom_glsl_file); - m_shader_program.Use(); - glUniform4f(m_shader_program.GetUniformLocation("colour"), 0,0,0,1); //TODO: Allow different colours + if (vert_glsl_file != NULL && frag_glsl_file != NULL && geom_glsl_file != NULL) + { + m_shader_program.InitialiseShaders(vert_glsl_file, frag_glsl_file, geom_glsl_file); + m_shader_program.Use(); + glUniform4f(m_shader_program.GetUniformLocation("colour"), 0,0,0,1); //TODO: Allow different colours + } } /** @@ -219,17 +222,18 @@ ObjectRenderer::PixelPoint ObjectRenderer::CPUPointLocation(const Vec2 & point, { // hack... Rect result = view.TransformToViewCoords(Rect(point.x, point.y,1,1)); - int64_t x = result.x*target.w; - int64_t y = result.y*target.h; + int64_t x = Int64(result.x)*target.w; + int64_t y = Int64(result.y)*target.h; return PixelPoint(x,y); } -void BezierRenderer::RenderBezierOnCPU(unsigned i, Objects & objects, const View & view, const CPURenderTarget & target, const Colour & c) +void BezierRenderer::RenderBezierOnCPU(const Bezier & relative, const Rect & bounds, const View & view, const CPURenderTarget & target, const Colour & c) { - const Rect & bounds = objects.bounds[i]; + //const Rect & bounds = objects.bounds[i]; PixelBounds pix_bounds(CPURenderBounds(bounds,view,target)); - Bezier control(objects.beziers[objects.data_indices[i]].ToAbsolute(bounds),CPURenderBounds(Rect(0,0,1,1), view, target)); + //Bezier control(objects.beziers[objects.data_indices[i]].ToAbsolute(bounds),CPURenderBounds(Rect(0,0,1,1), view, target)); + Bezier control(relative.ToAbsolute(bounds), Rect(0,0,target.w, target.h)); if (view.ShowingBezierBounds()) { @@ -239,20 +243,21 @@ void BezierRenderer::RenderBezierOnCPU(unsigned i, Objects & objects, const View ObjectRenderer::RenderLineOnCPU(pix_bounds.x+pix_bounds.w, pix_bounds.y, pix_bounds.x+pix_bounds.w, pix_bounds.y+pix_bounds.h, target, Colour(0,255,0,0)); } - unsigned blen = min(max(2U, (unsigned)(target.w/view.GetBounds().w)), - min((unsigned)(pix_bounds.w+pix_bounds.h)/4 + 1, 100U)); + int64_t blen = min(50L,pix_bounds.w);//min(max(2U, (unsigned)Int64(Real(target.w)/view.GetBounds().w)), + //min((unsigned)(pix_bounds.w+pix_bounds.h)/4 + 1, 100U)); // DeCasteljau Divide the Bezier + #ifdef BEZIER_CPU_DECASTELJAU queue divisions; divisions.push(control); - while(divisions.size() < blen) + while(divisions.size() < (uint64_t)(blen)) { Bezier & current = divisions.front(); - if (current.GetType() == Bezier::LINE) - { - --blen; - continue; - } + //if (current.GetType() == Bezier::LINE) + //{ + // --blen; + // continue; + //} divisions.push(current.DeCasteljauSubdivideRight(Real(1)/Real(2))); divisions.push(current.DeCasteljauSubdivideLeft(Real(1)/Real(2))); divisions.pop(); @@ -260,9 +265,24 @@ void BezierRenderer::RenderBezierOnCPU(unsigned i, Objects & objects, const View while (divisions.size() > 0) { Bezier & current = divisions.front(); - RenderLineOnCPU(current.x0, current.y0, current.x3, current.y3, target, c); + RenderLineOnCPU(Int64(current.x0), Int64(current.y0), Int64(current.x3), Int64(current.y3), target, c); divisions.pop(); } + #else + Real invblen(1); invblen /= Real(blen); + + Real t(invblen); + Vec2 v0; + Vec2 v1; + control.Evaluate(v0.x, v0.y, 0); + for (int64_t j = 1; j <= blen; ++j) + { + control.Evaluate(v1.x, v1.y, t); + RenderLineOnCPU(v0.x, v0.y, v1.x, v1.y, target); + t += invblen; + v0 = v1; + } + #endif //BEZIER_CPU_DECASTELJAU } /** @@ -271,6 +291,9 @@ void BezierRenderer::RenderBezierOnCPU(unsigned i, Objects & objects, const View */ void BezierRenderer::RenderUsingCPU(Objects & objects, const View & view, const CPURenderTarget & target, unsigned first_obj_id, unsigned last_obj_id) { + #ifdef TRANSFORM_BEZIERS_TO_PATH + return; + #endif if (view.PerformingShading()) return; @@ -305,7 +328,9 @@ void BezierRenderer::RenderUsingCPU(Objects & objects, const View & view, const break; } } - RenderBezierOnCPU(m_indexes[i], objects, view, target, c); + Rect bounds = view.TransformToViewCoords(objects.bounds[m_indexes[i]]); + Bezier & bez = objects.beziers[objects.data_indices[m_indexes[i]]]; + RenderBezierOnCPU(bez, bounds, view, target, c); } } @@ -316,11 +341,10 @@ void BezierRenderer::PrepareBezierGPUBuffer(Objects & objects) m_bezier_coeffs.Resize(objects.beziers.size()*sizeof(GPUBezierCoeffs)); BufferBuilder builder(m_bezier_coeffs.Map(false, true, true), m_bezier_coeffs.GetSize()); - + for (unsigned i = 0; i < objects.beziers.size(); ++i) { const Bezier & bez = objects.beziers[i]; - GPUBezierCoeffs coeffs = { Float(bez.x0), Float(bez.y0), Float(bez.x1), Float(bez.y1), @@ -329,6 +353,7 @@ void BezierRenderer::PrepareBezierGPUBuffer(Objects & objects) }; builder.Add(coeffs); } + m_bezier_coeffs.UnMap(); glGenTextures(1, &m_bezier_buffer_texture); glBindTexture(GL_TEXTURE_BUFFER, m_bezier_buffer_texture); @@ -347,6 +372,7 @@ void BezierRenderer::PrepareBezierGPUBuffer(Objects & objects) 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); @@ -382,9 +408,10 @@ void PathRenderer::RenderUsingCPU(Objects & objects, const View & view, const CP if (m_indexes[i] >= last_obj_id) continue; - Rect bounds(CPURenderBounds(objects.bounds[m_indexes[i]], view, target)); + + Path & path = objects.paths[objects.data_indices[m_indexes[i]]]; + Rect bounds(CPURenderBounds(path.GetBounds(objects), view, target)); PixelBounds pix_bounds(bounds); - const Path & path = objects.paths[objects.data_indices[m_indexes[i]]]; if (view.ShowingFillPoints()) { @@ -397,20 +424,49 @@ void PathRenderer::RenderUsingCPU(Objects & objects, const View & view, const CP } } + #ifndef TRANSFORM_BEZIERS_TO_PATH if (!view.PerformingShading()) continue; - for (unsigned b = path.m_start; b <= path.m_end; ++b) { - BezierRenderer::RenderBezierOnCPU(b,objects,view,target,path.m_stroke); + Rect & bbounds = objects.bounds[b]; + Bezier & bez = objects.beziers[objects.data_indices[b]]; + BezierRenderer::RenderBezierOnCPU(bez,bbounds,view,target,path.m_stroke); } + #else + // Outlines still get drawn if using TRANSFORM_BEZIERS_TO_PATH + for (unsigned b = path.m_start; b <= path.m_end; ++b) + { + Colour stroke = (view.PerformingShading()) ? path.m_stroke : Colour(0,0,0,255); + // bezier's bounds are relative to this object's bounds, convert back to view bounds + Rect bbounds = objects.bounds[b]; + bbounds.x *= objects.bounds[m_indexes[i]].w; + bbounds.x += objects.bounds[m_indexes[i]].x; + bbounds.y *= objects.bounds[m_indexes[i]].h; + bbounds.y += objects.bounds[m_indexes[i]].y; + bbounds.w *= objects.bounds[m_indexes[i]].w; + bbounds.h *= objects.bounds[m_indexes[i]].h; + bbounds = view.TransformToViewCoords(bbounds); + //Debug("Bounds: %s", objects.bounds[m_indexes[i]].Str().c_str()); + //Debug("Relative Bez Bounds: %s", objects.bounds[b].Str().c_str()); + //Debug("Bez Bounds: %s", bbounds.Str().c_str()); + + Bezier & bez = objects.beziers[objects.data_indices[b]]; + + BezierRenderer::RenderBezierOnCPU(bez,bbounds,view,target, stroke); + } + if (!view.PerformingShading()) + continue; + #endif + if (pix_bounds.w*pix_bounds.h > 100) { + vector & fill_points = path.FillPoints(objects, view); Debug("High resolution; use fill points %u,%u", pix_bounds.w, pix_bounds.h); - for (unsigned f = 0; f < path.m_fill_points.size(); ++f) + for (unsigned f = 0; f < fill_points.size(); ++f) { - PixelPoint fill_point(CPUPointLocation(path.m_fill_points[f], view, target)); + PixelPoint fill_point(CPUPointLocation(fill_points[f], view, target)); FloodFillOnCPU(fill_point.first, fill_point.second, pix_bounds, target, path.m_fill, path.m_stroke); } @@ -439,6 +495,9 @@ void PathRenderer::RenderUsingCPU(Objects & objects, const View & view, const CP } } + + + /** * For debug, save pixels to bitmap */ @@ -460,6 +519,9 @@ void ObjectRenderer::SaveBMP(const CPURenderTarget & target, const char * filena SDL_FreeSurface(surf); } + + + /** * Bresenham's lines */ @@ -579,4 +641,12 @@ void ObjectRenderer::FloodFillOnCPU(int64_t x, int64_t y, const PixelBounds & bo } } +ObjectRenderer::PixelBounds::PixelBounds(const Rect & bounds) +{ + x = Int64(Double(bounds.x)); + y = Int64(Double(bounds.y)); + w = Int64(Double(bounds.w)); + h = Int64(Double(bounds.h)); +} + }