From 3825cec8f857ffd80cf9df0822ae39b639812842 Mon Sep 17 00:00:00 2001 From: inmarket Date: Mon, 27 Oct 2014 16:44:53 +1000 Subject: Added new arc sector drawing routines (Thanks to steved for the inspiration). Added demo to match. --- demos/modules/gdisp/arcsectors/demo.mk | 3 ++ demos/modules/gdisp/arcsectors/gfxconf.h | 52 ++++++++++++++++++++++ demos/modules/gdisp/arcsectors/main.c | 76 ++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 demos/modules/gdisp/arcsectors/demo.mk create mode 100644 demos/modules/gdisp/arcsectors/gfxconf.h create mode 100644 demos/modules/gdisp/arcsectors/main.c (limited to 'demos/modules') diff --git a/demos/modules/gdisp/arcsectors/demo.mk b/demos/modules/gdisp/arcsectors/demo.mk new file mode 100644 index 00000000..200bcbd5 --- /dev/null +++ b/demos/modules/gdisp/arcsectors/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/modules/gdisp/arcsectors +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/demos/modules/gdisp/arcsectors/gfxconf.h b/demos/modules/gdisp/arcsectors/gfxconf.h new file mode 100644 index 00000000..49470b2f --- /dev/null +++ b/demos/modules/gdisp/arcsectors/gfxconf.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu + * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +/* The operating system to use. One of these must be defined - preferably in your Makefile */ +//#define GFX_USE_OS_CHIBIOS FALSE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_LINUX FALSE +//#define GFX_USE_OS_OSX FALSE + +/* GFX sub-systems to turn on */ +#define GFX_USE_GDISP TRUE +#define GFX_USE_GINPUT TRUE +#define GFX_USE_GEVENT TRUE +#define GFX_USE_GTIMER TRUE + +/* Features for the GDISP subsystem. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_ARCSECTORS TRUE + +#define GINPUT_NEED_MOUSE TRUE + +#endif /* _GFXCONF_H */ + diff --git a/demos/modules/gdisp/arcsectors/main.c b/demos/modules/gdisp/arcsectors/main.c new file mode 100644 index 00000000..9d282207 --- /dev/null +++ b/demos/modules/gdisp/arcsectors/main.c @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu + * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "gfx.h" + +GListener gl; + +int main(void) { + coord_t width, height, r1, r2, cx, cy; + uint8_t sectors; + GEventMouse *pme; + + // Initialize and clear the display + gfxInit(); + + // Get the screen size + width = gdispGetWidth(); + height = gdispGetHeight(); + r1 = width > height ? height/3 : width/3; + r2 = r1*3/4; + cx = width/2; + cy = height/2; + sectors = 1; + + // We want to listen for mouse button events + geventListenerInit(&gl); + geventAttachSource(&gl, ginputGetMouse(0), GLISTEN_MOUSEMETA); + + while(1) { + // Draw the arc sectors + gdispClear(White); + gdispDrawArcSectors(cx, cy, r1, sectors, Blue); + gdispFillArcSectors(cx, cy, r2, sectors, Red); + + // Get an Event + pme = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + + // Change our sectors based on the event. + switch(pme->type) { + case GEVENT_MOUSE: + case GEVENT_TOUCH: + if (pme->buttons & GMETA_MOUSE_CLICK) + sectors++; + else if (pme->buttons & GMETA_MOUSE_CXTCLICK) + sectors--; + break; + } + } +} + -- cgit v1.2.3