diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp index 8f2808c1..d4e11342 100644 --- a/Projects/CodeBlocks/SleepyHead.cbp +++ b/Projects/CodeBlocks/SleepyHead.cbp @@ -126,6 +126,20 @@ + + + + + + + + + + + + + + diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index f47e8db1..e365a5e0 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -4,7 +4,7 @@ "GUIFrame.h" -1307528666 /usr/include/wx-2.9/wx/wxprec.h +1307941936 /usr/include/wx-2.9/wx/wxprec.h "wx/defs.h" "wx/chartype.h" "wx/msw/wrapwin.h" @@ -17,7 +17,7 @@ "wx/mgl/private.h" "wx/wx.h" -1307528665 /usr/include/wx-2.9/wx/defs.h +1307941936 /usr/include/wx-2.9/wx/defs.h "wx/platform.h" "wx/version.h" "wx/dlimpexp.h" @@ -30,7 +30,7 @@ "wx/msw/winundef.h" "wx/features.h" -1307528665 /usr/include/wx-2.9/wx/platform.h +1307941936 /usr/include/wx-2.9/wx/platform.h @@ -46,9 +46,9 @@ "wx/chkconf.h" "wx/palmos/missing.h" -1307528665 /usr/lib/wx/include/gtk2-unicode-2.9/wx/setup.h +1307941935 /usr/lib/wx/include/gtk2-unicode-2.9/wx/setup.h -1307528665 /usr/include/wx-2.9/wx/chkconf.h +1307941936 /usr/include/wx-2.9/wx/chkconf.h "wx/palmos/chkconf.h" "wx/msw/wince/chkconf.h" "wx/msw/chkconf.h" @@ -63,25 +63,25 @@ "wx/unix/chkconf.h" "wx/univ/chkconf.h" -1307528667 /usr/include/wx-2.9/wx/gtk/chkconf.h +1307941938 /usr/include/wx-2.9/wx/gtk/chkconf.h -1307528666 /usr/include/wx-2.9/wx/unix/chkconf.h +1307941937 /usr/include/wx-2.9/wx/unix/chkconf.h -1307528665 /usr/include/wx-2.9/wx/version.h +1307941936 /usr/include/wx-2.9/wx/version.h "wx/cpp.h" -1307528665 /usr/include/wx-2.9/wx/cpp.h +1307941936 /usr/include/wx-2.9/wx/cpp.h -1307528665 /usr/include/wx-2.9/wx/dlimpexp.h +1307941936 /usr/include/wx-2.9/wx/dlimpexp.h -1307528665 /usr/include/wx-2.9/wx/debug.h +1307941936 /usr/include/wx-2.9/wx/debug.h "wx/chartype.h" "wx/cpp.h" "wx/dlimpexp.h" -1307528665 /usr/include/wx-2.9/wx/chartype.h +1307941936 /usr/include/wx-2.9/wx/chartype.h "wx/platform.h" @@ -96,11 +96,11 @@ -1307528666 /usr/include/wx-2.9/wx/windowid.h +1307941937 /usr/include/wx-2.9/wx/windowid.h -1307528665 /usr/include/wx-2.9/wx/features.h +1307941936 /usr/include/wx-2.9/wx/features.h -1307528665 /usr/include/wx-2.9/wx/wx.h +1307941936 /usr/include/wx-2.9/wx/wx.h "wx/defs.h" "wx/object.h" "wx/dynarray.h" @@ -181,20 +181,20 @@ "wx/validate.h" "wx/valtext.h" -1307528665 /usr/include/wx-2.9/wx/object.h +1307941936 /usr/include/wx-2.9/wx/object.h "wx/memory.h" "wx/xti.h" "wx/rtti.h" "wx/xti2.h" "wx/msw/msvcrt.h" -1307528665 /usr/include/wx-2.9/wx/memory.h +1307941936 /usr/include/wx-2.9/wx/memory.h "wx/defs.h" "wx/string.h" "wx/msgout.h" -1307528665 /usr/include/wx-2.9/wx/string.h +1307941936 /usr/include/wx-2.9/wx/string.h "wx/defs.h" @@ -218,7 +218,7 @@ "wx/iosfwrap.h" "wx/crt.h" -1307528666 /usr/include/wx-2.9/wx/wxcrtbase.h +1307941936 /usr/include/wx-2.9/wx/wxcrtbase.h "wx/chartype.h" @@ -228,7 +228,7 @@ -1307528665 /usr/include/wx-2.9/wx/strvararg.h +1307941936 /usr/include/wx-2.9/wx/strvararg.h "wx/platform.h" "wx/cpp.h" "wx/chartype.h" @@ -240,7 +240,7 @@ "wx/stringimpl.h" -1307528665 /usr/include/wx-2.9/wx/strconv.h +1307941936 /usr/include/wx-2.9/wx/strconv.h "wx/defs.h" "wx/chartype.h" "wx/buffer.h" @@ -248,24 +248,24 @@ "wx/fontenc.h" -1307528665 /usr/include/wx-2.9/wx/buffer.h +1307941936 /usr/include/wx-2.9/wx/buffer.h "wx/chartype.h" "wx/wxcrtbase.h" -1307528665 /usr/include/wx-2.9/wx/typeinfo.h +1307941936 /usr/include/wx-2.9/wx/typeinfo.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/fontenc.h +1307941936 /usr/include/wx-2.9/wx/fontenc.h -1307528665 /usr/include/wx-2.9/wx/unichar.h +1307941936 /usr/include/wx-2.9/wx/unichar.h "wx/defs.h" "wx/chartype.h" "wx/stringimpl.h" -1307528665 /usr/include/wx-2.9/wx/stringimpl.h +1307941936 /usr/include/wx-2.9/wx/stringimpl.h "wx/defs.h" "wx/chartype.h" "wx/wxcrtbase.h" @@ -274,62 +274,62 @@ "wx/afterstd.h" -1307528665 /usr/include/wx-2.9/wx/beforestd.h +1307941936 /usr/include/wx-2.9/wx/beforestd.h -1307528665 /usr/include/wx-2.9/wx/afterstd.h +1307941935 /usr/include/wx-2.9/wx/afterstd.h "wx/msw/winundef.h" -1307528665 /usr/include/wx-2.9/wx/stringops.h +1307941936 /usr/include/wx-2.9/wx/stringops.h "wx/chartype.h" "wx/stringimpl.h" "wx/unichar.h" "wx/buffer.h" -1307528665 /usr/include/wx-2.9/wx/tls.h +1307941936 /usr/include/wx-2.9/wx/tls.h "wx/defs.h" "wx/msw/tls.h" "wx/os2/tls.h" "wx/unix/tls.h" -1307528666 /usr/include/wx-2.9/wx/unix/tls.h +1307941937 /usr/include/wx-2.9/wx/unix/tls.h -1307528665 /usr/include/wx-2.9/wx/iosfwrap.h +1307941936 /usr/include/wx-2.9/wx/iosfwrap.h "wx/msw/winundef.h" -1307528665 /usr/include/wx-2.9/wx/crt.h +1307941936 /usr/include/wx-2.9/wx/crt.h "wx/defs.h" "wx/chartype.h" "wx/wxcrt.h" "wx/wxcrtvararg.h" -1307528666 /usr/include/wx-2.9/wx/wxcrt.h +1307941936 /usr/include/wx-2.9/wx/wxcrt.h "wx/wxcrtbase.h" "wx/string.h" -1307528666 /usr/include/wx-2.9/wx/wxcrtvararg.h +1307941936 /usr/include/wx-2.9/wx/wxcrtvararg.h "wx/wxcrt.h" "wx/strvararg.h" "wx/string.h" -1307528665 /usr/include/wx-2.9/wx/msgout.h +1307941936 /usr/include/wx-2.9/wx/msgout.h "wx/defs.h" "wx/chartype.h" "wx/strvararg.h" -1307528666 /usr/include/wx-2.9/wx/xti.h +1307941936 /usr/include/wx-2.9/wx/xti.h "wx/defs.h" "wx/xtitypes.h" "wx/xtihandler.h" -1307528665 /usr/include/wx-2.9/wx/flags.h +1307941936 /usr/include/wx-2.9/wx/flags.h -1307528665 /usr/include/wx-2.9/wx/arrstr.h +1307941936 /usr/include/wx-2.9/wx/arrstr.h "wx/defs.h" "wx/string.h" "wx/dynarray.h" @@ -337,14 +337,14 @@ "wx/afterstd.h" -1307528665 /usr/include/wx-2.9/wx/dynarray.h +1307941936 /usr/include/wx-2.9/wx/dynarray.h "wx/defs.h" "wx/beforestd.h" "wx/afterstd.h" -1307528665 /usr/include/wx-2.9/wx/hashmap.h +1307941936 /usr/include/wx-2.9/wx/hashmap.h "wx/string.h" "wx/wxcrt.h" @@ -353,7 +353,7 @@ -1307528665 /usr/include/wx-2.9/wx/log.h +1307941936 /usr/include/wx-2.9/wx/log.h "wx/defs.h" "wx/string.h" "wx/strvararg.h" @@ -366,19 +366,19 @@ "wx/generic/logg.h" "wx/cocoa/log.h" -1307528665 /usr/include/wx-2.9/wx/thread.h +1307941936 /usr/include/wx-2.9/wx/thread.h "wx/defs.h" -1307528666 /usr/include/wx-2.9/wx/generic/logg.h +1307941937 /usr/include/wx-2.9/wx/generic/logg.h -1307528665 /usr/include/wx-2.9/wx/intl.h +1307941936 /usr/include/wx-2.9/wx/intl.h "wx/defs.h" "wx/string.h" "wx/translation.h" "wx/fontenc.h" "wx/language.h" -1307528665 /usr/include/wx-2.9/wx/translation.h +1307941936 /usr/include/wx-2.9/wx/translation.h "wx/defs.h" "wx/string.h" "wx/buffer.h" @@ -387,16 +387,16 @@ "wx/strconv.h" "wx/scopedptr.h" -1307528665 /usr/include/wx-2.9/wx/language.h +1307941936 /usr/include/wx-2.9/wx/language.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/scopedptr.h +1307941936 /usr/include/wx-2.9/wx/scopedptr.h "wx/defs.h" "wx/checkeddelete.h" -1307528665 /usr/include/wx-2.9/wx/checkeddelete.h +1307941936 /usr/include/wx-2.9/wx/checkeddelete.h -1307528665 /usr/include/wx-2.9/wx/list.h +1307941936 /usr/include/wx-2.9/wx/list.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -406,12 +406,12 @@ "wx/afterstd.h" -1307528665 /usr/include/wx-2.9/wx/hash.h +1307941936 /usr/include/wx-2.9/wx/hash.h "wx/defs.h" "wx/string.h" "wx/object.h" -1307528665 /usr/include/wx-2.9/wx/event.h +1307941936 /usr/include/wx-2.9/wx/event.h "wx/defs.h" "wx/cpp.h" "wx/object.h" @@ -426,12 +426,12 @@ "wx/any.h" "wx/meta/convertible.h" -1307528665 /usr/include/wx-2.9/wx/clntdata.h +1307941936 /usr/include/wx-2.9/wx/clntdata.h "wx/defs.h" "wx/string.h" "wx/hashmap.h" -1307528666 /usr/include/wx-2.9/wx/gdicmn.h +1307941937 /usr/include/wx-2.9/wx/gdicmn.h "wx/defs.h" "wx/list.h" "wx/string.h" @@ -439,13 +439,13 @@ "wx/hashmap.h" "wx/math.h" -1307528665 /usr/include/wx-2.9/wx/math.h +1307941936 /usr/include/wx-2.9/wx/math.h "wx/defs.h" -1307528666 /usr/include/wx-2.9/wx/cursor.h +1307941937 /usr/include/wx-2.9/wx/cursor.h "wx/defs.h" "wx/palmos/cursor.h" "wx/msw/cursor.h" @@ -460,14 +460,14 @@ "wx/os2/cursor.h" "wx/utils.h" -1307528667 /usr/include/wx-2.9/wx/gtk/cursor.h +1307941938 /usr/include/wx-2.9/wx/gtk/cursor.h "wx/gdiobj.h" "wx/gdicmn.h" -1307528667 /usr/include/wx-2.9/wx/gdiobj.h +1307941937 /usr/include/wx-2.9/wx/gdiobj.h "wx/object.h" -1307528665 /usr/include/wx-2.9/wx/utils.h +1307941936 /usr/include/wx-2.9/wx/utils.h "wx/object.h" "wx/list.h" "wx/filefn.h" @@ -483,7 +483,7 @@ -1307528665 /usr/include/wx-2.9/wx/filefn.h +1307941936 /usr/include/wx-2.9/wx/filefn.h "wx/list.h" "wx/arrstr.h" "wx/msw/wince/time.h" @@ -517,14 +517,14 @@ -1307528665 /usr/include/wx-2.9/wx/mousestate.h +1307941936 /usr/include/wx-2.9/wx/mousestate.h "wx/gdicmn.h" "wx/kbdstate.h" -1307528665 /usr/include/wx-2.9/wx/kbdstate.h +1307941936 /usr/include/wx-2.9/wx/kbdstate.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/longlong.h +1307941936 /usr/include/wx-2.9/wx/longlong.h "wx/defs.h" "wx/string.h" @@ -532,13 +532,13 @@ "wx/strvararg.h" -1307528665 /usr/include/wx-2.9/wx/platinfo.h +1307941936 /usr/include/wx-2.9/wx/platinfo.h "wx/string.h" -1307528665 /usr/include/wx-2.9/wx/tracker.h +1307941936 /usr/include/wx-2.9/wx/tracker.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/any.h +1307941935 /usr/include/wx-2.9/wx/any.h "wx/defs.h" "wx/string.h" @@ -548,10 +548,10 @@ "wx/datetime.h" "wx/variant.h" -1307528666 /usr/include/wx-2.9/wx/meta/if.h +1307941936 /usr/include/wx-2.9/wx/meta/if.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/datetime.h +1307941936 /usr/include/wx-2.9/wx/datetime.h "wx/defs.h" "wx/msw/wince/time.h" @@ -560,10 +560,10 @@ "wx/anystr.h" "wx/dynarray.h" -1307528665 /usr/include/wx-2.9/wx/anystr.h +1307941935 /usr/include/wx-2.9/wx/anystr.h "wx/string.h" -1307528665 /usr/include/wx-2.9/wx/variant.h +1307941936 /usr/include/wx-2.9/wx/variant.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -575,9 +575,9 @@ "wx/iosfwrap.h" "wx/any.h" -1307528666 /usr/include/wx-2.9/wx/meta/convertible.h +1307941936 /usr/include/wx-2.9/wx/meta/convertible.h -1307528665 /usr/include/wx-2.9/wx/app.h +1307941935 /usr/include/wx-2.9/wx/app.h "wx/event.h" "wx/build.h" "wx/cmdargs.h" @@ -598,33 +598,33 @@ "wx/os2/app.h" "wx/univ/theme.h" -1307528665 /usr/include/wx-2.9/wx/build.h +1307941936 /usr/include/wx-2.9/wx/build.h "wx/version.h" -1307528665 /usr/include/wx-2.9/wx/cmdargs.h +1307941936 /usr/include/wx-2.9/wx/cmdargs.h "wx/arrstr.h" -1307528665 /usr/include/wx-2.9/wx/init.h +1307941936 /usr/include/wx-2.9/wx/init.h "wx/defs.h" "wx/chartype.h" -1307528666 /usr/include/wx-2.9/wx/unix/app.h +1307941937 /usr/include/wx-2.9/wx/unix/app.h -1307528667 /usr/include/wx-2.9/wx/gtk/app.h +1307941938 /usr/include/wx-2.9/wx/gtk/app.h -1307528665 /usr/include/wx-2.9/wx/stream.h +1307941936 /usr/include/wx-2.9/wx/stream.h "wx/defs.h" "wx/object.h" "wx/string.h" "wx/filefn.h" -1307528665 /usr/include/wx-2.9/wx/stopwatch.h +1307941936 /usr/include/wx-2.9/wx/stopwatch.h "wx/defs.h" "wx/longlong.h" -1307528665 /usr/include/wx-2.9/wx/timer.h +1307941936 /usr/include/wx-2.9/wx/timer.h "wx/defs.h" "wx/object.h" "wx/longlong.h" @@ -632,13 +632,13 @@ "wx/stopwatch.h" "wx/utils.h" -1307528665 /usr/include/wx-2.9/wx/module.h +1307941936 /usr/include/wx-2.9/wx/module.h "wx/object.h" "wx/list.h" "wx/arrstr.h" "wx/dynarray.h" -1307528666 /usr/include/wx-2.9/wx/window.h +1307941937 /usr/include/wx-2.9/wx/window.h "wx/event.h" "wx/list.h" "wx/cursor.h" @@ -664,7 +664,7 @@ "wx/os2/window.h" "wx/univ/window.h" -1307528667 /usr/include/wx-2.9/wx/font.h +1307941937 /usr/include/wx-2.9/wx/font.h "wx/defs.h" "wx/fontenc.h" "wx/gdiobj.h" @@ -681,9 +681,9 @@ "wx/cocoa/font.h" "wx/os2/font.h" -1307528667 /usr/include/wx-2.9/wx/gtk/font.h +1307941938 /usr/include/wx-2.9/wx/gtk/font.h -1307528666 /usr/include/wx-2.9/wx/colour.h +1307941937 /usr/include/wx-2.9/wx/colour.h "wx/defs.h" "wx/gdiobj.h" "wx/variant.h" @@ -699,9 +699,9 @@ "wx/cocoa/colour.h" "wx/os2/colour.h" -1307528667 /usr/include/wx-2.9/wx/gtk/colour.h +1307941938 /usr/include/wx-2.9/wx/gtk/colour.h -1307528667 /usr/include/wx-2.9/wx/region.h +1307941938 /usr/include/wx-2.9/wx/region.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/palmos/region.h" @@ -715,13 +715,13 @@ "wx/cocoa/region.h" "wx/os2/region.h" -1307528667 /usr/include/wx-2.9/wx/gtk/region.h +1307941938 /usr/include/wx-2.9/wx/gtk/region.h -1307528666 /usr/include/wx-2.9/wx/validate.h +1307941937 /usr/include/wx-2.9/wx/validate.h "wx/defs.h" "wx/event.h" -1307528666 /usr/include/wx-2.9/wx/palette.h +1307941937 /usr/include/wx-2.9/wx/palette.h "wx/defs.h" "wx/object.h" "wx/gdiobj.h" @@ -733,13 +733,13 @@ "wx/osx/palette.h" "wx/os2/palette.h" -1307528667 /usr/include/wx-2.9/wx/generic/paletteg.h +1307941938 /usr/include/wx-2.9/wx/generic/paletteg.h "wx/defs.h" "wx/object.h" "wx/gdiobj.h" "wx/gdicmn.h" -1307528666 /usr/include/wx-2.9/wx/accel.h +1307941937 /usr/include/wx-2.9/wx/accel.h "wx/defs.h" "wx/object.h" "wx/generic/accel.h" @@ -751,33 +751,33 @@ "wx/generic/accel.h" "wx/os2/accel.h" -1307528666 /usr/include/wx-2.9/wx/generic/accel.h +1307941937 /usr/include/wx-2.9/wx/generic/accel.h -1307528667 /usr/include/wx-2.9/wx/gtk/accel.h +1307941938 /usr/include/wx-2.9/wx/gtk/accel.h "wx/generic/accel.h" -1307528666 /usr/include/wx-2.9/wx/access.h +1307941937 /usr/include/wx-2.9/wx/access.h "wx/defs.h" "wx/variant.h" "wx/msw/ole/access.h" -1307528667 /usr/include/wx-2.9/wx/gtk/window.h +1307941938 /usr/include/wx-2.9/wx/gtk/window.h "wx/dynarray.h" -1307528665 /usr/include/wx-2.9/wx/containr.h +1307941936 /usr/include/wx-2.9/wx/containr.h "wx/defs.h" -1307528666 /usr/include/wx-2.9/wx/panel.h +1307941937 /usr/include/wx-2.9/wx/panel.h "wx/window.h" "wx/containr.h" "wx/univ/panel.h" "wx/msw/panel.h" "wx/generic/panelg.h" -1307528666 /usr/include/wx-2.9/wx/generic/panelg.h +1307941937 /usr/include/wx-2.9/wx/generic/panelg.h "wx/bitmap.h" -1307528667 /usr/include/wx-2.9/wx/toplevel.h +1307941938 /usr/include/wx-2.9/wx/toplevel.h "wx/nonownedwnd.h" "wx/iconbndl.h" "wx/containr.h" @@ -795,18 +795,18 @@ "wx/motif/toplevel.h" "wx/univ/toplevel.h" -1307528667 /usr/include/wx-2.9/wx/nonownedwnd.h +1307941938 /usr/include/wx-2.9/wx/nonownedwnd.h "wx/dfb/nonownedwnd.h" "wx/osx/nonownedwnd.h" "wx/window.h" -1307528667 /usr/include/wx-2.9/wx/iconbndl.h +1307941937 /usr/include/wx-2.9/wx/iconbndl.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/icon.h" "wx/dynarray.h" -1307528666 /usr/include/wx-2.9/wx/icon.h +1307941937 /usr/include/wx-2.9/wx/icon.h "wx/iconloc.h" "wx/generic/icon.h" "wx/msw/icon.h" @@ -822,13 +822,13 @@ "wx/os2/icon.h" "wx/variant.h" -1307528665 /usr/include/wx-2.9/wx/iconloc.h +1307941936 /usr/include/wx-2.9/wx/iconloc.h "wx/string.h" -1307528667 /usr/include/wx-2.9/wx/generic/icon.h +1307941938 /usr/include/wx-2.9/wx/generic/icon.h "wx/bitmap.h" -1307528666 /usr/include/wx-2.9/wx/bitmap.h +1307941937 /usr/include/wx-2.9/wx/bitmap.h "wx/string.h" "wx/gdicmn.h" "wx/colour.h" @@ -847,18 +847,18 @@ "wx/os2/bitmap.h" "wx/generic/mask.h" -1307528667 /usr/include/wx-2.9/wx/gtk/bitmap.h +1307941938 /usr/include/wx-2.9/wx/gtk/bitmap.h -1307528665 /usr/include/wx-2.9/wx/weakref.h +1307941936 /usr/include/wx-2.9/wx/weakref.h "wx/tracker.h" "wx/meta/convertible.h" "wx/meta/int2type.h" -1307528666 /usr/include/wx-2.9/wx/meta/int2type.h +1307941936 /usr/include/wx-2.9/wx/meta/int2type.h -1307528667 /usr/include/wx-2.9/wx/gtk/toplevel.h +1307941938 /usr/include/wx-2.9/wx/gtk/toplevel.h -1307528666 /usr/include/wx-2.9/wx/frame.h +1307941937 /usr/include/wx-2.9/wx/frame.h "wx/toplevel.h" "wx/statusbr.h" "wx/univ/frame.h" @@ -871,7 +871,7 @@ "wx/cocoa/frame.h" "wx/os2/frame.h" -1307528666 /usr/include/wx-2.9/wx/statusbr.h +1307941937 /usr/include/wx-2.9/wx/statusbr.h "wx/defs.h" "wx/control.h" "wx/list.h" @@ -883,12 +883,12 @@ "wx/osx/statusbr.h" "wx/generic/statusbr.h" -1307528667 /usr/include/wx-2.9/wx/generic/statusbr.h +1307941938 /usr/include/wx-2.9/wx/generic/statusbr.h "wx/defs.h" "wx/pen.h" "wx/arrstr.h" -1307528666 /usr/include/wx-2.9/wx/pen.h +1307941937 /usr/include/wx-2.9/wx/pen.h "wx/gdiobj.h" "wx/gdicmn.h" "wx/palmos/pen.h" @@ -902,11 +902,11 @@ "wx/cocoa/pen.h" "wx/os2/pen.h" -1307528667 /usr/include/wx-2.9/wx/gtk/pen.h +1307941938 /usr/include/wx-2.9/wx/gtk/pen.h -1307528667 /usr/include/wx-2.9/wx/gtk/frame.h +1307941938 /usr/include/wx-2.9/wx/gtk/frame.h -1307528667 /usr/include/wx-2.9/wx/image.h +1307941937 /usr/include/wx-2.9/wx/image.h "wx/defs.h" "wx/object.h" "wx/string.h" @@ -926,43 +926,43 @@ "wx/imagxpm.h" "wx/imagiff.h" -1307528667 /usr/include/wx-2.9/wx/imagbmp.h +1307941937 /usr/include/wx-2.9/wx/imagbmp.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagpng.h +1307941937 /usr/include/wx-2.9/wx/imagpng.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307528667 /usr/include/wx-2.9/wx/imaggif.h +1307941937 /usr/include/wx-2.9/wx/imaggif.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagpcx.h +1307941937 /usr/include/wx-2.9/wx/imagpcx.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagjpeg.h +1307941937 /usr/include/wx-2.9/wx/imagjpeg.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307528667 /usr/include/wx-2.9/wx/imagtga.h +1307941937 /usr/include/wx-2.9/wx/imagtga.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagtiff.h +1307941937 /usr/include/wx-2.9/wx/imagtiff.h "wx/defs.h" "wx/image.h" "wx/versioninfo.h" -1307528667 /usr/include/wx-2.9/wx/imagpnm.h +1307941937 /usr/include/wx-2.9/wx/imagpnm.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagxpm.h +1307941937 /usr/include/wx-2.9/wx/imagxpm.h "wx/image.h" -1307528667 /usr/include/wx-2.9/wx/imagiff.h +1307941937 /usr/include/wx-2.9/wx/imagiff.h "wx/image.h" -1307528666 /usr/include/wx-2.9/wx/dc.h +1307941937 /usr/include/wx-2.9/wx/dc.h "wx/object.h" "wx/intl.h" "wx/cursor.h" @@ -978,7 +978,7 @@ "wx/region.h" "wx/affinematrix2d.h" -1307528666 /usr/include/wx-2.9/wx/brush.h +1307941937 /usr/include/wx-2.9/wx/brush.h "wx/defs.h" "wx/object.h" "wx/gdiobj.h" @@ -994,7 +994,7 @@ "wx/cocoa/brush.h" "wx/os2/brush.h" -1307528667 /usr/include/wx-2.9/wx/gtk/brush.h +1307941938 /usr/include/wx-2.9/wx/gtk/brush.h 1305215599 /usr/include/wx-2.9/wx/cmndata.h "wx/window.h" @@ -1007,22 +1007,22 @@ 1305215599 /usr/include/wx-2.9/wx/encinfo.h "wx/string.h" -1307528666 /usr/include/wx-2.9/wx/dcclient.h +1307941937 /usr/include/wx-2.9/wx/dcclient.h "wx/dc.h" -1307528666 /usr/include/wx-2.9/wx/dcmemory.h +1307941937 /usr/include/wx-2.9/wx/dcmemory.h "wx/dc.h" "wx/bitmap.h" -1307528666 /usr/include/wx-2.9/wx/dcprint.h +1307941937 /usr/include/wx-2.9/wx/dcprint.h "wx/defs.h" "wx/dc.h" -1307528666 /usr/include/wx-2.9/wx/dcscreen.h +1307941937 /usr/include/wx-2.9/wx/dcscreen.h "wx/defs.h" "wx/dc.h" -1307528666 /usr/include/wx-2.9/wx/button.h +1307941937 /usr/include/wx-2.9/wx/button.h "wx/defs.h" "wx/bitmap.h" "wx/control.h" @@ -1036,7 +1036,7 @@ "wx/os2/button.h" "wx/palmos/button.h" -1307528666 /usr/include/wx-2.9/wx/control.h +1307941937 /usr/include/wx-2.9/wx/control.h "wx/defs.h" "wx/window.h" "wx/univ/control.h" @@ -1049,11 +1049,11 @@ "wx/cocoa/control.h" "wx/os2/control.h" -1307528667 /usr/include/wx-2.9/wx/gtk/control.h +1307941938 /usr/include/wx-2.9/wx/gtk/control.h -1307528667 /usr/include/wx-2.9/wx/gtk/button.h +1307941938 /usr/include/wx-2.9/wx/gtk/button.h -1307528667 /usr/include/wx-2.9/wx/menuitem.h +1307941938 /usr/include/wx-2.9/wx/menuitem.h "wx/defs.h" "wx/object.h" "wx/univ/menuitem.h" @@ -1066,10 +1066,10 @@ "wx/cocoa/menuitem.h" "wx/os2/menuitem.h" -1307528667 /usr/include/wx-2.9/wx/gtk/menuitem.h +1307941938 /usr/include/wx-2.9/wx/gtk/menuitem.h "wx/bitmap.h" -1307528666 /usr/include/wx-2.9/wx/menu.h +1307941937 /usr/include/wx-2.9/wx/menu.h "wx/defs.h" "wx/list.h" "wx/window.h" @@ -1084,9 +1084,9 @@ "wx/cocoa/menu.h" "wx/os2/menu.h" -1307528667 /usr/include/wx-2.9/wx/gtk/menu.h +1307941938 /usr/include/wx-2.9/wx/gtk/menu.h -1307528666 /usr/include/wx-2.9/wx/dialog.h +1307941937 /usr/include/wx-2.9/wx/dialog.h "wx/defs.h" "wx/toplevel.h" "wx/univ/dialog.h" @@ -1099,13 +1099,13 @@ "wx/cocoa/dialog.h" "wx/os2/dialog.h" -1307528667 /usr/include/wx-2.9/wx/gtk/dialog.h +1307941938 /usr/include/wx-2.9/wx/gtk/dialog.h -1307528666 /usr/include/wx-2.9/wx/settings.h +1307941937 /usr/include/wx-2.9/wx/settings.h "wx/colour.h" "wx/font.h" -1307528666 /usr/include/wx-2.9/wx/msgdlg.h +1307941937 /usr/include/wx-2.9/wx/msgdlg.h "wx/defs.h" "wx/dialog.h" "wx/stockitem.h" @@ -1118,17 +1118,17 @@ "wx/osx/msgdlg.h" "wx/os2/msgdlg.h" -1307528665 /usr/include/wx-2.9/wx/stockitem.h +1307941936 /usr/include/wx-2.9/wx/stockitem.h "wx/defs.h" "wx/chartype.h" "wx/string.h" "wx/accel.h" -1307528666 /usr/include/wx-2.9/wx/generic/msgdlgg.h +1307941937 /usr/include/wx-2.9/wx/generic/msgdlgg.h -1307528667 /usr/include/wx-2.9/wx/gtk/msgdlg.h +1307941938 /usr/include/wx-2.9/wx/gtk/msgdlg.h -1307528666 /usr/include/wx-2.9/wx/dataobj.h +1307941937 /usr/include/wx-2.9/wx/dataobj.h "wx/defs.h" "wx/string.h" "wx/bitmap.h" @@ -1159,20 +1159,20 @@ "wx/cocoa/dataobj2.h" "wx/os2/dataobj2.h" -1307528667 /usr/include/wx-2.9/wx/gtk/dataform.h +1307941938 /usr/include/wx-2.9/wx/gtk/dataform.h -1307528667 /usr/include/wx-2.9/wx/gtk/dataobj.h +1307941938 /usr/include/wx-2.9/wx/gtk/dataobj.h -1307528667 /usr/include/wx-2.9/wx/gtk/dataobj2.h +1307941938 /usr/include/wx-2.9/wx/gtk/dataobj2.h -1307528666 /usr/include/wx-2.9/wx/ctrlsub.h +1307941937 /usr/include/wx-2.9/wx/ctrlsub.h "wx/defs.h" "wx/arrstr.h" "wx/control.h" "wx/msw/ctrlsub.h" "wx/motif/ctrlsub.h" -1307528666 /usr/include/wx-2.9/wx/bmpbuttn.h +1307941937 /usr/include/wx-2.9/wx/bmpbuttn.h "wx/defs.h" "wx/button.h" "wx/univ/bmpbuttn.h" @@ -1185,9 +1185,9 @@ "wx/os2/bmpbuttn.h" "wx/palmos/bmpbuttn.h" -1307528667 /usr/include/wx-2.9/wx/gtk/bmpbuttn.h +1307941938 /usr/include/wx-2.9/wx/gtk/bmpbuttn.h -1307528666 /usr/include/wx-2.9/wx/checkbox.h +1307941937 /usr/include/wx-2.9/wx/checkbox.h "wx/defs.h" "wx/control.h" "wx/univ/checkbox.h" @@ -1200,9 +1200,9 @@ "wx/os2/checkbox.h" "wx/palmos/checkbox.h" -1307528667 /usr/include/wx-2.9/wx/gtk/checkbox.h +1307941938 /usr/include/wx-2.9/wx/gtk/checkbox.h -1307528666 /usr/include/wx-2.9/wx/checklst.h +1307941937 /usr/include/wx-2.9/wx/checklst.h "wx/defs.h" "wx/listbox.h" "wx/univ/checklst.h" @@ -1215,7 +1215,7 @@ "wx/cocoa/checklst.h" "wx/os2/checklst.h" -1307528666 /usr/include/wx-2.9/wx/listbox.h +1307941937 /usr/include/wx-2.9/wx/listbox.h "wx/defs.h" "wx/ctrlsub.h" "wx/univ/listbox.h" @@ -1227,11 +1227,11 @@ "wx/os2/listbox.h" "wx/cocoa/listbox.h" -1307528667 /usr/include/wx-2.9/wx/gtk/listbox.h +1307941938 /usr/include/wx-2.9/wx/gtk/listbox.h -1307528667 /usr/include/wx-2.9/wx/gtk/checklst.h +1307941938 /usr/include/wx-2.9/wx/gtk/checklst.h -1307528666 /usr/include/wx-2.9/wx/choice.h +1307941937 /usr/include/wx-2.9/wx/choice.h "wx/defs.h" "wx/ctrlsub.h" "wx/univ/choice.h" @@ -1245,9 +1245,9 @@ "wx/os2/choice.h" "wx/palmos/choice.h" -1307528667 /usr/include/wx-2.9/wx/gtk/choice.h +1307941938 /usr/include/wx-2.9/wx/gtk/choice.h -1307528666 /usr/include/wx-2.9/wx/scrolbar.h +1307941937 /usr/include/wx-2.9/wx/scrolbar.h "wx/defs.h" "wx/control.h" "wx/univ/scrolbar.h" @@ -1259,9 +1259,9 @@ "wx/cocoa/scrolbar.h" "wx/os2/scrolbar.h" -1307528667 /usr/include/wx-2.9/wx/gtk/scrolbar.h +1307941938 /usr/include/wx-2.9/wx/gtk/scrolbar.h -1307528666 /usr/include/wx-2.9/wx/stattext.h +1307941937 /usr/include/wx-2.9/wx/stattext.h "wx/defs.h" "wx/control.h" "wx/univ/stattext.h" @@ -1274,9 +1274,9 @@ "wx/os2/stattext.h" "wx/palmos/stattext.h" -1307528667 /usr/include/wx-2.9/wx/gtk/stattext.h +1307941938 /usr/include/wx-2.9/wx/gtk/stattext.h -1307528666 /usr/include/wx-2.9/wx/statbmp.h +1307941937 /usr/include/wx-2.9/wx/statbmp.h "wx/defs.h" "wx/control.h" "wx/bitmap.h" @@ -1290,10 +1290,10 @@ "wx/cocoa/statbmp.h" "wx/os2/statbmp.h" -1307528667 /usr/include/wx-2.9/wx/gtk/statbmp.h +1307941938 /usr/include/wx-2.9/wx/gtk/statbmp.h "wx/icon.h" -1307528666 /usr/include/wx-2.9/wx/statbox.h +1307941937 /usr/include/wx-2.9/wx/statbox.h "wx/defs.h" "wx/control.h" "wx/univ/statbox.h" @@ -1305,9 +1305,9 @@ "wx/cocoa/statbox.h" "wx/os2/statbox.h" -1307528667 /usr/include/wx-2.9/wx/gtk/statbox.h +1307941938 /usr/include/wx-2.9/wx/gtk/statbox.h -1307528666 /usr/include/wx-2.9/wx/radiobox.h +1307941937 /usr/include/wx-2.9/wx/radiobox.h "wx/defs.h" "wx/ctrlsub.h" "wx/dynarray.h" @@ -1321,11 +1321,11 @@ "wx/os2/radiobox.h" "wx/palmos/radiobox.h" -1307528667 /usr/include/wx-2.9/wx/gtk/radiobox.h +1307941938 /usr/include/wx-2.9/wx/gtk/radiobox.h "wx/bitmap.h" "wx/list.h" -1307528666 /usr/include/wx-2.9/wx/radiobut.h +1307941937 /usr/include/wx-2.9/wx/radiobut.h "wx/defs.h" "wx/control.h" "wx/univ/radiobut.h" @@ -1338,9 +1338,9 @@ "wx/os2/radiobut.h" "wx/palmos/radiobut.h" -1307528667 /usr/include/wx-2.9/wx/gtk/radiobut.h +1307941938 /usr/include/wx-2.9/wx/gtk/radiobut.h -1307528666 /usr/include/wx-2.9/wx/textctrl.h +1307941937 /usr/include/wx-2.9/wx/textctrl.h "wx/defs.h" "wx/control.h" "wx/textentry.h" @@ -1359,7 +1359,7 @@ "wx/os2/textctrl.h" "wx/palmos/textctrl.h" -1307528666 /usr/include/wx-2.9/wx/textentry.h +1307941937 /usr/include/wx-2.9/wx/textentry.h "wx/gdicmn.h" "wx/gtk/textentry.h" "wx/osx/textentry.h" @@ -1367,18 +1367,18 @@ "wx/motif/textentry.h" "wx/os2/textentry.h" -1307528667 /usr/include/wx-2.9/wx/gtk/textentry.h +1307941938 /usr/include/wx-2.9/wx/gtk/textentry.h -1307528665 /usr/include/wx-2.9/wx/ioswrap.h +1307941936 /usr/include/wx-2.9/wx/ioswrap.h "wx/beforestd.h" "wx/afterstd.h" "wx/msw/winundef.h" -1307528667 /usr/include/wx-2.9/wx/gtk/textctrl.h +1307941938 /usr/include/wx-2.9/wx/gtk/textctrl.h -1307528666 /usr/include/wx-2.9/wx/slider.h +1307941937 /usr/include/wx-2.9/wx/slider.h "wx/defs.h" "wx/control.h" "wx/univ/slider.h" @@ -1391,9 +1391,9 @@ "wx/os2/slider.h" "wx/palmos/slider.h" -1307528667 /usr/include/wx-2.9/wx/gtk/slider.h +1307941938 /usr/include/wx-2.9/wx/gtk/slider.h -1307528666 /usr/include/wx-2.9/wx/gauge.h +1307941937 /usr/include/wx-2.9/wx/gauge.h "wx/defs.h" "wx/control.h" "wx/univ/gauge.h" @@ -1405,19 +1405,19 @@ "wx/cocoa/gauge.h" "wx/os2/gauge.h" -1307528667 /usr/include/wx-2.9/wx/gtk/gauge.h +1307941938 /usr/include/wx-2.9/wx/gtk/gauge.h -1307528666 /usr/include/wx-2.9/wx/scrolwin.h +1307941937 /usr/include/wx-2.9/wx/scrolwin.h "wx/panel.h" "wx/gtk/scrolwin.h" "wx/gtk1/scrolwin.h" "wx/generic/scrolwin.h" -1307528667 /usr/include/wx-2.9/wx/gtk/scrolwin.h +1307941938 /usr/include/wx-2.9/wx/gtk/scrolwin.h -1307528666 /usr/include/wx-2.9/wx/generic/scrolwin.h +1307941937 /usr/include/wx-2.9/wx/generic/scrolwin.h -1307528666 /usr/include/wx-2.9/wx/dirdlg.h +1307941937 /usr/include/wx-2.9/wx/dirdlg.h "wx/dialog.h" "wx/generic/dirdlgg.h" "wx/generic/dirdlgg.h" @@ -1429,9 +1429,9 @@ "wx/cocoa/dirdlg.h" "wx/generic/dirdlgg.h" -1307528667 /usr/include/wx-2.9/wx/gtk/dirdlg.h +1307941938 /usr/include/wx-2.9/wx/gtk/dirdlg.h -1307528666 /usr/include/wx-2.9/wx/toolbar.h +1307941937 /usr/include/wx-2.9/wx/toolbar.h "wx/defs.h" "wx/tbarbase.h" "wx/univ/toolbar.h" @@ -1445,15 +1445,15 @@ "wx/cocoa/toolbar.h" "wx/os2/toolbar.h" -1307528667 /usr/include/wx-2.9/wx/tbarbase.h +1307941938 /usr/include/wx-2.9/wx/tbarbase.h "wx/defs.h" "wx/bitmap.h" "wx/list.h" "wx/control.h" -1307528667 /usr/include/wx-2.9/wx/gtk/toolbar.h +1307941938 /usr/include/wx-2.9/wx/gtk/toolbar.h -1307528666 /usr/include/wx-2.9/wx/combobox.h +1307941937 /usr/include/wx-2.9/wx/combobox.h "wx/defs.h" "wx/ctrlsub.h" "wx/textentry.h" @@ -1466,37 +1466,37 @@ "wx/cocoa/combobox.h" "wx/os2/combobox.h" -1307528667 /usr/include/wx-2.9/wx/gtk/combobox.h +1307941938 /usr/include/wx-2.9/wx/gtk/combobox.h "wx/choice.h" -1307528666 /usr/include/wx-2.9/wx/layout.h +1307941937 /usr/include/wx-2.9/wx/layout.h "wx/object.h" -1307528666 /usr/include/wx-2.9/wx/sizer.h +1307941937 /usr/include/wx-2.9/wx/sizer.h "wx/defs.h" "wx/window.h" -1307528666 /usr/include/wx-2.9/wx/choicdlg.h +1307941937 /usr/include/wx-2.9/wx/choicdlg.h "wx/generic/choicdgg.h" -1307528666 /usr/include/wx-2.9/wx/generic/choicdgg.h +1307941937 /usr/include/wx-2.9/wx/generic/choicdgg.h "wx/dynarray.h" "wx/dialog.h" -1307528666 /usr/include/wx-2.9/wx/textdlg.h +1307941937 /usr/include/wx-2.9/wx/textdlg.h "wx/generic/textdlgg.h" -1307528666 /usr/include/wx-2.9/wx/generic/textdlgg.h +1307941937 /usr/include/wx-2.9/wx/generic/textdlgg.h "wx/defs.h" "wx/dialog.h" "wx/valtext.h" "wx/textctrl.h" -1307528666 /usr/include/wx-2.9/wx/valtext.h +1307941937 /usr/include/wx-2.9/wx/valtext.h "wx/defs.h" "wx/validate.h" -1307528666 /usr/include/wx-2.9/wx/filedlg.h +1307941937 /usr/include/wx-2.9/wx/filedlg.h "wx/defs.h" "wx/dialog.h" "wx/arrstr.h" @@ -1510,44 +1510,44 @@ "wx/os2/filedlg.h" "wx/generic/filedlgg.h" -1307528667 /usr/include/wx-2.9/wx/gtk/filedlg.h +1307941938 /usr/include/wx-2.9/wx/gtk/filedlg.h "wx/gtk/filectrl.h" -1307528667 /usr/include/wx-2.9/wx/gtk/filectrl.h +1307941938 /usr/include/wx-2.9/wx/gtk/filectrl.h "wx/control.h" "wx/filectrl.h" -1307528667 /usr/include/wx-2.9/wx/filectrl.h +1307941937 /usr/include/wx-2.9/wx/filectrl.h "wx/defs.h" "wx/string.h" "wx/event.h" "wx/gtk/filectrl.h" "wx/generic/filectrlg.h" -1307528666 /usr/include/wx-2.9/wx/generic/filectrlg.h +1307941937 /usr/include/wx-2.9/wx/generic/filectrlg.h "wx/panel.h" "wx/listctrl.h" "wx/filectrl.h" "wx/filename.h" -1307528667 /usr/include/wx-2.9/wx/listctrl.h +1307941937 /usr/include/wx-2.9/wx/listctrl.h "wx/defs.h" "wx/listbase.h" "wx/msw/listctrl.h" "wx/osx/listctrl.h" "wx/generic/listctrl.h" -1307528667 /usr/include/wx-2.9/wx/listbase.h +1307941937 /usr/include/wx-2.9/wx/listbase.h "wx/colour.h" "wx/font.h" "wx/gdicmn.h" "wx/event.h" -1307528667 /usr/include/wx-2.9/wx/generic/listctrl.h +1307941938 /usr/include/wx-2.9/wx/generic/listctrl.h "wx/scrolwin.h" "wx/textctrl.h" -1307528665 /usr/include/wx-2.9/wx/filename.h +1307941936 /usr/include/wx-2.9/wx/filename.h "wx/arrstr.h" "wx/filefn.h" "wx/datetime.h" @@ -1555,13 +1555,13 @@ "wx/longlong.h" "wx/file.h" -1307528665 /usr/include/wx-2.9/wx/file.h +1307941936 /usr/include/wx-2.9/wx/file.h "wx/defs.h" "wx/string.h" "wx/filefn.h" "wx/strconv.h" -1307528666 /usr/include/wx-2.9/wx/mdi.h +1307941937 /usr/include/wx-2.9/wx/mdi.h "wx/defs.h" "wx/frame.h" "wx/menu.h" @@ -1572,7 +1572,7 @@ "wx/osx/mdi.h" "wx/cocoa/mdi.h" -1307528667 /usr/include/wx-2.9/wx/gtk/mdi.h +1307941938 /usr/include/wx-2.9/wx/gtk/mdi.h "wx/frame.h" 1306384009 /home/mark/projects/SleepyHead/GUIFrame.h @@ -1713,14 +1713,14 @@ -1307528665 /usr/include/wx-2.9/wx/ffile.h +1307941936 /usr/include/wx-2.9/wx/ffile.h "wx/defs.h" "wx/string.h" "wx/filefn.h" "wx/convauto.h" -1307528665 /usr/include/wx-2.9/wx/convauto.h +1307941936 /usr/include/wx-2.9/wx/convauto.h "wx/strconv.h" "wx/fontenc.h" @@ -1748,7 +1748,7 @@ "tinyxml/tinyxml.h" "preferences.h" -1307528665 /usr/include/wx-2.9/wx/dir.h +1307941936 /usr/include/wx-2.9/wx/dir.h "wx/longlong.h" "wx/string.h" "wx/filefn.h" @@ -1804,7 +1804,7 @@ "preferences.h" -1307528665 /usr/include/wx-2.9/wx/stdpaths.h +1307941936 /usr/include/wx-2.9/wx/stdpaths.h "wx/defs.h" "wx/string.h" "wx/filefn.h" @@ -1814,7 +1814,7 @@ "wx/unix/stdpaths.h" "wx/palmos/stdpaths.h" -1307528666 /usr/include/wx-2.9/wx/unix/stdpaths.h +1307941937 /usr/include/wx-2.9/wx/unix/stdpaths.h 1306404743 source:/home/mark/projects/SleepyHead/libs/sleeplib/prs1_loader.cpp @@ -1828,12 +1828,12 @@ "prs1_loader.h" -1307528665 /usr/include/wx-2.9/wx/textfile.h +1307941936 /usr/include/wx-2.9/wx/textfile.h "wx/defs.h" "wx/textbuf.h" "wx/file.h" -1307528665 /usr/include/wx-2.9/wx/textbuf.h +1307941936 /usr/include/wx-2.9/wx/textbuf.h "wx/defs.h" "wx/arrstr.h" "wx/convauto.h" @@ -1875,14 +1875,14 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307528668 /usr/include/wx-2.9/wx/aui/auibook.h +1307941939 /usr/include/wx-2.9/wx/aui/auibook.h "wx/defs.h" "wx/aui/framemanager.h" "wx/aui/dockart.h" "wx/aui/floatpane.h" "wx/control.h" -1307528668 /usr/include/wx-2.9/wx/aui/framemanager.h +1307941939 /usr/include/wx-2.9/wx/aui/framemanager.h "wx/defs.h" "wx/dynarray.h" "wx/gdicmn.h" @@ -1891,20 +1891,20 @@ "wx/sizer.h" "wx/bitmap.h" -1307528668 /usr/include/wx-2.9/wx/aui/dockart.h +1307941939 /usr/include/wx-2.9/wx/aui/dockart.h "wx/defs.h" "wx/pen.h" "wx/brush.h" "wx/bitmap.h" "wx/colour.h" -1307528668 /usr/include/wx-2.9/wx/aui/floatpane.h +1307941939 /usr/include/wx-2.9/wx/aui/floatpane.h "wx/defs.h" "wx/weakref.h" "wx/minifram.h" "wx/frame.h" -1307528667 /usr/include/wx-2.9/wx/minifram.h +1307941938 /usr/include/wx-2.9/wx/minifram.h "wx/defs.h" "wx/palmos/minifram.h" "wx/msw/minifram.h" @@ -1916,11 +1916,11 @@ "wx/os2/minifram.h" "wx/frame.h" -1307528667 /usr/include/wx-2.9/wx/gtk/minifram.h +1307941938 /usr/include/wx-2.9/wx/gtk/minifram.h "wx/bitmap.h" "wx/frame.h" -1307528668 /usr/include/wx-2.9/wx/aui/aui.h +1307941939 /usr/include/wx-2.9/wx/aui/aui.h "wx/aui/framemanager.h" "wx/aui/dockart.h" "wx/aui/floatpane.h" @@ -1928,20 +1928,20 @@ "wx/aui/auibook.h" "wx/aui/tabmdi.h" -1307528668 /usr/include/wx-2.9/wx/aui/auibar.h +1307941939 /usr/include/wx-2.9/wx/aui/auibar.h "wx/defs.h" "wx/control.h" "wx/sizer.h" "wx/pen.h" -1307528668 /usr/include/wx-2.9/wx/aui/tabmdi.h +1307941939 /usr/include/wx-2.9/wx/aui/tabmdi.h "wx/frame.h" "wx/panel.h" "wx/notebook.h" "wx/icon.h" "wx/aui/auibook.h" -1307528667 /usr/include/wx-2.9/wx/notebook.h +1307941938 /usr/include/wx-2.9/wx/notebook.h "wx/defs.h" "wx/bookctrl.h" "wx/univ/notebook.h" @@ -1953,26 +1953,26 @@ "wx/cocoa/notebook.h" "wx/os2/notebook.h" -1307528666 /usr/include/wx-2.9/wx/bookctrl.h +1307941937 /usr/include/wx-2.9/wx/bookctrl.h "wx/defs.h" "wx/control.h" "wx/dynarray.h" "wx/notebook.h" "wx/choicebk.h" -1307528666 /usr/include/wx-2.9/wx/choicebk.h +1307941937 /usr/include/wx-2.9/wx/choicebk.h "wx/defs.h" "wx/bookctrl.h" "wx/choice.h" -1307528666 /usr/include/wx-2.9/wx/generic/notebook.h +1307941937 /usr/include/wx-2.9/wx/generic/notebook.h "wx/event.h" "wx/control.h" -1307528667 /usr/include/wx-2.9/wx/gtk/notebook.h +1307941938 /usr/include/wx-2.9/wx/gtk/notebook.h "wx/list.h" -1307528668 /usr/include/wx-2.9/wx/html/htmlwin.h +1307941939 /usr/include/wx-2.9/wx/html/htmlwin.h "wx/defs.h" "wx/window.h" "wx/scrolwin.h" @@ -1985,31 +1985,31 @@ "wx/filename.h" "wx/bitmap.h" -1307528665 /usr/include/wx-2.9/wx/config.h +1307941936 /usr/include/wx-2.9/wx/config.h "wx/confbase.h" "wx/msw/regconf.h" "wx/os2/iniconf.h" "wx/palmos/prefconf.h" "wx/fileconf.h" -1307528665 /usr/include/wx-2.9/wx/confbase.h +1307941936 /usr/include/wx-2.9/wx/confbase.h "wx/defs.h" "wx/string.h" "wx/object.h" "wx/base64.h" -1307528665 /usr/include/wx-2.9/wx/base64.h +1307941936 /usr/include/wx-2.9/wx/base64.h "wx/string.h" "wx/buffer.h" -1307528665 /usr/include/wx-2.9/wx/fileconf.h +1307941936 /usr/include/wx-2.9/wx/fileconf.h "wx/defs.h" "wx/textfile.h" "wx/string.h" "wx/confbase.h" "wx/filename.h" -1307528668 /usr/include/wx-2.9/wx/html/winpars.h +1307941939 /usr/include/wx-2.9/wx/html/winpars.h "wx/defs.h" "wx/module.h" "wx/font.h" @@ -2017,7 +2017,7 @@ "wx/html/htmlcell.h" "wx/encconv.h" -1307528668 /usr/include/wx-2.9/wx/html/htmlpars.h +1307941939 /usr/include/wx-2.9/wx/html/htmlpars.h "wx/defs.h" "wx/html/htmltag.h" "wx/filesys.h" @@ -2026,26 +2026,26 @@ "wx/vector.h" "wx/fontenc.h" -1307528668 /usr/include/wx-2.9/wx/html/htmltag.h +1307941939 /usr/include/wx-2.9/wx/html/htmltag.h "wx/defs.h" "wx/object.h" "wx/arrstr.h" -1307528665 /usr/include/wx-2.9/wx/filesys.h +1307941936 /usr/include/wx-2.9/wx/filesys.h "wx/defs.h" "wx/stream.h" "wx/datetime.h" "wx/filename.h" "wx/hashmap.h" -1307528665 /usr/include/wx-2.9/wx/hashset.h +1307941936 /usr/include/wx-2.9/wx/hashset.h "wx/hashmap.h" -1307528665 /usr/include/wx-2.9/wx/vector.h +1307941936 /usr/include/wx-2.9/wx/vector.h "wx/defs.h" @@ -2057,40 +2057,40 @@ "wx/afterstd.h" -1307528667 /usr/include/wx-2.9/wx/scopeguard.h +1307941938 /usr/include/wx-2.9/wx/scopeguard.h "wx/defs.h" "wx/except.h" -1307528665 /usr/include/wx-2.9/wx/except.h +1307941936 /usr/include/wx-2.9/wx/except.h "wx/defs.h" -1307528666 /usr/include/wx-2.9/wx/meta/movable.h +1307941936 /usr/include/wx-2.9/wx/meta/movable.h "wx/meta/pod.h" "wx/string.h" -1307528666 /usr/include/wx-2.9/wx/meta/pod.h +1307941936 /usr/include/wx-2.9/wx/meta/pod.h "wx/defs.h" -1307528668 /usr/include/wx-2.9/wx/html/htmlcell.h +1307941939 /usr/include/wx-2.9/wx/html/htmlcell.h "wx/defs.h" "wx/html/htmltag.h" "wx/html/htmldefs.h" "wx/window.h" -1307528668 /usr/include/wx-2.9/wx/html/htmldefs.h +1307941939 /usr/include/wx-2.9/wx/html/htmldefs.h "wx/defs.h" -1307528665 /usr/include/wx-2.9/wx/encconv.h +1307941936 /usr/include/wx-2.9/wx/encconv.h "wx/defs.h" "wx/object.h" "wx/fontenc.h" "wx/dynarray.h" -1307528668 /usr/include/wx-2.9/wx/html/htmlfilt.h +1307941939 /usr/include/wx-2.9/wx/html/htmlfilt.h "wx/defs.h" "wx/filesys.h" -1307528667 /usr/include/wx-2.9/wx/calctrl.h +1307941938 /usr/include/wx-2.9/wx/calctrl.h "wx/defs.h" "wx/dateevt.h" "wx/colour.h" @@ -2100,14 +2100,14 @@ "wx/msw/calctrl.h" "wx/generic/calctrlg.h" -1307528667 /usr/include/wx-2.9/wx/dateevt.h +1307941938 /usr/include/wx-2.9/wx/dateevt.h "wx/event.h" "wx/datetime.h" "wx/window.h" -1307528667 /usr/include/wx-2.9/wx/gtk/calctrl.h +1307941938 /usr/include/wx-2.9/wx/gtk/calctrl.h -1307528667 /usr/include/wx-2.9/wx/generic/calctrlg.h +1307941938 /usr/include/wx-2.9/wx/generic/calctrlg.h "wx/control.h" "wx/dcclient.h" @@ -4134,18 +4134,18 @@ "sleeplib/machine.h" "graph.h" -1307528666 /usr/include/wx-2.9/wx/dcgraph.h +1307941937 /usr/include/wx-2.9/wx/dcgraph.h "wx/dc.h" "wx/geometry.h" "wx/graphics.h" -1307528667 /usr/include/wx-2.9/wx/geometry.h +1307941937 /usr/include/wx-2.9/wx/geometry.h "wx/defs.h" "wx/utils.h" "wx/gdicmn.h" "wx/math.h" -1307528666 /usr/include/wx-2.9/wx/graphics.h +1307941937 /usr/include/wx-2.9/wx/graphics.h "wx/defs.h" "wx/geometry.h" "wx/dynarray.h" @@ -4169,7 +4169,7 @@ "wx/dcclient.h" "wx/window.h" -1307528667 /usr/include/wx-2.9/wx/dcbuffer.h +1307941938 /usr/include/wx-2.9/wx/dcbuffer.h "wx/dcmemory.h" "wx/dcclient.h" "wx/window.h" @@ -8049,7 +8049,7 @@ 1302101441 /usr/include/wx-2.8/wx/gtk/statline.h "wx/defs.h" -1307528667 /usr/include/wx-2.9/wx/datectrl.h +1307941938 /usr/include/wx-2.9/wx/datectrl.h "wx/defs.h" "wx/control.h" "wx/datetime.h" @@ -8057,7 +8057,7 @@ "wx/msw/datectrl.h" "wx/generic/datectrl.h" -1307528667 /usr/include/wx-2.9/wx/generic/datectrl.h +1307941938 /usr/include/wx-2.9/wx/generic/datectrl.h "wx/compositewin.h" 1305215599 /usr/include/wx-2.9/wx/combo.h @@ -8077,16 +8077,16 @@ 1305215599 /usr/include/wx-2.9/wx/generic/combo.h -1307528667 /usr/include/wx-2.9/wx/progdlg.h +1307941938 /usr/include/wx-2.9/wx/progdlg.h "wx/defs.h" "wx/palmos/progdlg.h" "wx/generic/progdlgg.h" "wx/msw/progdlg.h" -1307528666 /usr/include/wx-2.9/wx/generic/progdlgg.h +1307941937 /usr/include/wx-2.9/wx/generic/progdlgg.h "wx/dialog.h" -1307528665 /usr/include/wx-2.9/wx/fs_mem.h +1307941936 /usr/include/wx-2.9/wx/fs_mem.h "wx/defs.h" "wx/filesys.h" "wx/hashmap.h" @@ -8300,14 +8300,13 @@ "tinyxml/tinyxml.h" -1307873151 /home/mark/projects/git/sleepyhead/src/graphs/graph.h +1307993148 /home/mark/projects/git/sleepyhead/src/graphs/graph.h - -1307878622 /home/mark/projects/git/sleepyhead/src/version.h +1307993659 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8325,7 +8324,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307862323 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307991977 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8345,18 +8344,21 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307876090 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307993659 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp + - "graph.h" "sleeplib/profiles.h" "freesans.c" + "graph.h" + "freetype-gl/font-manager.h" + "freetype-gl/texture-font.h" 1307623396 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.cpp @@ -8684,7 +8686,7 @@ "tinyxml.h" -1307528667 /usr/include/wx-2.9/wx/treectrl.h +1307941938 /usr/include/wx-2.9/wx/treectrl.h "wx/defs.h" "wx/control.h" "wx/treebase.h" @@ -8698,22 +8700,22 @@ "wx/generic/treectlg.h" "wx/generic/treectlg.h" -1307528667 /usr/include/wx-2.9/wx/treebase.h +1307941938 /usr/include/wx-2.9/wx/treebase.h "wx/defs.h" "wx/window.h" "wx/event.h" "wx/dynarray.h" -1307528666 /usr/include/wx-2.9/wx/generic/treectlg.h +1307941937 /usr/include/wx-2.9/wx/generic/treectlg.h "wx/scrolwin.h" "wx/pen.h" -1307528667 /usr/include/wx-2.9/wx/aboutdlg.h +1307941938 /usr/include/wx-2.9/wx/aboutdlg.h "wx/defs.h" "wx/app.h" "wx/icon.h" -1307528666 /usr/include/wx-2.9/wx/xtitypes.h +1307941936 /usr/include/wx-2.9/wx/xtitypes.h "wx/defs.h" "wx/string.h" "wx/hashmap.h" @@ -8723,45 +8725,45 @@ "wx/log.h" -1307528666 /usr/include/wx-2.9/wx/xtihandler.h +1307941936 /usr/include/wx-2.9/wx/xtihandler.h "wx/defs.h" "wx/xti.h" -1307528665 /usr/include/wx-2.9/wx/rtti.h +1307941936 /usr/include/wx-2.9/wx/rtti.h "wx/memory.h" "wx/flags.h" -1307528666 /usr/include/wx-2.9/wx/xti2.h +1307941936 /usr/include/wx-2.9/wx/xti2.h "wx/xtiprop.h" "wx/xtictor.h" -1307528666 /usr/include/wx-2.9/wx/xtiprop.h +1307941936 /usr/include/wx-2.9/wx/xtiprop.h "wx/defs.h" "wx/xti.h" "wx/any.h" -1307528666 /usr/include/wx-2.9/wx/xtictor.h +1307941936 /usr/include/wx-2.9/wx/xtictor.h "wx/defs.h" "wx/xti.h" -1307528665 /usr/include/wx-2.9/wx/versioninfo.h +1307941936 /usr/include/wx-2.9/wx/versioninfo.h "wx/string.h" -1307528666 /usr/include/wx-2.9/wx/meta/implicitconversion.h +1307941936 /usr/include/wx-2.9/wx/meta/implicitconversion.h "wx/defs.h" "wx/meta/if.h" -1307528666 /usr/include/wx-2.9/wx/affinematrix2d.h +1307941937 /usr/include/wx-2.9/wx/affinematrix2d.h "wx/affinematrix2dbase.h" -1307528666 /usr/include/wx-2.9/wx/affinematrix2dbase.h +1307941937 /usr/include/wx-2.9/wx/affinematrix2dbase.h "wx/defs.h" "wx/geometry.h" -1307528666 /usr/include/wx-2.9/wx/compositewin.h +1307941937 /usr/include/wx-2.9/wx/compositewin.h "wx/window.h" -1307528668 /usr/include/wx-2.9/wx/glcanvas.h +1307941939 /usr/include/wx-2.9/wx/glcanvas.h "wx/defs.h" "wx/app.h" "wx/palette.h" @@ -8773,10 +8775,10 @@ "wx/osx/glcanvas.h" "wx/cocoa/glcanvas.h" -1307528668 /usr/include/wx-2.9/wx/gtk/glcanvas.h +1307941939 /usr/include/wx-2.9/wx/gtk/glcanvas.h "wx/unix/glx11.h" -1307528668 /usr/include/wx-2.9/wx/unix/glx11.h +1307941939 /usr/include/wx-2.9/wx/unix/glx11.h 1307765966 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/glcanvas.h @@ -10895,3 +10897,162 @@ 1307847400 /home/mark/projects/git/sleepyhead/src/graphs/freesans.c +1307960480 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/font-manager.c + + + + + "font-manager.h" + +1307976321 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/font-manager.h + + "text-markup.h" + "texture-font.h" + "texture-atlas.h" + +1307960525 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.h + +1307968571 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.h + + +1307974235 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.h + + "vector.h" + "texture-atlas.h" + "texture-glyph.h" + +1307989095 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.h + + + +1307974462 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.h + + "text-markup.h" + "vertex-buffer.h" + +1307988727 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h + + + "freetype-gl/vector.h" + +1307960497 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.c + + + + "font-manager.h" + "text-markup.h" + +1307960504 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.c + + + + + + + "texture-atlas.h" + +1307960509 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.c + + + + + + + "texture-font.h" + +1307960516 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.c + + + + + "texture-glyph.h" + +1307960525 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.c + + + + + "vector.h" + +1307960529 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.c + + + + + "vertex-buffer.h" + +1307962456 source:/home/mark/projects/git/sleepyhead/src/graphs/fonts.cpp + "fonts.h" + "freetype-gl/vector.h" + "freetype-gl/vertex-buffer.h" + "freetype-gl/text-markup.h" + "freetype-gl/texture-font.h" + "freetype-gl/texture-atlas.h" + +1307976090 /home/mark/projects/git/sleepyhead/src/graphs/fonts.h + + + "freetype-gl/font-manager.h" + +1307972963 /home/mark/projects/git/sleepyhead/src/graphs/fonts.cpp + "fonts.h" + "freetype-gl/vector.h" + "freetype-gl/vertex-buffer.h" + "freetype-gl/text-markup.h" + "freetype-gl/texture-font.h" + "freetype-gl/texture-atlas.h" + +1307976336 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/font-manager.cpp + + + + + + "font-manager.h" + +1307973382 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp + + + + "font-manager.h" + "text-markup.h" + +1307984359 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.cpp + + + + "texture-atlas.h" + +1307974648 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp + + + + + + + + "texture-font.h" + +1307974760 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp + + + + + "texture-glyph.h" + +1307989346 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp + + + + + "vertex-buffer.h" + + + +1307976602 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.cpp + + + + + "freetype-gl/vector.h" + diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 0351e873..cf6c9e83 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -1,7 +1,7 @@ - - + + @@ -11,19 +11,55 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -38,7 +74,7 @@ - + @@ -46,8 +82,8 @@ - - + + diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 53578141..ebc5d957 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -790,6 +790,7 @@ Daily::Daily(wxWindow *win,Profile *p) gwSizer->Add(PRD,1,wxEXPAND); gwSizer->Add(LEAK,1,wxEXPAND); gwSizer->Add(SNORE,1,wxEXPAND); + //gwSizer->Add(TAP,1,wxEXPAND); gwSizer->Add(PULSE,1,wxEXPAND); gwSizer->Add(SPO2,1,wxEXPAND); @@ -1028,7 +1029,7 @@ void Daily::RefreshData() // html=html+wxT(" \n"); //html=html+wxT(" \n"); html=html+wxT("")+_("Event Breakdown")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); //html=html+wxT(" \n"); //html=html+wxT("")+_("Other Information")+wxT("\n"); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 445ee6f8..bd9b7797 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -9,6 +9,7 @@ License: LGPL #include #include #include +#include #include #include @@ -18,10 +19,12 @@ License: LGPL #include #endif - -#include "graph.h" #include "sleeplib/profiles.h" + #include "freesans.c" +#include "graph.h" +#include "freetype-gl/font-manager.h" +#include "freetype-gl/texture-font.h" #if !wxUSE_GLCANVAS #error "OpenGL required: set wxUSE_GLCANVAS to 1 and rebuild the wx library" @@ -49,23 +52,26 @@ wxColor *wxDARK_GREEN=&zwxDARK_GREEN; wxColor zwxDARK_GREY(0xA0,0xA0,0xA0,0xA0); wxColor *wxDARK_GREY=&zwxDARK_GREY; -wxFont *smallfont=NULL,*bigfont=NULL,*boldfont=NULL; bool gfont_init=false; -FTFont *normalfont=NULL; -FTFont *largefont=NULL; -FTFont *texfont=NULL; -//FTFont *rotfont=NULL; - -list font_paths; - wxGLContext *shared_context=NULL; +FontManager *font_manager; +TextureFont *zfont=NULL; +VertexBuffer *vbuffer=NULL; +TextMarkup *markup=NULL; // Must be called from a thread inside the application. void GraphInit() { if (!gfont_init) { + font_manager=new FontManager(); + vbuffer=new VertexBuffer((char *)"v3i:t2f:c4f"); + zfont=font_manager->GetFromFilename(pref.Get("{home}{sep}FreeSans.ttf"),14); + markup=new TextMarkup(); + + glBindTexture( GL_TEXTURE_2D, font_manager->m_atlas->m_texid ); + wxString fontfile=pref.Get("{home}{sep}FreeSans.ttf"); if (!wxFileExists(fontfile)) { wxFFile f; @@ -77,41 +83,15 @@ void GraphInit() } f.Close(); } - - normalfont=new FTGLPixmapFont(fontfile.mb_str()); - largefont=new FTGLPixmapFont(fontfile.mb_str()); - texfont=new FTGLTextureFont(pref.Get("{home}{sep}FreeSans.ttf").mb_str()); // each context needs it's own texture font. Should be sharing one context.. - if (texfont->Error()) { - delete texfont; - texfont=NULL; - } else { - texfont->FaceSize(15); - } - if (normalfont->Error()) { - delete normalfont; - normalfont=NULL; - } - if (largefont->Error()) { - delete largefont; - largefont=NULL; - } - largefont->FaceSize(30); - normalfont->FaceSize(14); - //rotfont->FaceSize(20); - bigfont=new wxFont(32,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); - boldfont=new wxFont(12,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD); - smallfont=new wxFont(10,wxFONTFAMILY_ROMAN,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_NORMAL); gfont_init=true; } } void GraphDone() { if (gfont_init) { - delete smallfont; - delete boldfont; - delete bigfont; - delete texfont; - delete normalfont; + delete font_manager; + delete vbuffer; + delete markup; gfont_init=false; } if (shared_context) { @@ -120,14 +100,45 @@ void GraphDone() } } -void GetTextExtent(wxString text, float & width, float & height, FTFont *font=normalfont) +void GetTextExtent(wxString text, float & width, float & height, TextureFont *font=zfont) { - FTBBox box=font->BBox(text.mb_str(),-1); - width = box.Upper().X() - box.Lower().X(); - height = font->Ascender(); + TextureGlyph *glyph; + height=width=0; + + for (int i=0;iGetGlyph((wchar_t)text[i]); + if (!height) height=glyph->m_height; // > height) height=glyph->m_height; + width+=glyph->m_advance_x; + } +} +void DrawText2(wxString text, float x, float y,TextureFont *font) +{ + Pen pen; + pen.x=x; + pen.y=y; + + TextureGlyph *glyph; + glyph=font->GetGlyph((wchar_t)text[0]); + if (!glyph) return; + + vbuffer->Clear(); + glyph->AddToVertexBuffer(vbuffer, markup, &pen); + for (int j=1; jGetGlyph(text[j]); + pen.x += glyph->GetKerning(text[j-1]); + glyph->AddToVertexBuffer(vbuffer, markup, &pen); + } + //glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glEnable( GL_BLEND ); + glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + glEnable( GL_TEXTURE_2D ); + glColor4f(1,1,1,1); + vbuffer->Render(GL_TRIANGLES, "vtc" ); + glDisable(GL_BLEND); + } -void DrawText(wxString text, float x, float y, float angle=0, const wxColor & color=*wxBLACK,FTFont *font=normalfont) +void DrawText(wxString text, float x, float y, float angle=0, const wxColor & color=*wxBLACK,TextureFont *font=zfont) { if (!font) { wxLogError(wxT("Font Problem. Forgot to call GraphInit() ?")); @@ -135,53 +146,86 @@ void DrawText(wxString text, float x, float y, float angle=0, const wxColor & co return; } if (angle==0) { - glPixelTransferf(GL_RED_BIAS, -1.0f); + // Colourizing this just plain sucks.. + DrawText2(text,x,y,font); // + /*glPixelTransferf(GL_RED_BIAS, -1.0f); glPixelTransferf(GL_GREEN_BIAS, -1.0f); glPixelTransferf(GL_BLUE_BIAS, -1.0f); glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); - //Dark red textglPixelTransferf(GL_RED_BIAS, -0.5f);glPixelTransferf(GL_GREEN_BIAS, -1.0f);glPixelTransferf(GL_BLUE_BIAS, -1.0f); - - //normalfont->FaceSize(pointsize); - font->Render(text.mb_str(),-1,FTPoint(x,y)); //,x,y); + font->Render(text.mb_str(),-1,FTPoint(x,y)); //,x,y);*/ return; } - // Damn this crap.. Shouldn't have to do this each draw.. - //font->FaceSize(14); float w,h; GetTextExtent(text, w, h, font); - //glPushAttrib(GL_LIST_BIT|GL_CURRENT_BIT|GL_ENABLE_BIT|GL_TRANSFORM_BIT); - - //glEnable(GL_BLEND); -// glPixelTransferf(GL_RED_BIAS, -1.0f); - //glPixelTransferf(GL_GREEN_BIAS, -1.0f); - //glPixelTransferf(GL_BLUE_BIAS, -1.0f); - - //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - // glPushAttrib( GL_ENABLE_BIT | GL_HINT_BIT | GL_LINE_BIT | GL_PIXEL_MODE_BIT); - -// glEnable(GL_BLEND); - // glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE - - glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); + //glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); glPushMatrix(); - //glEnable(GL_TEXTURE_2D); - //glBlendFunc(GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ZERO); - // glBlendFunc(GL_ONE, GL_ZERO); - //glLoadIdentity(); glTranslatef(x,y,0); glRotatef(angle, 0.0f, 0.0f, 1.0f); - font->Render(text.mb_str(),-1,FTPoint(-w/2.0,-h/2.0)); + DrawText2(text,-w/2.0,-h/2.0,font); + //font->Render(text.mb_str(),-1,FTPoint(-w/2.0,-h/2.0)); glTranslatef(-x,-y,0); - //glDisable(GL_BLEND); - //glEnable(GL_TEXTURE_2D); glPopMatrix(); - //glPopAttrib(); } +void RoundedRectangle(int x,int y,int w,int h,int radius,const wxColor & color) +{ + glDisable(GL_TEXTURE_2D); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); + + glBegin(GL_POLYGON); + glVertex2i(x+radius,y); + glVertex2i(x+w-radius,y); + for(float i=(float)M_PI*1.5f;i::iterator l=layers.begin();l!=layers.end();l++) { - (*l)->Plot(dc,*this); + int ret; + + Display *display=wxGetX11Display(); + GLXFBConfig *fbc = GetGLXFBConfig(); + + GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib ); + if (pBuffer == 0) { + wxLogError(wxT("pBuffer not availble")); } - dc.SelectObject(wxNullBitmap); + //real_shared_context = + //GLXContext cx= shared_context->GetGLXContext(); + + GLXContext cx = glXCreateNewContext(display,fbc[0],GLX_RGBA_TYPE, real_shared_context, True); + //GLXContext cx=real_shared_context; + if (cx == 0) { + wxLogError(wxT("CX not availble")); + } + + //XFree(fbc); + if (glXMakeCurrent(display,pBuffer,cx)!=True) { + wxLogError(wxT("Couldn't make buffer current")); + } + +// texfont->FaceSize(14); +#endif + // glClearColor(1,1,0,1); + glClear(GL_COLOR_BUFFER_BIT); + + // Can't use font's in multiple contexts + Render(width,height); + + void* pixels = malloc(3 * width * height); // must use malloc + glPixelStorei(GL_PACK_ALIGNMENT, 1); + //glDrawBuffer(GL_BACK_LEFT); + //glReadBuffer(GL_FRONT); + glReadBuffer( GL_BACK_LEFT ); + glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, pixels); + + // Put the image into a wxImage + wxImage image(width, height, true); + image.SetData((unsigned char*) pixels); + image = image.Mirror(false); + + wxBitmap *bmp=new wxBitmap(image); + + glFlush(); +#if defined(__UNIX__) + glXDestroyContext(display,cx); + glXDestroyPbuffer(display, pBuffer); +#endif + return bmp; } -void RoundedRectangle(int x,int y,int w,int h,int radius,const wxColor & color) +void gGraphWindow::Render(float scrX, float scrY) { - glDisable(GL_TEXTURE_2D); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); + glViewport(0, 0, scrX, scrY); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); - glBegin(GL_POLYGON); - glVertex2i(x+radius,y); - glVertex2i(x+w-radius,y); - for(float i=(float)M_PI*1.5f;i::iterator l=layers.begin();l!=layers.end();l++) { + (*l)->Plot(*this,scrX,scrY); + } + +// glEnable(GL_DEPTH_TEST); } -void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,wxColor & color) -{ - glDisable(GL_TEXTURE_2D); - glShadeModel(GL_SMOOTH); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - glColor4ub(color.Red(),color.Green(),color.Blue(),color.Alpha()); - glLineWidth((GLfloat)lw); - - glBegin(GL_LINE_STRIP); - for(float i=(float)M_PI;i<=1.5f*M_PI;i+=0.1f) - glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+radius); - for(float i=1.5f*(float)M_PI;i<=2*M_PI; i+=0.1f) - glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+radius); - for(float i=0;i<=0.5f*M_PI; i+=0.1f) - glVertex2f(radius*cos(i)+x+w-radius,radius*sin(i)+y+h-radius); - for(float i=0.5f*(float)M_PI;i<=M_PI;i+=0.1f) - glVertex2f(radius*cos(i)+x+radius,radius*sin(i)+y+h-radius); - glVertex2i(x,y+radius); - glEnd(); - - glEnable(GL_TEXTURE_2D); - glDisable(GL_BLEND); -} - - void gGraphWindow::OnPaint(wxPaintEvent& event) { + // Shouldn't need this anymore as opengl double buffers anyway. //#if defined(__WXMSW__) // wxAutoBufferedPaintDC dc(this); //#else wxPaintDC dc(this); //#endif - GetClientSize(&m_scrX, &m_scrY); -#if !defined(__DARWIN__) - shared_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window -#else +//#if wxCHECK_VERSION(2,9,0) + //SetCurrent(*shared_context); +//#else + +#if defined(__DARWIN__) && !wxCHECK_VERSION(2,9,0) shared_context->SetCurrent(); +#else + shared_context->SetCurrent(*this); // A generic Context needs to be used.. Not one per graph window #endif - glViewport(0, 0, m_scrX, m_scrY); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); +//#endif - glOrtho(0, m_scrX, 0, m_scrY, -1, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + real_shared_context = glXGetCurrentContext(); + GetClientSize(&m_scrX, &m_scrY); - //glMatrixMode(GL_PROJECTION); - //glPushMatrix(); - //glLoadIdentity(); - glDisable(GL_DEPTH_TEST); - -// glMatrixMode(GL_MODELVIEW); - // glLoadIdentity(); - glDisable(GL_LIGHTING); - - glBegin(GL_QUADS); - glColor3f(1.0,1.0,1.0); // Gradient start - glVertex2f(0, m_scrY); - glVertex2f(0, 0); - - glColor3f(0.8,0.8,1.0); // Gradient End - glVertex2f(m_scrX, 0); - glVertex2f(m_scrX, m_scrY); - glEnd(); - - // glEnable(GL_TEXTURE_2D); - //glMatrixMode(GL_PROJECTION); - //glPopMatrix(); - //glMatrixMode(GL_MODELVIEW); - - for (list::iterator l=layers.begin();l!=layers.end();l++) { - /*if (dynamic_cast(*l)) { - (*l)->Plot(dc,*this); - } - if (dynamic_cast(*l)) { - (*l)->Plot(dc,*this); - } */ - (*l)->Plot(dc,*this); - } + Render(m_scrX,m_scrY); if (m_mouseLDown) { if (m_mouseRBrect.width>0) @@ -908,60 +945,10 @@ void gGraphWindow::OnPaint(wxPaintEvent& event) RoundedRectangle(m_mouseRBrect.x,m_mouseRBrect.y,m_mouseRBrect.width-1,m_mouseRBrect.height,5,*wxDARK_GREY); } -// glEnable(GL_DEPTH_TEST); + glEnable(GL_DEPTH_TEST); SwapBuffers(); - //wxAutoBufferedPaintDC dc(this); - - -//#if defined(__WXMSW) - // wxGraphicsRenderer *render=wxGraphicsRenderer::GetDefaultRenderer(); - // Create graphics context from it -// wxGraphicsContext *gc = render->CreateContextFromNativeWindow(this); //::Create(dc); -//#else - - - /*wxGraphicsContext *gc = wxGraphicsContext::Create(dc); //::Create(dc); - -//#endif - - if (pref["UseAntiAliasing"]) { - gc->SetAntialiasMode(wxANTIALIAS_DEFAULT); - } else { - gc->SetAntialiasMode(wxANTIALIAS_NONE); - } - //gc->SetAntialiasMode(wxANTIALIAS_NONE); - //->SetInterpolationQuality(wxINTERPOLATION_FAST); - - - gc->SetPen( *wxTRANSPARENT_PEN ); - - wxBrush brush( GetBackgroundColour() ); - gc->SetBrush( brush ); - - //gc->SetTextForeground(m_fgColour); - - wxRect r=wxRect(0,0,m_scrX,m_scrY); - - bool fruit=pref["fruitsalad"]; - if (fruit) { - dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); - } else { - gc->DrawRectangle(0,0,m_scrX,m_scrY); - } - -// gc->DrawRectangle(0,0,m_scrX,m_scrY); - //wxLogMessage(wxT("Paint")); - //dc.DrawText(m_title,m_marginLeft,3); - - static wxPen pen(*wxDARK_GREY, 1, wxSOLID); - static wxColor sel(128,128,128,128); - static wxBrush brush2(sel,wxALPHA_TRANSPARENT) ;// *wxTRANSPARENT_BRUSH); //wxFDIAGONAL_HATCH); - - //if (pref["UseAntiAliasing"]) { - //delete dcp; - //} */ event.Skip(); } void gGraphWindow::OnSize(wxSizeEvent& event) @@ -1206,38 +1193,27 @@ gXAxis::gXAxis(const wxColor * col) gXAxis::~gXAxis() { } -void gXAxis::Plot(wxDC & dc, gGraphWindow & w) +void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) { float px,py; - //wxCoord x,y; - - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); int start_px=w.GetLeftMargin(); int start_py=w.GetTopMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); - //wxPen pen=wxPen(*wxBLACK,1,wxSOLID); //color[0] - //dc.SetPen(pen); - //dc.SetFont(*smallfont); - //dc.SetTextForeground(*wxBLACK); - double xx=w.max_x-w.min_x; if (xx==0) return; - //wxDateTime d; + wxString fd; if (xx<1.5) { fd=wxT("00:00:00:0000"); } else { fd=wxT("XX XXX"); } - float x,y;//,descent,leading; - GetTextExtent(fd,x,y); //,&descent,&leading); + float x,y; + GetTextExtent(fd,x,y); double max_ticks=(x+25.0)/width; // y+50 for rotated text double jj=1/max_ticks; double minor_tick=max_ticks*xx; @@ -1275,9 +1251,6 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) //if (min_tick>10) min_tick=10; } - // dc.SetPen(*wxBLACK_PEN); - - //.Clip(start_px-10,start_py+height,width+20,w.GetBottomMargin()); double st3=st; while (st3>w.min_x) { @@ -1297,7 +1270,6 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) glVertex2f(px,py); glVertex2f(px,py-4); glEnd(); - //dc.DrawLine(px,py,px,py+4); } //st=st3; @@ -1336,22 +1308,19 @@ void gXAxis::Plot(wxDC & dc, gGraphWindow & w) glVertex2f(px,py-6); glEnd(); - //dc.DrawLine(px,py,px,py+6); - //dc.DrawLine(px+1,py,px+1,py+6); - GetTextExtent(fd,x,y); //,&descent,&leading); + GetTextExtent(fd,x,y); // There is a wx2.8 bug in wxMSW that screws up calculating x properly. const int offset=0; if (!show_time) { - DrawText(fd, px-(y/2)-2, py-(x/2)-14+offset, 90.0,*wxBLACK,w.texfont); + DrawText(fd, px-(y/2)-2, py-(x/2)-14+offset, 90.0,*wxBLACK); } else { DrawText(fd, px-(x/2), py-14-y); } } - //gc.ResetClip(); } @@ -1369,19 +1338,14 @@ gYAxis::gYAxis(const wxColor * col) gYAxis::~gYAxis() { } -void gYAxis::Plot(wxDC & dc, gGraphWindow &w) +void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) { static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0); static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT); static wxPen pen2(wxDARK_GREY, 1, wxDOT); - wxCoord x,y; //,descent,leading; + float x,y; int labelW=0; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //dc.DrawText(label,0,0); - double miny=w.min_y; double maxy=w.max_y; if (maxy==miny) @@ -1397,12 +1361,8 @@ void gYAxis::Plot(wxDC & dc, gGraphWindow &w) const wxColor & linecol1=*wxLIGHT_GREY; const wxColor & linecol2=wxDARK_GREY; - //dc.SetPen(*wxBLACK_PEN); - dc.SetFont(*smallfont); - dc.SetTextForeground(*wxBLACK); - wxString fd=wxT("0"); - dc.GetTextExtent(fd,&x,&y); //,&descent,&leading); + GetTextExtent(fd,x,y); double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text double max_yticks=1/max_yticksdiv; double yy=w.max_y-w.min_y; @@ -1436,10 +1396,8 @@ void gYAxis::Plot(wxDC & dc, gGraphWindow &w) glVertex2f(start_px-4, h); glVertex2f(start_px, h); glEnd(); - - //dc.DrawLine(start_px-4, h, start_px, h); } - //dc.SetPen(pen1); + glColor4ub(linecol1.Red(),linecol1.Green(),linecol1.Blue(),linecol1.Alpha()); for (double i=w.min_y; ilabelW) labelW=x; h=start_py+ty; DrawText(fd,start_px-8-x,h - (y / 2)); - //dc.SetPen(*wxBLACK_PEN); glColor3f(0,0,0); glBegin(GL_LINES); @@ -1469,8 +1424,6 @@ void gYAxis::Plot(wxDC & dc, gGraphWindow &w) glVertex2f(start_px, h); glEnd(); - //dc.DrawLine(start_px-6,h,start_px,h); - //dc.SetPen(pen2); if (m_show_major_lines && (i > w.min_y)) { glColor4ub(linecol1.Red(),linecol1.Green(),linecol1.Blue(),linecol1.Alpha()); @@ -1478,29 +1431,21 @@ void gYAxis::Plot(wxDC & dc, gGraphWindow &w) glVertex2f(start_px+1, h); glVertex2f(start_px+width, h); glEnd(); - //dc.DrawLine(start_px+1,h,start_px+width,h); } } - //dc.GetTextExtent(w.Title(),&x,&y); - //dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90); } -gGraphTitle::gGraphTitle(const wxString & _title,wxOrientation o,const wxFont * font, const wxColor * color) -:gLayer(NULL),m_title(_title),m_orientation(o),m_font((wxFont*)font),m_color((wxColor *)color) +gGraphTitle::gGraphTitle(const wxString & _title,wxOrientation o, const wxColor * color) +:gLayer(NULL),m_title(_title),m_orientation(o),m_color((wxColor *)color) //m_font((wxFont*)font), { m_textheight=m_textwidth=0; } gGraphTitle::~gGraphTitle() { } -void gGraphTitle::Plot(wxDC & dc, gGraphWindow & w) +void gGraphTitle::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY()-w.GetBottomMargin(); - - dc.SetFont(*m_font); - dc.SetTextForeground(*m_color); wxAlignment m_alignment=wxALIGN_LEFT; @@ -1509,10 +1454,10 @@ void gGraphTitle::Plot(wxDC & dc, gGraphWindow & w) GetTextExtent(m_title,width,height); DrawText(m_title,4,scrx-height,0); } else { - GetTextExtent(m_title,width,height,w.texfont); + GetTextExtent(m_title,width,height); int xp=(height/2)+5; if (m_alignment==wxALIGN_RIGHT) xp=scrx-4-height; - DrawText(m_title,xp,w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)+(height/2),90.0,*wxBLACK,w.texfont); + DrawText(m_title,xp,w.GetBottomMargin()+((scry-w.GetBottomMargin())/2.0)+(height/2),90.0,*wxBLACK); } } @@ -1530,7 +1475,7 @@ gFooBar::gFooBar(const wxColor * col1,const wxColor * col2) gFooBar::~gFooBar() { } -void gFooBar::Plot(wxDC & dc, gGraphWindow & w) +void gFooBar::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; @@ -1539,9 +1484,6 @@ void gFooBar::Plot(wxDC & dc, gGraphWindow & w) if (xx==0) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - int start_px=w.GetLeftMargin(); int width=scrx - (w.GetLeftMargin() + w.GetRightMargin()); int height=scry - (w.GetTopMargin() + w.GetBottomMargin()); @@ -1578,24 +1520,16 @@ gCandleStick::gCandleStick(gPointData *d,wxOrientation o) gCandleStick::~gCandleStick() { } -void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) +void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; if (!data) return; if (!data->IsReady()) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - dc.SetPen( *wxBLACK_PEN ); - dc.SetFont(*smallfont); - dc.SetTextForeground(*wxBLACK); - //wxString label=wxString::Format(wxT("%i %i"),scrx,scry); - //DrawText(label,0,0); - int start_px=w.GetLeftMargin(); - int start_py=w.GetTopMargin(); - int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); - int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); + int start_py=w.GetBottomMargin(); + int width=scrx-(w.GetLeftMargin()+w.GetRightMargin())-1; + int height=scry-(w.GetTopMargin()+w.GetBottomMargin())-1; float sum=0; for (int i=0;inp[0];i++) @@ -1611,23 +1545,18 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) px=start_px; } - wxCoord x,y; - //,descent,leading; - //gc.GetTextExtent(w.Title(),&x,&y,&descent,&leading); - //DrawText(w.Title(),start_px,0); + float x,y; - double t1,t2; + float t1,t2; int barwidth; if (m_direction==wxVERTICAL) { barwidth=width; } else { barwidth=height; } - // int textX, textY; wxString str; for (int i=0;inp[0];i++) { - dc.SetBrush(*wxTRANSPARENT_BRUSH); t1=floor(px); t2=data->point[0][i].m_y*pxr; px+=t2; @@ -1641,22 +1570,37 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) rect=wxRect(t1,start_py,t2,barwidth); dir=wxSOUTH; } - dc.SetPen(*wxBLACK_PEN); - dc.GradientFillLinear(rect,color[i % color.size()],*wxLIGHT_GREY,dir); - dc.DrawRectangle(rect.x,rect.y,rect.width,rect.height); + + const wxColor & col1=color[i % color.size()]; + const wxColor & col2=*wxLIGHT_GREY; + + glBegin(GL_QUADS); + glColor4ub(col1.Red(),col1.Green(),col1.Blue(),col1.Alpha()); + glVertex2f(rect.x, rect.y+height); + glVertex2f(rect.x+rect.width, rect.y+height); + + glColor4ub(col2.Red(),col2.Green(),col2.Blue(),col2.Alpha()); + glVertex2f(rect.x+rect.width, rect.y); + glVertex2f(rect.x, rect.y); + glEnd(); + + wxColor c(0,0,0,255); + LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c); + + str=wxT(""); if ((int)m_names.size()>i) { str=m_names[i]+wxT(" "); } str+=wxString::Format(wxT("%0.1f"),data->point[0][i].m_x); - dc.GetTextExtent(str, &x, &y);//,&descent,&leading); + GetTextExtent(str, x, y); x+=5; if (t2>x) { int j=t1+((t2/2)-(x/2)); if (m_direction==wxVERTICAL) { - DrawText(str,start_px+barwidth+2+y,j,270.0); + DrawText(str,start_px+barwidth+2+y,j,270.0,*wxBLACK); } else { - DrawText(str,j,start_py+(barwidth/2)-(y/2)); + DrawText(str,j,start_py+(barwidth/2)-(y/2)+4); //0,*wxBLACK,texfont); } } @@ -1678,15 +1622,12 @@ gBarChart::~gBarChart() delete Xaxis; } -void gBarChart::Plot(wxDC & dc, gGraphWindow & w) +void gBarChart::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; if (!data) return; if (!data->IsReady()) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); @@ -1718,14 +1659,13 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) int t1,t2; int u1,u2; float textX, textY; - //,descent,leading; + wxString str; bool draw_xticks_instead=false; for (int i=0;inp[0];i++) { if (data->point[0][i].m_x < w.min_x) continue; if (data->point[0][i].m_x >= w.max_x) break; - //dc.SetBrush(*wxTRANSPARENT_BRUSH); t1=px; px+=barwidth+1; t2=px-t1-1; @@ -1761,7 +1701,6 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) wxColor c(0,0,0,255); LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c); - //DrawRectangle(rect.x,rect.y,rect.width,rect.height); str=FormatX(data->point[0][i].m_x); @@ -1771,13 +1710,13 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) if (m_direction==wxVERTICAL) { DrawText(str,start_px-textX-8,j); } else { - DrawText(str,j,start_py-16-(textX/2),90,*wxBLACK,w.texfont); + DrawText(str,j,start_py-16-(textX/2),90,*wxBLACK); } } else draw_xticks_instead=true; } if (draw_xticks_instead) - Xaxis->Plot(dc,w); + Xaxis->Plot(w,scrx,scry); glColor3f (0.1F, 0.1F, 0.1F); glLineWidth (1); @@ -1804,15 +1743,13 @@ gLineChart::~gLineChart() } // Time Domain Line Chart -void gLineChart::Plot(wxDC & dc, gGraphWindow & w) +void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; if (!data) return; if (!data->IsReady()) return; - int scrx = w.GetScrX(), scry = w.GetScrY(); - int start_px=w.GetLeftMargin(), start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); @@ -1846,8 +1783,8 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) if (m_report_empty) { wxString msg=_("No Waveform Available"); float x,y; //,descent,leading; - GetTextExtent(msg,x,y,largefont);//,&descent,&leading); - DrawText(msg,start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0),0,*wxDARK_GREY,largefont); + GetTextExtent(msg,x,y); //,largefont);//,&descent,&leading); + DrawText(msg,start_px+(width/2.0)-(x/2.0),start_py+(height/2.0)-(y/2.0),0,*wxDARK_GREY); //,largefont); } return; } @@ -1860,7 +1797,6 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) // Selected the plot line color glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); - // Crop to inside the margins. glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); glEnable(GL_SCISSOR_TEST); @@ -1991,15 +1927,12 @@ gLineOverlayBar::~gLineOverlayBar() { } -void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) +void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; if (!data) return; if (!data->IsReady()) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); @@ -2107,7 +2040,7 @@ gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _li gFlagsLine::~gFlagsLine() { } -void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w) +void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) { if (!m_visible) return; if (!data) return; @@ -2116,9 +2049,6 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w) double xx=w.max_x-w.min_x; if (xx<=0) return; - int scrx = w.GetScrX(); - int scry = w.GetScrY(); - int start_px=w.GetLeftMargin(); int start_py=w.GetBottomMargin(); int width=scrx-(w.GetLeftMargin()+w.GetRightMargin()); diff --git a/src/graphs/graph.h b/src/graphs/graph.h index 4371a3df..59dfb7a0 100644 --- a/src/graphs/graph.h +++ b/src/graphs/graph.h @@ -9,7 +9,7 @@ License: LGPL #include #include -#include +//#include #include #include @@ -215,7 +215,9 @@ class gGraphWindow:public wxGLCanvas //Window // rename to gGraphWindow return min_y+(yy*hh); }; - virtual void Update(); + void Render(float scrx,float scry); + + //virtual void Update(); //virtual void Update(); void AddLayer(gLayer *l); @@ -228,7 +230,7 @@ class gGraphWindow:public wxGLCanvas //Window // rename to gGraphWindow void SetBlockMove(bool b) { m_block_move=b; }; wxGLContext *gl_context; - FTFont *texfont; + //FTFont *texfont; protected: listlink_zoom; @@ -267,7 +269,7 @@ class gLayer gLayer(gPointData *g=NULL,wxString title=wxT("")); virtual ~gLayer(); //virtual void Update() { data=gd; }; - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); vector color; virtual void SetData(gPointData * gd) { data=gd; }; @@ -336,16 +338,16 @@ class gLayer class gGraphTitle:public gLayer { public: - gGraphTitle(const wxString & _title,wxOrientation o=wxVERTICAL,const wxFont * font=wxNORMAL_FONT,const wxColor * color=wxBLACK); + gGraphTitle(const wxString & _title,wxOrientation o=wxVERTICAL,const wxColor * color=wxBLACK); virtual ~gGraphTitle(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); wxOrientation Orientation() { return m_orientation; }; static const int Margin=20; protected: wxString m_title; wxOrientation m_orientation; - wxFont *m_font; + //wxFont *m_font; wxColor *m_color; wxCoord m_textheight,m_textwidth; }; @@ -356,7 +358,7 @@ class gCandleStick:public gLayer gCandleStick(gPointData *d=NULL,wxOrientation o=wxHORIZONTAL); virtual ~gCandleStick(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); void AddName(wxString name) { m_names.push_back(name); }; protected: @@ -370,7 +372,7 @@ class gXAxis:public gLayer public: gXAxis(const wxColor * col=wxBLACK); virtual ~gXAxis(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); static const int Margin=40; // How much room does this take up. (Bottom margin) protected: // virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; }; @@ -380,7 +382,7 @@ class gYAxis:public gLayer public: gYAxis(const wxColor * col=wxBLACK); virtual ~gYAxis(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); void SetShowMinorLines(bool b) { m_show_minor_lines=b; }; void SetShowMajorLines(bool b) { m_show_major_lines=b; }; bool ShowMinorLines() { return m_show_minor_lines; }; @@ -397,7 +399,7 @@ class gFooBar:public gLayer public: gFooBar(const wxColor * color1=wxGREEN,const wxColor * color2=wxDARK_GREY); virtual ~gFooBar(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); static const int Margin=15; protected: }; @@ -409,7 +411,7 @@ class gLineChart:public gLayer gLineChart(gPointData *d=NULL,const wxColor * col=wxBLACK,int dlsize=4096,bool accelerate=false,bool _hide_axes=false,bool _square_plot=false); virtual ~gLineChart(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); void SetSquarePlot(bool b) { m_square_plot=b; }; bool GetSquarePlot() { return m_square_plot; }; @@ -435,7 +437,7 @@ class gLineOverlayBar:public gLayer gLineOverlayBar(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT(""),LO_Type _lot=LOT_Bar); virtual ~gLineOverlayBar(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); protected: wxString label; @@ -448,7 +450,7 @@ class gFlagsLine:public gLayer gFlagsLine(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT(""),int _line_num=0,int _total_lines=0); virtual ~gFlagsLine(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); protected: wxString label; @@ -462,7 +464,7 @@ class gBarChart:public gLayer gBarChart(gPointData *d=NULL,const wxColor *col=NULL,wxOrientation o=wxHORIZONTAL); virtual ~gBarChart(); - virtual void Plot(wxDC & dc, gGraphWindow & w); + virtual void Plot(gGraphWindow & w,float scrx,float scry); protected: wxOrientation m_direction; diff --git a/src/libs/freetype-gl/README b/src/libs/freetype-gl/README new file mode 100644 index 00000000..6dfc84ac --- /dev/null +++ b/src/libs/freetype-gl/README @@ -0,0 +1,39 @@ +Freetype GL - A C OpenGL Freetype engine +======================================== + +This code intends to show how to display fonts efficiently using regular C, +Freetype and OpenGL. The idea is to use a single texture and a single vertex +buffer. The code is fairly simple and organized as follow: + +texture-atlas: This structure is responsible for the packing of small regions + into a bigger texture. It is based on the skyline bottom left + algorithm which appear to be well suited for storing glyphs. + + More information at: + http://clb.demon.fi/files/RectangleBinPack.pdf + +vector: This structure loosely mimics the std::vector class from c++. It + is used by texture-atlas (for storing nodes), texture-font (for + storing glyphs) and font-manager (for storing fonts). + + More information at: + http://www.cppreference.com/wiki/container/vector/start + + +texture-font: The texture-font structure is in charge of creating bitmap + glyphs and to upload them to the texture atlas. + + +texture-glyph: Simple structure that described a texture glyph (position within + texture, advance, kerning, ...) + +text-markup: Simple structure that describes text properties (font family, + font size, colors, underline, etc.) + +font-manager: Structure in charge of caching fonts. + +vertex-buffer: Generic vertex buffer structure inspired by pyglet (python). + + More information at: + http://www.pyglet.org + diff --git a/src/libs/freetype-gl/font-manager.cpp b/src/libs/freetype-gl/font-manager.cpp new file mode 100644 index 00000000..f193a23f --- /dev/null +++ b/src/libs/freetype-gl/font-manager.cpp @@ -0,0 +1,166 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ + + +#include +#include +#include +#include +#include +#include "font-manager.h" + + +wchar_t * +wcsdup( const wchar_t *string ) +{ + wchar_t * result; + assert( string ); + result = (wchar_t *) malloc( (wcslen(string) + 1) * sizeof(wchar_t) ); + wcscpy( result, string ); + return result; +} + +FontManager *manager_instance=NULL; + +FontManager::FontManager() +{ + m_atlas = new TextureAtlas(512, 512); + m_fonts.clear(); + m_cache = wcsdup( L" " ); +/* + self->cache = wcsdup( L" !\"#$%&'()*+,-./0123456789:;<=>?" + L"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + L"`abcdefghijklmnopqrstuvwxyz{|}~" ); +*/ +} + +FontManager::~FontManager() +{ + for (vector::iterator f=m_fonts.begin();f!=m_fonts.end();f++) { + delete *f; + } + delete m_atlas; + + if (m_cache) { + free(m_cache); + } +} + +TextureFont * FontManager::GetFromFilename(const wxString & filename, const float size) +{ + size_t i; + TextureFont *font; + + for (i=0; im_filename == filename)) && (font->m_size == size)) { + return font; + } + } + font = new TextureFont(m_atlas,filename, size); + + if (font) { + font->CacheGlyphs(m_cache); + m_fonts.push_back(font); + return font; + } + return NULL; +} + + +TextureFont * FontManager::GetFromDescription(const wxString & family, const float size, const int bold, const int italic) +{ + TextureFont *font; + wxString filename=MatchDescription(family, size, bold, italic); + + if (filename.IsEmpty()) { + return NULL; + } + font = GetFromFilename(filename, size); + return font; +} + +TextureFont * FontManager::GetFromMarkup(const TextMarkup *markup) +{ + assert( markup ); + + return GetFromDescription(markup->family, markup->size, markup->bold, markup->italic ); +} + + +const wxString & FontManager::MatchDescription(const wxString & family, const float size, const int bold, const int italic) +{ + static wxString filename=wxEmptyString; + int weight = FC_WEIGHT_REGULAR; + int slant = FC_SLANT_ROMAN; + if (bold) { + weight = FC_WEIGHT_BOLD; + } + if (italic) { + slant = FC_SLANT_ITALIC; + } + FcInit(); + FcPattern *pattern = FcPatternCreate(); + FcPatternAddDouble(pattern, FC_SIZE, size); + FcPatternAddInteger(pattern, FC_WEIGHT, weight); + FcPatternAddInteger(pattern, FC_SLANT, slant); + + char *t=strdup(family.mb_str()); + FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)t); + free(t); + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + FcResult result; + FcPattern *match = FcFontMatch(0, pattern, &result); + FcPatternDestroy(pattern); + + if (!match ) { + wxLogError(wxT("fontconfig error: Could not match family '")+family+wxT("'")); + return filename; + } else { + FcValue value; + FcResult result = FcPatternGet(match, FC_FILE, 0, &value); + if (result) { + wxLogError(wxT("fontconfig error: Could not match family '")+family+wxT("'")); + } else { + filename = wxString((char *)(value.u.s),wxConvUTF8); + } + } + FcPatternDestroy(match); + return filename; +} + +const wchar_t * FontManager::GetCache() +{ + return m_cache; +} + +void FontManager::SetCache(const wchar_t * cache) +{ + assert( cache ); + + if (m_cache) { + free(m_cache); + } + m_cache=wcsdup(cache); +} diff --git a/src/libs/freetype-gl/font-manager.h b/src/libs/freetype-gl/font-manager.h new file mode 100644 index 00000000..72393d65 --- /dev/null +++ b/src/libs/freetype-gl/font-manager.h @@ -0,0 +1,50 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#ifndef __FONT_MANAGER_H__ +#define __FONT_MANAGER_H__ + +#include +#include "text-markup.h" +#include "texture-font.h" +#include "texture-atlas.h" + + +class FontManager { +public: + FontManager(); + ~FontManager(); + TextureFont * GetFromFilename(const wxString & filename, const float size); + TextureFont * GetFromDescription(const wxString & family, const float size, const int bold, const int italic); + TextureFont * GetFromMarkup(const TextMarkup * markup); + const wxString & MatchDescription(const wxString & family, const float size, const int bold, const int italic); + + const wchar_t * GetCache(); + void SetCache(const wchar_t *cache); + + TextureAtlas * m_atlas; + vector m_fonts; + wchar_t * m_cache; +}; + +#endif /* __FONT_MANAGER_H__ */ + diff --git a/src/libs/freetype-gl/text-markup.cpp b/src/libs/freetype-gl/text-markup.cpp new file mode 100644 index 00000000..ba4ea6bd --- /dev/null +++ b/src/libs/freetype-gl/text-markup.cpp @@ -0,0 +1,56 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#include +#include +#include +#include "font-manager.h" +#include "text-markup.h" + +TextMarkup::TextMarkup() +{ + wxColor black(0,0,0,255); + wxColor white(255,255,255,255); + + + family = wxString("monotype"); + italic = 0; + bold = 0; + size = 16; + rise = 0; + spacing= 0; + + foreground_color = black; + background_color = white; + underline = 0; + underline_color = black; + overline = 0; + overline_color = black; + strikethrough = 0; + strikethrough_color = black; +} + +TextMarkup::~TextMarkup() +{ +} + + diff --git a/src/libs/freetype-gl/text-markup.h b/src/libs/freetype-gl/text-markup.h new file mode 100644 index 00000000..11403470 --- /dev/null +++ b/src/libs/freetype-gl/text-markup.h @@ -0,0 +1,85 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#ifndef __TEXT_MARKUP_H__ +#define __TEXT_MARKUP_H__ + +#include + + +class TextMarkup { +public: + TextMarkup(); + ~TextMarkup(); + const wxString & GetFamily() { return family; }; + void SetFamily(wxString fam) { family=fam; }; + int GetItalic() { return italic; }; + void SetItalic(int i) { italic=i; }; + int GetBold() { return bold; }; + void SetBold(int i) { bold=i; }; + float GetSize() { return size; }; + void SetSize(float f) { size=f; }; + float GetRise() { return rise; }; + void SetRise(float f) { rise=f; }; + float GetSpacing() { return spacing; }; + void SetSpacing(float f) { spacing=f; }; + wxColor GetForegroundColor() { return foreground_color; }; + void SetForegroundColor(wxColor c) { foreground_color=c; }; + wxColor GetBackgroundColor() { return background_color; }; + void SetBackgroundColor(wxColor c) { background_color=c; }; + int GetOutline() { return outline; }; + void SetOutline(int i) { outline=i; }; + wxColor GetOutlineColor() { return outline_color; }; + void SetOutlineColor(wxColor c) { outline_color=c; }; + int GetUnderline() { return underline; }; + void SetUnderline(int i) { underline=i; }; + wxColor GetUnderlineColor() { return underline_color; }; + void SetUnderlineColor(wxColor c) { underline_color=c; }; + int GetOverline() { return overline; }; + void SetOverline(int i) { overline=i; }; + wxColor GetOverlineColor() { return overline_color; }; + void SetOverlineColor(wxColor c) { overline_color=c; }; + int GetStrikethrough() { return strikethrough; }; + void SetStrikethrough(int i) { strikethrough=i; }; + wxColor GetStrikethroughColor() { return strikethrough_color; }; + void SetStrikethroughColor(wxColor c) { strikethrough_color=c; }; + + + wxString family; + float size; + int bold; + int italic; + float rise; + float spacing; + wxColor foreground_color; + wxColor background_color; + int outline; + wxColor outline_color; + int underline; + wxColor underline_color; + int overline; + wxColor overline_color; + int strikethrough; + wxColor strikethrough_color; +}; + +#endif /* __TEXT_MARKUP_H__ */ diff --git a/src/libs/freetype-gl/texture-atlas.cpp b/src/libs/freetype-gl/texture-atlas.cpp new file mode 100644 index 00000000..eab2251c --- /dev/null +++ b/src/libs/freetype-gl/texture-atlas.cpp @@ -0,0 +1,217 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#if defined(__APPLE__) + #include +#else + #include +#endif +//#include +#include +#include "texture-atlas.h" + +#define max(a,b) (a)>(b)?(a):(b) +#define min(a,b) (a)<(b)?(a):(b) + + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +TextureAtlas::TextureAtlas(int width, int height) +:m_used(0),m_width(width),m_height(height),m_texid(0) +{ + Node *node=new Node(0,0,m_width); + m_nodes.push_back(node); + m_data = (unsigned char *) calloc(m_width * m_height, sizeof(unsigned char)); + // Think I have to use calloc here.. + //data=new unsigned char [width*height]; +} + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +TextureAtlas::~TextureAtlas() +{ + if (m_texid) { + glDeleteTextures(1, &m_texid); + } + + // delete [] data; + free(m_data); + for (vector::iterator n=m_nodes.begin();n!=m_nodes.end();n++) { + delete *n; + } +} + + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +void TextureAtlas::Upload() +{ + if (!m_texid) { + glGenTextures( 1, &m_texid ); + } + glBindTexture(GL_TEXTURE_2D, m_texid ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, m_width, m_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, m_data ); +} + + + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +void TextureAtlas::SetRegion(int x, int y, int width, int height, unsigned char *data, int stride) +{ + assert( x < m_width); + assert( (x + width) <= m_width); + assert( y < m_height); + assert( (y + height) <= m_height); + size_t i; + size_t charsize = sizeof(char); + + for (i=0; ix, y, width_left = width; + size_t i = index; + + if ((x + width) > m_width) { + return -1; + } + y = node->y; + + while (width_left > 0) { + node = m_nodes[i]; + y = max( y, node->y ); + if ((y + height) > m_height) { + return -1; + } + width_left -= node->width; + ++i; + } + return y; +} + + + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +void TextureAtlas::Merge() +{ + Node *node, *next; + int i; + + for (i=0; iy == next->y) { + node->width += next->width; + int j=i+1; + m_nodes.erase(m_nodes.begin()+(i+1)); + --i; + } + } +} + + + +/* ========================================================================= */ +/* */ +/* ========================================================================= */ +wxRect TextureAtlas::GetRegion(int width, int height) +{ + int y, best_height, best_width, best_index; + Node *node, *prev; + wxRect region(0,0,width,height); + + size_t i; + + best_height = INT_MAX; + best_index = -1; + best_width = INT_MAX; + + for (i=0; i= 0) { + node = m_nodes[i]; + if ((y + height < best_height) || (y + height == best_height && node->width < best_width)) { + best_height = y + height; + best_index = i; + best_width = node->width; + region.x = node->x; + region.y = y; + } + } + } + + if (best_index == -1) { + region.x = -1; + region.y = -1; + region.width = 0; + region.height = 0; + return region; + } + + node = new Node(region.x,region.y+height,width); + m_nodes.insert(m_nodes.begin()+best_index,node); + + for(i = best_index+1; i < m_nodes.size(); ++i) { + node = m_nodes[i]; + prev = m_nodes[i-1]; + + if (node->x < (prev->x + prev->width)) { + int shrink = prev->x + prev->width - node->x; + node->x += shrink; + node->width -= shrink; + if (node->width <= 0) { + m_nodes.erase(m_nodes.begin()+i); + --i; + } else { + break; + } + } else { + break; + } + } + Merge(); + m_used += width * height; + return region; +} diff --git a/src/libs/freetype-gl/texture-atlas.h b/src/libs/freetype-gl/texture-atlas.h new file mode 100644 index 00000000..bf89d78b --- /dev/null +++ b/src/libs/freetype-gl/texture-atlas.h @@ -0,0 +1,66 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= + + This source is based on the article by Jukka Jylänki : + "A Thousand Ways to Pack the Bin - A Practical Approach to + Two-Dimensional Rectangle Bin Packing", February 27, 2010. + + More precisely, this is an implementation of the Skyline Bottom-Left + algorithm based on C++ sources provided by Jukka Jylänki at: + http://clb.demon.fi/files/RectangleBinPack/ + + ========================================================================= */ +#ifndef __TEXTURE_ATLAS_H__ +#define __TEXTURE_ATLAS_H__ + +#include +#include + +using namespace std; + +struct Node { + Node(int _x,int _y,int _width) { x=_x; y=_y; width=_width; }; + int x, y, width; +}; + +class TextureAtlas { +public: + TextureAtlas(int width, int height); + ~TextureAtlas(); + void Upload(); + wxRect GetRegion(int width, int height); + void SetRegion(int x, int y, int width, int height, unsigned char *data, int stride); + + int m_width, m_height, m_used; + + int Fit(int index, int width, int height); + void Merge(); + + vector m_nodes; + unsigned int m_texid; + unsigned char *m_data; +}; + + + +#endif /* __TEXTURE_ATLAS_H__ */ diff --git a/src/libs/freetype-gl/texture-font.cpp b/src/libs/freetype-gl/texture-font.cpp new file mode 100644 index 00000000..fe7a1ff5 --- /dev/null +++ b/src/libs/freetype-gl/texture-font.cpp @@ -0,0 +1,264 @@ +/* ========================================================================= + * Freetype GL - An ansi C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://www.loria.fr/~rougier/freetype-gl + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#include +#include FT_FREETYPE_H +#include +#include +#include +#include +#include +#include +#include "texture-font.h" + +#undef __FTERRORS_H__ +#define FT_ERRORDEF( e, v, s ) { e, s }, +#define FT_ERROR_START_LIST { +#define FT_ERROR_END_LIST { 0, 0 } }; +const struct { + int code; + const char* message; +} FT_Errors[] = +#include FT_ERRORS_H + +TextureFont::TextureFont(TextureAtlas * atlas,const wxString & filename, const float size) +:m_atlas(atlas),m_filename(filename),m_size(size),m_gamma(1.5) +{ +} + +TextureFont::~TextureFont() +{ + for (vector::iterator g=m_glyphs.begin();g!=m_glyphs.end();g++) { + delete *g; + } +} + +void TextureFont::GenerateKerning() +{ + size_t i, j, k, count; + FT_Library library; + FT_Face face; + FT_UInt glyph_index, prev_index; + TextureGlyph *glyph, *prev_glyph; + FT_Vector kerning; + + if (!LoadFace(&library, m_filename, m_size, &face)) { + return; + } + + for( i=0; im_kerning) { + free(glyph->m_kerning); + glyph->m_kerning = 0; + glyph->m_kerning_count = 0; + } + + // Count how many kerning pairs we need + count = 0; + glyph_index = FT_Get_Char_Index(face, glyph->m_charcode); + for (j=0; jm_charcode); + FT_Get_Kerning(face, prev_index, glyph_index, FT_KERNING_UNSCALED, &kerning); + if (kerning.x != 0.0) { + count++; + } + } + + // No kerning necessary + if (!count) { + continue; + } + // Store kerning pairs + glyph->m_kerning = (KerningPair *) malloc(count * sizeof(KerningPair)); + glyph->m_kerning_count = count; + k = 0; + for (j=0; jm_charcode); + FT_Get_Kerning(face, prev_index, glyph_index, FT_KERNING_UNSCALED, &kerning); + if (kerning.x != 0.0) { + glyph->m_kerning[k].charcode = prev_glyph->m_charcode; + glyph->m_kerning[k].kerning = kerning.x / 64.0f; + ++k; + } + } + } + + FT_Done_FreeType( library ); +} + + + +// ------------------------------------------------------------------------- +int TextureFont::CacheGlyphs(wchar_t * charcodes) +{ + size_t i, x, y, width, height; + FT_Library library; + FT_Error error; + FT_Face face; + FT_GlyphSlot slot; + FT_UInt glyph_index; + TextureGlyph *glyph; + wxRect region; + unsigned char c; + size_t missed = 0; + width = m_atlas->m_width; + height = m_atlas->m_height; + + if (!LoadFace( &library, m_filename, m_size, &face)){ + return wcslen(charcodes); + } + + // Load each glyph + for (i=0; iglyph; + + // Gamma correction (sort of) + for( x=0; xbitmap.width; ++x ) { + for( y=0; ybitmap.rows; ++y ){ + c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ); + c = (unsigned char) ( pow(c/255.0, m_gamma) * 255); + *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c; + } + } + region = m_atlas->GetRegion(slot->bitmap.width, slot->bitmap.rows); + if (region.x < 0) { + missed++; + continue; + } + m_atlas->SetRegion(region.x, region.y, slot->bitmap.width, slot->bitmap.rows, slot->bitmap.buffer, slot->bitmap.pitch ); + + glyph = new TextureGlyph(); + glyph->m_charcode = charcodes[i]; + glyph->m_kerning = 0; + glyph->m_width = slot->bitmap.width; + glyph->m_height = slot->bitmap.rows; + glyph->m_offset_x = slot->bitmap_left; + glyph->m_offset_y = slot->bitmap_top; + glyph->m_u0 = region.x/(float)width; + glyph->m_v0 = region.y/(float)height; + glyph->m_u1 = (region.x + glyph->m_width)/(float)width; + glyph->m_v1 = (region.y + glyph->m_height)/(float)height; + + // Discard hinting to get advance + FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER | FT_LOAD_NO_HINTING); + slot = face->glyph; + glyph->m_advance_x = slot->advance.x/64.0; + glyph->m_advance_y = slot->advance.y/64.0; + + m_glyphs.push_back(glyph); + } + FT_Done_FreeType( library ); + m_atlas->Upload(); + GenerateKerning(); + return missed; +} + +// ------------------------------------------------------------------------- +TextureGlyph * TextureFont::GetGlyph(wchar_t charcode) +{ + size_t i; + static wchar_t *buffer = 0; + TextureGlyph *glyph; + + assert(m_atlas); + + // Check if charcode has been already loaded + for (i=0; im_charcode == charcode) { + return glyph; + } + } + + // If not, load it + if (!buffer) { + buffer = (wchar_t *)calloc( 2, sizeof(wchar_t)); + } + buffer[0] = charcode; + + if (CacheGlyphs(buffer )==0) { + return *(m_glyphs.rbegin()); + } + return NULL; +} + + + +// ------------------------------------------------------------------------- +int TextureFont::LoadFace(FT_Library * library, const wxString & filename, const float size, FT_Face * face) +{ + size_t hres = 1; + FT_Error error; + FT_Matrix matrix = { (int)((1.0/hres) * 0x10000L), + (int)((0.0) * 0x10000L), + (int)((0.0) * 0x10000L), + (int)((1.0) * 0x10000L) }; + + // Initialize library + error = FT_Init_FreeType( library ); + if (error) + { + wxLogError(wxString::Format(wxT("FT_Error (code 0x%02x) : "),FT_Errors[error].code)+wxString(FT_Errors[error].message,wxConvUTF8)); + return 0; + } + + // Load face + error = FT_New_Face( *library, filename.mb_str(), 0, face ); + if (error) { + wxLogError(wxString::Format(wxT("FT_Error (line%d, code 0x%02x) : "),__LINE__,FT_Errors[error].code)+wxString(FT_Errors[error].message,wxConvUTF8)); + FT_Done_FreeType(*library); + return 0; + } + + // Select charmap + error = FT_Select_Charmap( *face, FT_ENCODING_UNICODE ); + if (error) { + wxLogError(wxString::Format(wxT("FT_Error (line%d, code 0x%02x) : "),__LINE__,FT_Errors[error].code)+wxString(FT_Errors[error].message,wxConvUTF8)); + FT_Done_FreeType( *library ); + return 0; + } + + // Set char size + error=FT_Set_Char_Size( *face, size*64, 0, 72*hres, 72 ); + // error = FT_Set_Char_Size( *face, size*64, 0, 72, 72 ); + if (error) { + wxLogError(wxString::Format(wxT("FT_Error (line%d, code 0x%02x) : "),__LINE__,FT_Errors[error].code)+wxString(FT_Errors[error].message,wxConvUTF8)); + FT_Done_FreeType( *library ); + return 0; + } + + // Set transform matrix + FT_Set_Transform(*face, &matrix, NULL); + + return 1; +} + diff --git a/src/libs/freetype-gl/texture-font.h b/src/libs/freetype-gl/texture-font.h new file mode 100644 index 00000000..f47a0911 --- /dev/null +++ b/src/libs/freetype-gl/texture-font.h @@ -0,0 +1,54 @@ +// ============================================================================ +// Freetype GL - An ansi C OpenGL Freetype engine +// Platform: Any +// API version: 1.0 +// WWW: http://www.loria.fr/~rougier/freetype-gl +// C++ Conversion by Mark Watkins +// ---------------------------------------------------------------------------- +// Copyright (c) 2011 Nicolas P. Rougier +// +// This program is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 3 of the License, or (at your +// option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +// Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program. If not, see . +// ============================================================================ +#ifndef __TEXTURE_FONT_H__ +#define __TEXTURE_FONT_H__ +#include +#include FT_FREETYPE_H +#include "vector.h" +#include "texture-atlas.h" +#include "texture-glyph.h" + + +class TextureFont { +public: + TextureFont(TextureAtlas *,const wxString & filename, const float size); + virtual ~TextureFont(); + + TextureGlyph * GetGlyph(wchar_t charcode); + int CacheGlyphs(wchar_t * charcodes); + int LoadFace(FT_Library *library, const wxString & filename, const float size, FT_Face * face); + + void GenerateKerning(); + + vector m_glyphs; + TextureAtlas * m_atlas; + wxString m_filename; + int m_bold; + int m_italic; + float m_size; + float m_gamma; +}; + + +#endif /* __TEXTURE_FONT_H__ */ + diff --git a/src/libs/freetype-gl/texture-glyph.cpp b/src/libs/freetype-gl/texture-glyph.cpp new file mode 100644 index 00000000..97ecfe80 --- /dev/null +++ b/src/libs/freetype-gl/texture-glyph.cpp @@ -0,0 +1,123 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#if defined(__APPLE__) + #include +#else + #include +#endif +#include +#include +#include "texture-glyph.h" + + + +TextureGlyph::TextureGlyph() +:m_width(0),m_height(0),m_offset_x(0),m_offset_y(0),m_advance_x(0),m_advance_y(0) +{ + m_u0=m_v0=m_u1=m_v1 = 0.0; +} + +TextureGlyph::~TextureGlyph() +{ +} + +void TextureGlyph::Render(TextMarkup *markup, Pen *pen) +{ + int x = pen->x + m_offset_x; + int y = pen->y + m_offset_y + markup->rise; + int w = m_width; + int h = m_height; + + float u0 = m_u0; + float v0 = m_v0; + float u1 = m_u1; + float v1 = m_v1; + + glBegin( GL_TRIANGLES ); + { + glTexCoord2f(u0, v0); glVertex2i(x, y); + glTexCoord2f(u0, v1); glVertex2i(x, y-h); + glTexCoord2f(u1, v1); glVertex2i(x+w, y-h); + + glTexCoord2f(u0, v0); glVertex2i(x, y); + glTexCoord2f(u1, v1); glVertex2i(x+w, y-h); + glTexCoord2f(u1, v0); glVertex2i(x+w, y); + } + glEnd(); + + pen->x += m_advance_x + markup->spacing; + pen->y += m_advance_y; +} + + +void TextureGlyph::AddToVertexBuffer(VertexBuffer *buffer, const TextMarkup *markup, Pen *pen) +{ + size_t i; + int x0 = pen->x + m_offset_x; + int y0 = pen->y + m_offset_y + markup->rise; + int x1 = x0 + m_width; + int y1 = y0 - m_height; + float u0 = m_u0; + float v0 = m_v0; + float u1 = m_u1; + float v1 = m_v1; + + GLuint index = buffer->vertices->size; + GLuint indices[] = {index, index+1, index+2, + index, index+2, index+3}; + + TextureGlyphVertex vertices[] = { { x0,y0,0, u0,v0, 0,0,0,1 }, + { x0,y1,0, u0,v1, 0,0,0,1 }, + { x1,y1,0, u1,v1, 0,0,0,1 }, + { x1,y0,0, u1,v0, 0,0,0,1 } }; + if (markup) { + for (i=0; i<4; ++i) { + vertices[i].r = markup->foreground_color.Red()/256.0; + vertices[i].g = markup->foreground_color.Green()/256.0; + vertices[i].b = markup->foreground_color.Blue()/256.0; + vertices[i].a = markup->foreground_color.Alpha()/256.0; + } + } + buffer->PushBackIndices(indices, 6); + buffer->PushBackVertices(vertices, 4); + + pen->x += m_advance_x + markup->spacing; + pen->y += m_advance_y; +} + +float TextureGlyph::GetKerning(wchar_t charcode) +{ + size_t i; + + if (!m_kerning ) { + return 0; + } + + for (i=0; i + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#ifndef __TEXTURE_GLYPH_H__ +#define __TEXTURE_GLYPH_H__ + +#include +#include "text-markup.h" +#include "vertex-buffer.h" + +typedef struct { + wchar_t charcode; + float kerning; +} KerningPair; + +typedef struct { + float x,y; +} Pen; + +typedef struct { + int x, y, z; + float u, v; + float r, g, b, a; +} TextureGlyphVertex; + + +class TextureGlyph { +public: + TextureGlyph(); + ~TextureGlyph(); + void Render(TextMarkup * markup, Pen * pen ); + void AddToVertexBuffer( VertexBuffer * buffer, const TextMarkup * markup, Pen * pen ); + float GetKerning(wchar_t charcode); + + wchar_t m_charcode; + int m_width, m_height; + int m_offset_x, m_offset_y; + int m_advance_x, m_advance_y; + float m_u0, m_v0, m_u1, m_v1; + KerningPair * m_kerning; + size_t m_kerning_count; +}; + + +#endif /* __TEXTURE_GLYPH_H__ */ diff --git a/src/libs/freetype-gl/vector.cpp b/src/libs/freetype-gl/vector.cpp new file mode 100644 index 00000000..2d426495 --- /dev/null +++ b/src/libs/freetype-gl/vector.cpp @@ -0,0 +1,326 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#include +#include +#include +#include +#include "freetype-gl/vector.h" + +Vector * +vector_new( size_t item_size ) +{ + assert( item_size ); + + Vector *self = (Vector *) malloc( sizeof(Vector) ); + if( !self ) + { + return NULL; + } + self->item_size = item_size; + self->size = 0; + self->capacity = 1; + self->items = malloc( self->item_size * self->capacity ); + return self; +} + + + +void +vector_delete( Vector *self ) +{ + assert( self ); + free( self->items ); + free( self ); +} + + + +const void * +vector_get( const Vector *self, + size_t index ) +{ + assert( self ); + assert( self->size ); + assert( index < self->size ); + return self->items + index * self->item_size; +} + + + +const void * +vector_front( const Vector *self ) +{ + assert( self ); + assert( self->size ); + return vector_get( self, 0 ); +} + + + +const void * +vector_back( const Vector *self ) +{ + assert( self ); + assert( self->size ); + return vector_get( self, self->size-1 ); +} + + + +int +vector_contains( const Vector *self, + const void *item, + int (*cmp)(const void *, const void *) ) +{ + size_t i; + assert( self ); + for( i=0; isize; ++i ) + { + if( (*cmp)(item, vector_get(self,i) ) == 0 ) + { + return 1; + } + } + return 0; +} + + + +int +vector_empty( const Vector *self ) +{ + assert( self ); + return self->size == 0; +} + + + +size_t +vector_size( const Vector *self ) +{ + assert( self ); + return self->size; +} + + + +void +vector_reserve( Vector *self, + const size_t size ) +{ + assert( self ); + if( self->capacity < size); + { + self->items = realloc( self->items, size * self->item_size ); + self->capacity = size; + } +} + + + +size_t +vector_capacity( const Vector *self ) +{ + assert( self ); + return self->capacity; +} + + + +void +vector_shrink( Vector *self ) +{ + assert( self ); + if( self->capacity > self->size ) + { + self->items = realloc( self->items, self->size * self->item_size ); + } + self->capacity = self->size; +} + + + +void +vector_clear( Vector *self ) +{ + assert( self ); + self->size = 0; +} + + +void +vector_set( Vector *self, + const size_t index, + const void *item ) +{ + assert( self ); + assert( self->size ); + assert( index < self->size ); + memcpy( self->items + index * self->item_size, + item, self->item_size ); +} + + + +void +vector_insert( Vector *self, + const size_t index, + const void *item ) +{ + assert( self ); + assert( index <= self->size); + + if( self->capacity <= self->size ) + { + vector_reserve(self, 2 * self->capacity ); + } + if( index < self->size ) + { + memmove( self->items + (index + 1) * self->item_size, + self->items + (index + 0) * self->item_size, + (self->size - index) * self->item_size); + } + self->size++; + vector_set( self, index, item ); +} + + + +void +vector_erase_range( Vector *self, + const size_t first, + const size_t last ) +{ + assert( self ); + assert( first < self->size ); + assert( last < self->size+1 ); + assert( first < last ); + memmove( self->items + first * self->item_size, + self->items + last * self->item_size, + (self->size - last) * self->item_size); + self->size -= (last-first); +} + + + +void +vector_erase( Vector *self, + const size_t index ) +{ + assert( self ); + assert( index < self->size ); + + vector_erase_range( self, index, index+1 ); +} + + + +void +vector_push_back( Vector *self, + const void *item ) +{ + vector_insert( self, self->size, item ); +} + + + +void +vector_pop_back( Vector *self ) +{ + assert( self ); + assert( self->size ); + self->size--; +} + + + +void +vector_resize( Vector *self, + const size_t size ) +{ + assert( self ); + if( size > self->capacity) + { + vector_reserve( self, size ); + self->size = self->capacity; + } + else + { + self->size = size; + } +} + + + +void +vector_push_back_data( Vector *self, + const void * data, + const size_t count ) +{ + assert( self ); + assert( data ); + assert( count ); + + if( self->capacity < (self->size+count) ) + { + vector_reserve(self, self->size+count); + } + memmove( self->items + self->size * self->item_size, data, + count*self->item_size ); + self->size += count; +} + + + +void +vector_insert_data( Vector *self, + const size_t index, + const void * data, + const size_t count ) +{ + assert( self ); + assert( index < self->size ); + assert( data ); + assert( count ); + + if( self->capacity < (self->size+count) ) + { + vector_reserve(self, self->size+count); + } + memmove( self->items + (index + count ) * self->item_size, + self->items + (index ) * self->item_size, + count*self->item_size ); + memmove( self->items + index * self->item_size, data, + count*self->item_size ); + self->size += count; +} + + + +void +vector_sort( Vector *self, + int (*cmp)(const void *, const void *) ) +{ + assert( self ); + assert( self->size ); + qsort(self->items, self->size, self->item_size, cmp); +} diff --git a/src/libs/freetype-gl/vector.h b/src/libs/freetype-gl/vector.h new file mode 100644 index 00000000..605a0ad4 --- /dev/null +++ b/src/libs/freetype-gl/vector.h @@ -0,0 +1,273 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= + + ========================================================================= */ +#ifndef __VECTOR_H__ +#define __VECTOR_H__ + + + +/** + * Generic vector structure. + */ +typedef struct + { + /** Pointer to dynamically allocated items. */ + void * items; + + /** Number of items that can be held in currently allocated storage. */ + size_t capacity; + + /** Number of items. */ + size_t size; + + /** Size (in bytes) of a single item. */ + size_t item_size; +} Vector; + +/** + * Creates a vector. + * + * @param item_size item size in bytes + * @return a new empty vector + */ + Vector * + vector_new( size_t item_size ); + +/** + * Deletes a vector. + * + * @param self a vector structure + */ + void + vector_delete( Vector *self ); + +/** + * Returns a pointer to the item located at specified index. + * + * @param self a vector structure + * @param index the index of the item to be returned + * @return pointer on the specified item + */ + const void * + vector_get( const Vector *self, + size_t index ); + +/** + * Returns a pointer to the first item. + * + * @param self a vector structure + * @return pointer on the first item + */ + const void * + vector_front( const Vector *self ); + +/** + * Returns a pointer to the last item + * + * @param self a vector structure + * @return pointer on the last item + */ + const void * + vector_back( const Vector *self ); + +/** + * Check if an item is contained within the vector. + * + * @param self a vector structure + * @param item item to be searched in the vector + * @param cmp a pointer a comparison function + * @return 1 if item is contained within the vector, 0 otherwise + */ + int + vector_contains( const Vector *self, + const void *item, + int (*cmp)(const void *, const void *) ); + +/** + * Checks whether the vector is empty. + * + * @param self a vector structure + * @return 1 if the vector is empty, 0 otherwise + */ + int + vector_empty( const Vector *self ); + +/** + * Returns the number of items + * + * @param self a vector structure + * @return number of items + */ + size_t + vector_size( const Vector *self ); + +/** + * Reserve storage such that it can hold at last size items. + * + * @param self a vector structure + * @param size the new storage capacity + */ + void + vector_reserve( Vector *self, + const size_t size ); + +/** + * Returns current storage capacity + * + * @param self a vector structure + * @return storage capacity + */ + size_t + vector_capacity( const Vector *self ); + +/** + * Decrease capacity to fit actual size. + * + * @param self a vector structure + */ + void + vector_shrink( Vector *self ); + +/** + * Removes all items. + * + * @param self a vector structure + */ + void + vector_clear( Vector *self ); + +/** + * Replace an item. + * + * @param self a vector structure + * @param index the index of the item to be replaced + * @param item the new item + */ + void + vector_set( Vector *self, + const size_t index, + const void *item ); + +/** + * Erase an item. + * + * @param self a vector structure + * @param index the index of the item to be erased + */ + void + vector_erase( Vector *self, + const size_t index ); + +/** + * Erase a range of items. + * + * @param self a vector structure + * @param first the index of the first item to be erased + * @param last the index of the last item to be erased + */ + void + vector_erase_range( Vector *self, + const size_t first, + const size_t last ); + +/** + * Appends given item to the end of the vector. + * + * @param self a vector structure + * @param item the item to be inserted + */ + void + vector_push_back( Vector *self, + const void *item ); + +/** + * Removes the last item of the vector. + * + * @param self a vector structure + */ + void + vector_pop_back( Vector *self ); + +/** + * Resizes the vector to contain size items + * + * If the current size is less than size, additional items are appended and + * initialized with value. If the current size is greater than size, the + * vector is reduced to its first size elements. + * + * @param self a vector structure + * @param size the new size + */ + void + vector_resize( Vector *self, + const size_t size ); + +/** + * Insert a single item at specified index. + * + * @param self a vector structure + * @param index location before which to insert item + * @param item the item to be inserted + */ + void + vector_insert( Vector *self, + const size_t index, + const void *item ); + +/** + * Insert raw data at specified index. + * + * @param self a vector structure + * @param index location before which to insert item + * @param data a pointer to the items to be inserted + * @param count the number of items to be inserted + */ + void + vector_insert_data( Vector *self, + const size_t index, + const void * data, + const size_t count ); + +/** + * Append raw data to the end of the vector. + * + * @param self a vector structure + * @param data a pointer to the items to be inserted + * @param count the number of items to be inserted + */ + void + vector_push_back_data( Vector *self, + const void * data, + const size_t count ); + +/** + * Sort vector items according to cmp function. + * + * @param self a vector structure + * @param cmp a pointer a comparison function + */ + void + vector_sort( Vector *self, + int (*cmp)(const void *, const void *) ); + +#endif /* __VECTOR_H__ */ diff --git a/src/libs/freetype-gl/vertex-buffer.cpp b/src/libs/freetype-gl/vertex-buffer.cpp new file mode 100644 index 00000000..01b90267 --- /dev/null +++ b/src/libs/freetype-gl/vertex-buffer.cpp @@ -0,0 +1,417 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= */ +#include +#include +#include +#include +#include "vertex-buffer.h" +#include +#include + + +VertexBuffer::VertexBuffer(char *_format ) +{ + __init(_format); +} +void VertexBuffer::__init(char *_format) +{ + size_t i, index = 0; + int stride = 0; + GLvoid *pointer = 0; + + format = strdup(_format); + char *p = format-1; + + for (i=0; im_pointer = pointer; + stride += attribute->m_size*GL_TYPE_SIZE(attribute->m_type); + pointer+= attribute->m_size*GL_TYPE_SIZE(attribute->m_type); + attributes[index] = attribute; + index++; + } + + for (i=0; im_stride=stride; + } + + vertices = vector_new( stride ); + vertices_id = 0; + + indices = vector_new(sizeof(GLuint)); + indices_id = 0; + dirty = true; +} + +VertexBuffer::VertexBuffer(char * format, size_t vcount, void *_vertices, size_t icount, GLuint *_indices) +{ + vector_resize(vertices, vcount ); + assert(vertices->size == vcount); + memcpy(vertices->items, _vertices, vcount * vertices->item_size ); + + vector_resize(indices, icount ); + assert(indices->size == icount); + memcpy(indices->items, _indices, icount * indices->item_size ); + + dirty = true; +} + +VertexBuffer::~VertexBuffer() +{ + vector_delete(vertices); + vertices = 0; + if (vertices_id ) { + glDeleteBuffers( 1, &vertices_id ); + } + vertices_id = 0; + + vector_delete(indices); + indices = 0; + if (indices_id) { + glDeleteBuffers( 1, &vertices_id ); + } + indices_id = 0; + if (format) { + free(format); + } + format = 0; + dirty = false; +} + + +void VertexBuffer::Upload() +{ + if (!vertices_id) { + glGenBuffers(1, &vertices_id); + } + if (!indices_id) { + glGenBuffers(1, &indices_id ); + } + glBindBuffer(GL_ARRAY_BUFFER, vertices_id); + glBufferData(GL_ARRAY_BUFFER, + vertices->size * vertices->item_size, + vertices->items, GL_DYNAMIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_id); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, + indices->size * indices->item_size, + indices->items, GL_DYNAMIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); +} + + +void VertexBuffer::Clear() +{ + vector_clear(indices); + vector_clear(vertices); + dirty = true; +} + +void VertexBuffer::Render(GLenum mode, char *what) +{ + int i,j; + + if (!vertices->size) { + return; + } + + if (dirty) { + Upload(); + dirty=false; + } + + glPushClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT); + glBindBuffer(GL_ARRAY_BUFFER, vertices_id); + for (i=0; im_target == target) { + (*(attribute->enable))(attribute); + break; + } + } + } + if (indices->size) { + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_id); + glDrawElements(mode, indices->size, GL_UNSIGNED_INT, 0); + } else { + glDrawArrays(mode, 0, vertices->size); + } + + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glPopClientAttrib(); +} + +void VertexBuffer::PushBackIndex(GLuint index) +{ + dirty = true; + vector_push_back(indices, &index); +} + +void VertexBuffer::PushBackVertex (void *vertex) +{ + dirty = true; + vector_push_back(vertices, vertex); +} + +void VertexBuffer::PushBackIndices(GLuint *_indices, size_t count) +{ + dirty = true; + vector_push_back_data(indices, _indices, count ); +} + +void VertexBuffer::PushBackVertices(void *_vertices,size_t count) +{ + dirty = true; + vector_push_back_data(vertices, _vertices, count); +} + +void VertexBuffer::InsertIndices(size_t index, GLuint *_indices, size_t count) +{ + dirty = true; + vector_insert_data( indices, index, _indices, count); +} + +void VertexBuffer::InsertVertices(size_t index, void *_vertices, size_t count) +{ + size_t i; + + assert(vertices); + assert(index < vertices->size+1 ); + + dirty = true; + for (i=0; isize-index; ++i) { + if( *(GLuint *)(vector_get(indices, i )) > index ) { + *(GLuint *)(vector_get(indices, i )) += index; + } + } + vector_insert_data(vertices, index, _vertices, count); +} + +// These are callbacks. +void VertexAttributePositionEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glVertexPointer(attr->m_size, attr->m_type, attr->m_stride, attr->m_pointer); +} + +void VertexAttributeNormalEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glNormalPointer(attr->m_type, attr->m_stride, attr->m_pointer); +} + +void VertexAttributeColorEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glColorPointer(attr->m_size, attr->m_type, attr->m_stride, attr->m_pointer); +} + + +void VertexAttributeTexCoordEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glTexCoordPointer(attr->m_size, attr->m_type, attr->m_stride, attr->m_pointer); +} + +void VertexAttributeFogCoordEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target ); + glFogCoordPointer(attr->m_type, attr->m_stride, attr->m_pointer); +} + +void VertexAttributeEdgeFlagEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glEdgeFlagPointer(attr->m_stride, attr->m_pointer); +} + +void VertexAttributeSecondaryColorEnable(VertexAttribute *attr) +{ + glEnableClientState(attr->m_target); + glSecondaryColorPointer(attr->m_size, attr->m_type, attr->m_stride, attr->m_pointer); +} + +VertexAttribute *VertexAttribute::Parse(char *format) +{ + char *p = strpbrk ( format, "vcntfse" ); + if (p != 0) { + int size; + char ctarget, ctype; + sscanf( p, "%c%d%c", &ctarget, &size, &ctype ); + GLenum type = GL_TYPE( ctype ); + GLenum target = GL_VERTEX_ATTRIBUTE_TARGET( ctarget ); + return new VertexAttribute(target, size, type, 0, 0); + } else { + } + return NULL; +} + + + +VertexAttribute::VertexAttribute(GLenum target,GLint size,GLenum type,GLsizei stride,GLvoid *pointer) +{ + switch(target ) { + case GL_VERTEX_ARRAY: + assert( size > 1 ); + enable = (void(*)(void *)) VertexAttributePositionEnable; + break; + + case GL_NORMAL_ARRAY: + assert (size == 3); + assert( (type == GL_BYTE) || (type == GL_SHORT) || + (type == GL_INT) || (type == GL_FLOAT) || + (type == GL_DOUBLE) ); + enable = (void(*)(void *)) VertexAttributeNormalEnable; + break; + + case GL_COLOR_ARRAY: + assert( (size == 3) || (size == 4) ); + assert( (type == GL_BYTE) || (type == GL_UNSIGNED_BYTE) || + (type == GL_SHORT) || (type == GL_UNSIGNED_SHORT) || + (type == GL_INT) || (type == GL_UNSIGNED_INT) || + (type == GL_FLOAT) || (type == GL_DOUBLE) ); + enable = (void(*)(void *)) VertexAttributeColorEnable; + break; + + case GL_TEXTURE_COORD_ARRAY: + assert( (type == GL_SHORT) || (type == GL_INT) || + (type == GL_FLOAT) || (type == GL_DOUBLE) ); + enable = (void(*)(void *)) VertexAttributeTexCoordEnable; + break; + + case GL_FOG_COORD_ARRAY: + assert( size == 2 ); + assert( (type == GL_FLOAT) || (type == GL_DOUBLE) ); + enable = (void(*)(void *)) VertexAttributeFogCoordEnable; + break; + + case GL_EDGE_FLAG_ARRAY: + assert( size == 1 ); + assert( type == GL_BOOL ); + enable = (void(*)(void *)) VertexAttributeEdgeFlagEnable; + break; + + case GL_SECONDARY_COLOR_ARRAY: + assert( size == 3 ); + assert( (type == GL_BYTE) || (type == GL_UNSIGNED_BYTE) || + (type == GL_SHORT) || (type == GL_UNSIGNED_SHORT) || + (type == GL_INT) || (type == GL_UNSIGNED_INT) || + (type == GL_FLOAT) || (type == GL_DOUBLE) ); + enable = (void(*)(void *)) VertexAttributeSecondaryColorEnable; + break; + + default: + enable = 0; + break; + } + + m_target = target; + m_size = size; + m_type = type; + m_stride = stride; + m_pointer = pointer; +} + + +GLenum GL_TYPE(char ctype) +{ + switch( ctype ) + { + case 'b': return GL_BYTE; + case 'B': return GL_UNSIGNED_BYTE; + case 's': return GL_SHORT; + case 'S': return GL_UNSIGNED_SHORT; + case 'i': return GL_INT; + case 'I': return GL_UNSIGNED_INT; + case 'f': return GL_FLOAT; + case 'd': return GL_DOUBLE; + default: return 0; + } +} + + + +GLenum GL_VERTEX_ATTRIBUTE_TARGET(char ctarget) +{ + switch(ctarget) + { + case 'v': return GL_VERTEX_ARRAY; + case 'n': return GL_NORMAL_ARRAY; + case 'c': return GL_COLOR_ARRAY; + case 't': return GL_TEXTURE_COORD_ARRAY; + case 'f': return GL_FOG_COORD_ARRAY; + case 's': return GL_SECONDARY_COLOR_ARRAY; + case 'e': return GL_EDGE_FLAG_ARRAY; + default: return 0; + } +} + + + +GLuint GL_TYPE_SIZE(GLenum gtype) +{ + switch(gtype) + { + case GL_BOOL: return sizeof(GLboolean); + case GL_BYTE: return sizeof(GLbyte); + case GL_UNSIGNED_BYTE: return sizeof(GLubyte); + case GL_SHORT: return sizeof(GLshort); + case GL_UNSIGNED_SHORT: return sizeof(GLushort); + case GL_INT: return sizeof(GLint); + case GL_UNSIGNED_INT: return sizeof(GLuint); + case GL_FLOAT: return sizeof(GLfloat); + case GL_DOUBLE: return sizeof(GLdouble); + default: return 0; + } +} + + + +char * GL_TYPE_STRING(GLenum gtype) +{ + switch(gtype) + { + case GL_BOOL: return "GL_BOOL"; + case GL_BYTE: return "GL_BYTE"; + case GL_UNSIGNED_BYTE: return "GL_UNSIGNED_BYTE"; + case GL_SHORT: return "GL_SHORT"; + case GL_UNSIGNED_SHORT: return "GL_UNSIGNED_SHORT"; + case GL_INT: return "GL_INT"; + case GL_UNSIGNED_INT: return "GL_UNSIGNED_INT"; + case GL_FLOAT: return "GL_FLOAT"; + case GL_DOUBLE: return "GL_DOUBLE"; + default: return "GL_VOID"; + } +} diff --git a/src/libs/freetype-gl/vertex-buffer.h b/src/libs/freetype-gl/vertex-buffer.h new file mode 100644 index 00000000..d16434f1 --- /dev/null +++ b/src/libs/freetype-gl/vertex-buffer.h @@ -0,0 +1,99 @@ +/* ========================================================================= + * Freetype GL - A C OpenGL Freetype engine + * Platform: Any + * API version: 1.0 + * WWW: http://code.google.com/p/freetype-gl/ + * C++ Conversion by Mark Watkins + * ------------------------------------------------------------------------- + * Copyright (c) 2011 Nicolas P. Rougier + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * ========================================================================= + + ========================================================================= */ +#ifndef __VERTEX_BUFFER_H__ +#define __VERTEX_BUFFER_H__ + +#define GL_GLEXT_PROTOTYPES 1 + +#if defined(__APPLE__) + #include +#else + #include +#endif + +#include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL. + +#define MAX_VERTEX_ATTRIBUTE 8 + +class VertexAttribute; + +//Generic vertex buffer. +class VertexBuffer +{ +public: + VertexBuffer(char * format); + VertexBuffer(char * format, size_t vcount, void *vertices, size_t icount, GLuint * indices); + ~VertexBuffer(); + + void Draw(const char * format, const GLenum mode, const void * vertices, const size_t count ); + void DrawIndexed(const char * format, const GLenum mode, const void * vertices, const size_t vcount, const GLuint * indices, const size_t icount); + void Render(GLenum mode, char * what); + void Upload(); + void Clear(); + void PushBackIndex(GLuint index ); + void PushBackVertex(void *vertex); + void PushBackIndices (GLuint *indices, size_t count); + void PushBackVertices(void *vertices, size_t count ); + void InsertIndices (size_t index, GLuint *indices, size_t count); + void InsertVertices(size_t index, void *_vertices, size_t count); + + void AddVertices(size_t index, void *vertices, size_t count); + + char * format; // Format of the vertex buffer. + Vector * vertices; // Vector of vertices. + GLuint vertices_id; // GL idendity of the vertices buffer. + Vector * indices; // Vector of indices. + GLuint indices_id; // GL idendity of the indices buffer. + bool dirty; // Whether the vertex buffer needs to be uploaded to GPU memory. + + VertexAttribute *attributes[MAX_VERTEX_ATTRIBUTE]; // Array of attributes. + +protected: + void __init(char *format); +}; + +// Generic vertex attribute. +class VertexAttribute +{ +public: + VertexAttribute( GLenum target, GLint size, GLenum type, GLsizei stride, GLvoid *pointer ); + static VertexAttribute *Parse(char *format); + + GLenum m_target; // a client-side capability. + GLint m_size; // Number of component. + GLenum m_type; // Data type. + GLsizei m_stride; // Byte offset between consecutive attributes. + GLvoid * m_pointer; // Pointer to the first component of the first attribute element in the array. + void (* enable)(void *); // Pointer to the function that enable this attribute. +}; + + +GLenum GL_TYPE(char ctype); +GLenum GL_VERTEX_ATTRIBUTE_TARGET(char ctarget); +GLuint GL_TYPE_SIZE(GLenum gtype); +char * GL_TYPE_STRING(GLenum gtype); + + +#endif /* __VERTEX_BUFFER_H__ */ diff --git a/src/version.h b/src/version.h index 2c414541..1dd5777c 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "12"; + static const char DATE[] = "14"; static const char MONTH[] = "06"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.06"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 5214; - static const long REVISION = 11765; + static const long BUILD = 5544; + static const long REVISION = 13556; //Miscellaneous Version Types - static const long BUILDS_COUNT = 4917; - #define RC_FILEVERSION 0,7,5214,11765 - #define RC_FILEVERSION_STRING "0, 7, 5214, 11765\0" - static const char FULLVERSION_STRING[] = "0.7.5214.11765"; + static const long BUILDS_COUNT = 5634; + #define RC_FILEVERSION 0,7,5544,13556 + #define RC_FILEVERSION_STRING "0, 7, 5544, 13556\0" + static const char FULLVERSION_STRING[] = "0.7.5544.13556"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;