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
Add a vec2 struct.
[ipdf/code.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index
cfc6909
..
5ca71ef
100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-78,12
+78,11
@@
void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
}
}
-inline void MainLoop(Document & doc,
const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f)
)
+inline void MainLoop(Document & doc,
Screen & scr, View & view
)
{
// order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
{
// order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
- Screen scr;
- View view(doc,scr, bounds, c);
- scr.DebugFontInit("DejaVuSansMono.ttf");
+
+ scr.DebugFontInit("fonts/DejaVuSansMono.ttf");
scr.SetMouseHandler(RatCatcher);
double total_cpu_time = 0;
scr.SetMouseHandler(RatCatcher);
double total_cpu_time = 0;
UCC
git Repository :: git.ucc.asn.au