X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fview.cpp;h=2d9d0b39dcfe815488c42f0b89406a555e8f6dec;hp=4bba59163d21554a57d9c4520ac456a9c390f194;hb=ee5287fabfb214e8f7b483cde424108270525fd7;hpb=09fc4981be389620d3c269beacf0630de45871bb diff --git a/src/view.cpp b/src/view.cpp index 4bba591..2d9d0b3 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -88,7 +88,7 @@ void View::ScaleAroundPoint(Real x, Real y, Real scale_amount) m_bounds.y = y - top; m_bounds.w *= scale_amount; m_bounds.h *= scale_amount; - Debug("View Bounds => %s", m_bounds.Str().c_str()); + //Debug("Scale at {%s, %s} by %s View Bounds => %s", x.Str().c_str(), y.Str().c_str(), scale_amount.Str().c_str(), m_bounds.Str().c_str()); if (!m_use_gpu_transform) m_buffer_dirty = true; m_bounds_dirty = true; @@ -147,13 +147,15 @@ void View::Render(int width, int height) if (m_use_gpu_transform) { - GLfloat glbounds[] = {static_cast(Float(m_bounds.x)), static_cast(Float(m_bounds.y)), static_cast(Float(m_bounds.w)), static_cast(Float(m_bounds.h))}; - m_bounds_ubo.Upload(sizeof(float)*4, glbounds); + GLfloat glbounds[] = {static_cast(Float(m_bounds.x)), static_cast(Float(m_bounds.y)), static_cast(Float(m_bounds.w)), static_cast(Float(m_bounds.h)), + 0.0, 0.0, 640.0, 480.0}; + m_bounds_ubo.Upload(sizeof(float)*8, glbounds); } else { - GLfloat glbounds[] = {0.0f, 0.0f, 1.0f, 1.0f}; - m_bounds_ubo.Upload(sizeof(float)*4, glbounds); + GLfloat glbounds[] = {0.0f, 0.0f, 1.0f, 1.0f, + 0.0f, 0.0f, 640.0f, 480.0f}; + m_bounds_ubo.Upload(sizeof(float)*8, glbounds); } m_bounds_dirty = false;