diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs index cf8226921a..07bf98e832 100644 --- a/graphics/nxglib/Make.defs +++ b/graphics/nxglib/Make.defs @@ -52,8 +52,9 @@ RMOVE2_CSRCS = nxglib_moverectangle_8bpp.c nxglib_moverectangle_16bpp.c \ RCOPY2_CSRCS = nxglib_copyrectangle_8bpp.c nxglib_copyrectangle_16bpp.c \ nxglib_copyrectangle_24bpp.c nxglib_copyrectangle_32bpp.c RECT_CSRCS = nxglib_rectcopy.c nxglib_rectoffset.c nxglib_vectoradd.c \ - nxglib_rectintersect.c nxglib_nonintersecting.c \ - nxglib_rectunion.c nxglib_rectoverlap.c nxglib_nullrect.c + nxglib_vectsubtract.c nxglib_rectintersect.c \ + nxglib_nonintersecting.c nxglib_rectunion.c nxglib_rectinside.c \ + nxglib_rectoverlap.c nxglib_nullrect.c TRAP_CSRCS = nxglib_runoffset.c nxglib_runcopy.c \ nxglib_trapoffset.c nxglib_trapcopy.c COLOR_CSRCS = nxglib_colorcopy.c diff --git a/graphics/nxglib/nxglib_rectinside.c b/graphics/nxglib/nxglib_rectinside.c new file mode 100644 index 0000000000..5d631d533a --- /dev/null +++ b/graphics/nxglib/nxglib_rectinside.c @@ -0,0 +1,83 @@ +/**************************************************************************** + * graphics/nxglib/nxsglib_rectinside.c + * + * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX 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 THE + * COPYRIGHT OWNER OR CONTRIBUTORS 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxgl_rectinside + * + * Description: + * Return TRUE if the point pt lies within rect. + * + ****************************************************************************/ + +boolean nxgl_rectinside(FAR const struct nxgl_rect_s *rect, + FAR const struct nxgl_point_s *pt) +{ + return (pt->x >= rect->pt1.x && pt->x <= rect->pt2.x && + pt->x >= rect->pt1.y && pt->y <= rect->pt2.y); +} diff --git a/graphics/nxglib/nxglib_vectsubtract.c b/graphics/nxglib/nxglib_vectsubtract.c new file mode 100644 index 0000000000..03b7ddc41a --- /dev/null +++ b/graphics/nxglib/nxglib_vectsubtract.c @@ -0,0 +1,86 @@ +/**************************************************************************** + * graphics/nxglib/nxsglib_vectorsubtract.c + * + * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name NuttX 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 THE + * COPYRIGHT OWNER OR CONTRIBUTORS 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxgl_vectorsubtract + * + * Description: + * Add subtract vector v2 from vector v1 and return the result in vector dest + * + ****************************************************************************/ + +void nxgl_vectorsubtract(FAR struct nxgl_point_s *dest, + FAR const struct nxgl_point_s *v1, + FAR const struct nxgl_point_s *v2) +{ + dest->x = v1->x - v2->x; + dest->y = v1->y - v2->y; +} + + diff --git a/include/nuttx/nxglib.h b/include/nuttx/nxglib.h index b34159201b..1f230e0d26 100644 --- a/include/nuttx/nxglib.h +++ b/include/nuttx/nxglib.h @@ -351,6 +351,18 @@ EXTERN void nxgl_vectoradd(FAR struct nxgl_point_s *dest, FAR const struct nxgl_point_s *v1, FAR const struct nxgl_point_s *v2); +/**************************************************************************** + * Name: nxgl_vectorsubtract + * + * Description: + * Add subtract vector v2 from vector v1 and return the result in vector dest + * + ****************************************************************************/ + +EXTERN void nxgl_vectorsubtract(FAR struct nxgl_point_s *dest, + FAR const struct nxgl_point_s *v1, + FAR const struct nxgl_point_s *v2); + /**************************************************************************** * Name: nxgl_rectintersect * @@ -401,6 +413,17 @@ EXTERN void nxgl_nonintersecting(FAR struct nxgl_rect_s result[4], EXTERN boolean nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1, FAR struct nxgl_rect_s *rect2); +/**************************************************************************** + * Name: nxgl_rectinside + * + * Description: + * Return TRUE if the point pt lies within rect. + * + ****************************************************************************/ + +EXTERN boolean nxgl_rectinside(FAR const struct nxgl_rect_s *rect, + FAR const struct nxgl_point_s *pt); + /**************************************************************************** * Name: nxgl_nullrect *