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
Infinite Quadtree precision now works with some Béziers
[ipdf/code.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index
ee78f59
..
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;
@@
-118,7
+117,7
@@
inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
total_real_time += real_frame; total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
if (data_rate > 0 && total_real_time > data_rate*(data_points+1))
{
total_real_time += real_frame; total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
if (data_rate > 0 && total_real_time > data_rate*(data_points+1))
{
- printf("%lu\t%f\t%f\t%f\t%f\t%f\t%f\n", (
uint64_
t)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
+ printf("%lu\t%f\t%f\t%f\t%f\t%f\t%f\n", (
long unsigned in
t)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
data_points++;
}
scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
data_points++;
}
scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
UCC
git Repository :: git.ucc.asn.au