From 6cce43ce9435c28f30288e41f10ca9ede117be5b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 5 Dec 2014 12:11:23 -0600 Subject: [PATCH] Add some global data declarations. Fix modes on some files marked as executable --- graphics/traveler/Makefile | 5 +- graphics/traveler/include/trv_bitmaps.h | 4 +- graphics/traveler/src/trv_bitmaps.c | 70 +++++++++++++++++++++++++ graphics/traveler/src/trv_doors.c | 0 graphics/traveler/src/trv_plane.c | 59 +++++++++++++++++++++ graphics/traveler/src/trv_rayavoid.c | 0 graphics/traveler/src/trv_rayrend.c | 0 graphics/traveler/src/trv_trigtbl.c | 0 8 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 graphics/traveler/src/trv_bitmaps.c mode change 100755 => 100644 graphics/traveler/src/trv_doors.c create mode 100644 graphics/traveler/src/trv_plane.c mode change 100755 => 100644 graphics/traveler/src/trv_rayavoid.c mode change 100755 => 100644 graphics/traveler/src/trv_rayrend.c mode change 100755 => 100644 graphics/traveler/src/trv_trigtbl.c diff --git a/graphics/traveler/Makefile b/graphics/traveler/Makefile index 6e1c49d58..6ee55d14c 100644 --- a/graphics/traveler/Makefile +++ b/graphics/traveler/Makefile @@ -46,8 +46,9 @@ STACKSIZE = 2048 # Traveler files ASRCS = -CSRCS = trv_color.c trv_doors.c trv_graphics.c trv_input.c trv_mem.c trv_pov.c -CSRCS += trv_rayavoid.c trv_rayrend.c trv_trigtbl.c +CSRCS = trv_bitmaps.c trv_color.c trv_doors.c trv_graphics.c trv_input.c +CSRCS += trv_mem.c trv_plane.c trv_pov.c trv_rayavoid.c trv_rayrend.c +CSRCS += trv_trigtbl.c MAINSRC = trv_main.c ifeq ($(CONFIG_NX),y) diff --git a/graphics/traveler/include/trv_bitmaps.h b/graphics/traveler/include/trv_bitmaps.h index 71ecc25ce..ae20c5cb3 100644 --- a/graphics/traveler/include/trv_bitmaps.h +++ b/graphics/traveler/include/trv_bitmaps.h @@ -79,9 +79,9 @@ struct trv_bitmap_s * bitmaps */ -extern struct trv_bitmap_s *g_even_bitmaps[MAX_BITMAPS]; +extern FAR struct trv_bitmap_s *g_even_bitmaps[MAX_BITMAPS]; #ifndef WEDIT -extern struct trv_bitmap_s *g_odd_bitmaps[MAX_BITMAPS]; +extern FAR struct trv_bitmap_s *g_odd_bitmaps[MAX_BITMAPS]; #endif /* This is the maximum value + 1 of a texture code */ diff --git a/graphics/traveler/src/trv_bitmaps.c b/graphics/traveler/src/trv_bitmaps.c new file mode 100644 index 000000000..6fd334063 --- /dev/null +++ b/graphics/traveler/src/trv_bitmaps.c @@ -0,0 +1,70 @@ +/******************************************************************************* + * apps/graphics/traveler/src/trv_bitmaps.c + * This file contains the global variables use by the texture bitmap logic + * + * Copyright (C) 2014 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 "trv_types.h" +#include "trv_bitmaps.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* These point to the (allocated) bit map buffers for the even and odd + * bitmaps + */ + +FAR struct trv_bitmap_s *g_even_bitmaps[MAX_BITMAPS]; +#ifndef WEDIT +FAR struct trv_bitmap_s *g_odd_bitmaps[MAX_BITMAPS]; +#endif + +/* This is the maximum value + 1 of a texture code. */ + +uint16_t g_trv_nbitmaps; + +/* These are the colors from the world palette which should used to rend + * the sky and ground + */ + +trv_pixel_t g_sky_color; +trv_pixel_t g_ground_color; diff --git a/graphics/traveler/src/trv_doors.c b/graphics/traveler/src/trv_doors.c old mode 100755 new mode 100644 diff --git a/graphics/traveler/src/trv_plane.c b/graphics/traveler/src/trv_plane.c new file mode 100644 index 000000000..177ad226b --- /dev/null +++ b/graphics/traveler/src/trv_plane.c @@ -0,0 +1,59 @@ +/******************************************************************************* + * apps/graphics/traveler/src/trv_bitmaps.c + * This file contains the global variable declarations needed by the world + * plane management logic. + * + * Copyright (C) 2014 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 "trv_types.h" +#include "trv_plane.h" + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* The is the world!!! The world is described by lists of rectangles, one + * for each of the X, Y, and Z planes. + */ + +struct trv_rect_head_s g_xplane; /* list of X=plane rectangles */ +struct trv_rect_head_s g_yplane; /* list of Y=plane rectangles */ +struct trv_rect_head_s g_zplane; /* list of Z=plane rectangles */ + +/* "Deallocated" planes are retained in a free list */ + +struct trv_rect_list_s *g_rect_freelist; diff --git a/graphics/traveler/src/trv_rayavoid.c b/graphics/traveler/src/trv_rayavoid.c old mode 100755 new mode 100644 diff --git a/graphics/traveler/src/trv_rayrend.c b/graphics/traveler/src/trv_rayrend.c old mode 100755 new mode 100644 diff --git a/graphics/traveler/src/trv_trigtbl.c b/graphics/traveler/src/trv_trigtbl.c old mode 100755 new mode 100644