git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.ucc.asn.au:ipdf/code
[ipdf/code.git]
/
src
/
view.cpp
diff --git
a/src/view.cpp
b/src/view.cpp
index
d8a875b
..
26e9507
100644
(file)
--- a/
src/view.cpp
+++ b/
src/view.cpp
@@
-38,6
+38,17
@@
void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
Debug("View Bounds => %s", m_bounds.Str().c_str());
}
Debug("View Bounds => %s", m_bounds.Str().c_str());
}
+Rect View::TransformToViewCoords(const Rect& inp) const
+{
+ Rect out;
+ out.x = (inp.x - m_bounds.x) / m_bounds.w;
+ out.y = (inp.y - m_bounds.y) / m_bounds.h;
+
+ out.w = inp.w / m_bounds.w;
+ out.h = inp.h / m_bounds.h;
+ return out;
+}
+
void View::DrawGrid()
{
// Draw some grid lines at fixed pixel positions
void View::DrawGrid()
{
// Draw some grid lines at fixed pixel positions
@@
-77,7
+88,14
@@
void View::Render()
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- glOrtho(Float(m_bounds.x), Float(m_bounds.x)+Float(m_bounds.w), Float(m_bounds.y) + Float(m_bounds.h), Float(m_bounds.y), -1.f, 1.f);
+ if (m_use_gpu_transform)
+ {
+ glOrtho(Float(m_bounds.x), Float(m_bounds.x)+Float(m_bounds.w), Float(m_bounds.y) + Float(m_bounds.h), Float(m_bounds.y), -1.f, 1.f);
+ }
+ else
+ {
+ glOrtho(0,1,1,0,-1,1);
+ }
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@
-92,7
+110,15
@@
void View::Render()
{
if (m_document.m_objects.types[id] != RECT_FILLED)
continue;
{
if (m_document.m_objects.types[id] != RECT_FILLED)
continue;
- Rect obj_bounds = m_document.m_objects.bounds[id];
+ Rect obj_bounds;
+ if (m_use_gpu_transform)
+ {
+ obj_bounds = m_document.m_objects.bounds[id];
+ }
+ else
+ {
+ obj_bounds = TransformToViewCoords(m_document.m_objects.bounds[id]);
+ }
glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y) + Float(obj_bounds.h));
glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y) + Float(obj_bounds.h));
@@
-105,7
+131,15
@@
void View::Render()
{
if (m_document.m_objects.types[id] != RECT_OUTLINE)
continue;
{
if (m_document.m_objects.types[id] != RECT_OUTLINE)
continue;
- Rect obj_bounds = m_document.m_objects.bounds[id];
+ Rect obj_bounds;
+ if (m_use_gpu_transform)
+ {
+ obj_bounds = m_document.m_objects.bounds[id];
+ }
+ else
+ {
+ obj_bounds = TransformToViewCoords(m_document.m_objects.bounds[id]);
+ }
glBegin(GL_LINE_LOOP);
glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
glBegin(GL_LINE_LOOP);
glVertex2f(Float(obj_bounds.x), Float(obj_bounds.y));
glVertex2f(Float(obj_bounds.x) + Float(obj_bounds.w), Float(obj_bounds.y));
UCC
git Repository :: git.ucc.asn.au