From 23a603dd0de3df1d01213ccfc577ec21129feb16 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 3 Jul 2015 17:04:09 +0200 Subject: Renaming /demos/modules/gdisp/pixmaps to /demos/modules/gdisp/pixmap (dropping the s) --- demos/modules/gdisp/pixmap/demo.mk | 3 ++ demos/modules/gdisp/pixmap/gfxconf.h | 48 ++++++++++++++++++++ demos/modules/gdisp/pixmap/main.c | 83 +++++++++++++++++++++++++++++++++++ demos/modules/gdisp/pixmaps/demo.mk | 3 -- demos/modules/gdisp/pixmaps/gfxconf.h | 48 -------------------- demos/modules/gdisp/pixmaps/main.c | 83 ----------------------------------- 6 files changed, 134 insertions(+), 134 deletions(-) create mode 100644 demos/modules/gdisp/pixmap/demo.mk create mode 100644 demos/modules/gdisp/pixmap/gfxconf.h create mode 100644 demos/modules/gdisp/pixmap/main.c delete mode 100644 demos/modules/gdisp/pixmaps/demo.mk delete mode 100644 demos/modules/gdisp/pixmaps/gfxconf.h delete mode 100644 demos/modules/gdisp/pixmaps/main.c (limited to 'demos') diff --git a/demos/modules/gdisp/pixmap/demo.mk b/demos/modules/gdisp/pixmap/demo.mk new file mode 100644 index 00000000..979773ef --- /dev/null +++ b/demos/modules/gdisp/pixmap/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/modules/gdisp/pixmap +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/demos/modules/gdisp/pixmap/gfxconf.h b/demos/modules/gdisp/pixmap/gfxconf.h new file mode 100644 index 00000000..ddd7d1ec --- /dev/null +++ b/demos/modules/gdisp/pixmap/gfxconf.h @@ -0,0 +1,48 @@ +/* + * 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 + +/* Features for the GDISP sub-system. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_PIXMAP TRUE + +#endif /* _GFXCONF_H */ + diff --git a/demos/modules/gdisp/pixmap/main.c b/demos/modules/gdisp/pixmap/main.c new file mode 100644 index 00000000..3adcf03f --- /dev/null +++ b/demos/modules/gdisp/pixmap/main.c @@ -0,0 +1,83 @@ +/* + * 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" + +#define PIXMAP_WIDTH 40 +#define PIXMAP_HEIGHT 10 + +static GDisplay *pix; +static pixel_t *surface; + +int main(void) { + coord_t width, height; + coord_t i, j; + + // Initialize and clear the display + gfxInit(); + + // Get the screen size + width = gdispGetWidth(); + height = gdispGetHeight(); + + // Create a pixmap and get a pointer to the bits + pix = gdispCreatePixmap(PIXMAP_WIDTH, PIXMAP_HEIGHT); + surface = gdispGetPixmapBits(pix); + + // A pixmap can be treated either as a virtual display or as a memory framebuffer surface. + // We demonstrate writing to it using both methods. + + // First demo drawing onto the surface directly + for(j = 0; j < PIXMAP_HEIGHT; j++) + for(i = 0; i < PIXMAP_WIDTH; i++) + surface[j*PIXMAP_WIDTH + i] = RGB2COLOR(0, 255-i*(256/PIXMAP_WIDTH), j*(256/PIXMAP_HEIGHT)); + + // Secondly, show drawing a line on it like a virtual display + gdispGDrawLine(pix, 0, 0, gdispGGetWidth(pix)-1, gdispGGetHeight(pix)-1, White); + + i = j = 0; + while(TRUE) { + // Clear the old position + gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, Black); + + // Change the position + i += PIXMAP_WIDTH/2; + if (i >= width - PIXMAP_WIDTH/2) { + i %= width - PIXMAP_WIDTH/2; + j = (j + PIXMAP_HEIGHT/2) % (height - PIXMAP_HEIGHT/2); + } + + // Blit the pixmap to the real display at the new position + gdispBlitArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, surface); + + // Wait + gfxSleepMilliseconds(100); + } +} + diff --git a/demos/modules/gdisp/pixmaps/demo.mk b/demos/modules/gdisp/pixmaps/demo.mk deleted file mode 100644 index 9e4858ec..00000000 --- a/demos/modules/gdisp/pixmaps/demo.mk +++ /dev/null @@ -1,3 +0,0 @@ -DEMODIR = $(GFXLIB)/demos/modules/gdisp/pixmaps -GFXINC += $(DEMODIR) -GFXSRC += $(DEMODIR)/main.c diff --git a/demos/modules/gdisp/pixmaps/gfxconf.h b/demos/modules/gdisp/pixmaps/gfxconf.h deleted file mode 100644 index ddd7d1ec..00000000 --- a/demos/modules/gdisp/pixmaps/gfxconf.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 - -/* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_PIXMAP TRUE - -#endif /* _GFXCONF_H */ - diff --git a/demos/modules/gdisp/pixmaps/main.c b/demos/modules/gdisp/pixmaps/main.c deleted file mode 100644 index 3adcf03f..00000000 --- a/demos/modules/gdisp/pixmaps/main.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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" - -#define PIXMAP_WIDTH 40 -#define PIXMAP_HEIGHT 10 - -static GDisplay *pix; -static pixel_t *surface; - -int main(void) { - coord_t width, height; - coord_t i, j; - - // Initialize and clear the display - gfxInit(); - - // Get the screen size - width = gdispGetWidth(); - height = gdispGetHeight(); - - // Create a pixmap and get a pointer to the bits - pix = gdispCreatePixmap(PIXMAP_WIDTH, PIXMAP_HEIGHT); - surface = gdispGetPixmapBits(pix); - - // A pixmap can be treated either as a virtual display or as a memory framebuffer surface. - // We demonstrate writing to it using both methods. - - // First demo drawing onto the surface directly - for(j = 0; j < PIXMAP_HEIGHT; j++) - for(i = 0; i < PIXMAP_WIDTH; i++) - surface[j*PIXMAP_WIDTH + i] = RGB2COLOR(0, 255-i*(256/PIXMAP_WIDTH), j*(256/PIXMAP_HEIGHT)); - - // Secondly, show drawing a line on it like a virtual display - gdispGDrawLine(pix, 0, 0, gdispGGetWidth(pix)-1, gdispGGetHeight(pix)-1, White); - - i = j = 0; - while(TRUE) { - // Clear the old position - gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, Black); - - // Change the position - i += PIXMAP_WIDTH/2; - if (i >= width - PIXMAP_WIDTH/2) { - i %= width - PIXMAP_WIDTH/2; - j = (j + PIXMAP_HEIGHT/2) % (height - PIXMAP_HEIGHT/2); - } - - // Blit the pixmap to the real display at the new position - gdispBlitArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, surface); - - // Wait - gfxSleepMilliseconds(100); - } -} - -- cgit v1.2.3