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
Support doing coordinate transforms on the CPU
[ipdf/code.git]
/
src
/
view.cpp
diff --git
a/src/view.cpp
b/src/view.cpp
index
2b6641a
..
0354ee9
100644
(file)
--- a/
src/view.cpp
+++ b/
src/view.cpp
@@
-35,6
+35,17
@@
void View::ScaleAroundPoint(Real x, Real y, Real scaleAmt)
m_bounds.h *= scaleAmt;
}
m_bounds.h *= scaleAmt;
}
+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
@@
-69,27
+80,42
@@
void View::Render()
debug_output_done = true;
}
debug_output_done = true;
}
- glClearColor(1.f,1.f,1.f,1.f);
- glClear(GL_COLOR_BUFFER_BIT);
- DrawGrid(); // Draw the gridlines
+
//
DrawGrid(); // Draw the gridlines
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();
-
-
-
- glColor4f(0.f,0.f,0.f,1.f);
+ if (m_colour.a < 1.0f)
+ {
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ }
+ glColor4f(m_colour.r, m_colour.g, m_colour.b, m_colour.a);
glBegin(GL_QUADS);
for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
{
glBegin(GL_QUADS);
for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
{
- if (m_document.m_objects.types[id]
=
= RECT_FILLED)
+ if (m_document.m_objects.types[id]
!
= RECT_FILLED)
continue;
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));
@@
-100,9
+126,17
@@
void View::Render()
for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
{
for (unsigned id = 0; id < m_document.ObjectCount(); ++id)
{
- if (m_document.m_objects.types[id]
=
= RECT_OUTLINE)
+ if (m_document.m_objects.types[id]
!
= RECT_OUTLINE)
continue;
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));
@@
-111,4
+145,9
@@
void View::Render()
glEnd();
}
glEnd();
}
+ if (m_colour.a < 1.0f)
+ {
+ glDisable(GL_BLEND);
+ }
+
}
}
UCC
git Repository :: git.ucc.asn.au