Add the second of several world creation files

8 files changed, 215 insertions, 21 deletions

diff --git a/apps/graphics/traveler/Makefile b/apps/graphics/traveler/Makefile
index fdfb07dbd..91840fed2 100644
--- a/apps/graphics/traveler/Makefile
+++ b/apps/graphics/traveler/Makefile
@@ -47,9 +47,9 @@ STACKSIZE = 2048
 
 ASRCS   =
 CSRCS   = trv_bitmaps.c trv_color.c trv_createworld.c trv_doors.c
-CSRCS  += trv_graphics.c trv_input.c trv_mem.c trv_plane.c trv_pov.c
-CSRCS  += trv_rayavoid.c trv_raycast.c trv_raycntl.c trv_rayprune.c
-CSRCS  += trv_rayrend.c trv_trigtbl.c
+CSRCS  += trv_graphics.c trv_input.c trv_loadplanes.c trv_mem.c
+CSRCS  += trv_plane.c trv_pov.c trv_rayavoid.c trv_raycast.c
+CSRCS  += trv_raycntl.c trv_rayprune.c trv_rayrend.c trv_trigtbl.c
 MAINSRC = trv_main.c
 
 ifeq ($(CONFIG_NX),y)
diff --git a/apps/graphics/traveler/include/trv_plane.h b/apps/graphics/traveler/include/trv_plane.h
index c2a3fb5f7..57a1adf1d 100644
--- a/apps/graphics/traveler/include/trv_plane.h
+++ b/apps/graphics/traveler/include/trv_plane.h
@@ -139,19 +139,19 @@ extern struct trv_rect_list_s *g_rect_freelist;
  * Public Function Prototypes
  ****************************************************************************/
 
-uint8_t trv_initialize_planes(void);
-void    trv_release_planes(void);
-uint8_t trv_load_planefile(FAR const char *wldfile);
-uint8_t trv_load_planes(FAR FILE *fp);
-uint8_t trv_save_planes(const char *wldfile);
+int trv_initialize_planes(void);
+void trv_add_plane(FAR struct trv_rect_list_s *rect,
+                   FAR struct trv_rect_head_s *list);
+void trv_move_plane(FAR struct trv_rect_list_s *rect,
+                    FAR struct trv_rect_head_s *destlist,
+                    FAR struct trv_rect_head_s *srclist);
+void trv_merge_planelists(FAR struct trv_rect_head_s *outlist,
+                          FAR struct trv_rect_head_s *inlist);
+void trv_release_planes(void);
+
+int  trv_load_planefile(FAR const char *wldfile);
+int  trv_load_planes(FAR FILE *fp);
+int  trv_save_planes(const char *wldfile);
 FAR struct trv_rect_list_s *trv_new_plane(void);
 
-void    trv_add_plane(FAR struct trv_rect_list_s *rect,
-                      FAR struct trv_rect_head_s *list);
-void    trv_move_plane(FAR struct trv_rect_list_s *rect,
-                       FAR struct trv_rect_head_s *destlist,
-                       FAR struct trv_rect_head_s *srclist);
-void    trv_merge_planelists(FAR struct trv_rect_head_s *outlist,
-                             FAR struct trv_rect_head_s *inlist);
-
 #endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_PLANE_H */
diff --git a/apps/graphics/traveler/src/trv_bitmaps.c b/apps/graphics/traveler/src/trv_bitmaps.c
index 6fd334063..00a53202a 100644
--- a/apps/graphics/traveler/src/trv_bitmaps.c
+++ b/apps/graphics/traveler/src/trv_bitmaps.c
@@ -68,3 +68,30 @@ uint16_t g_trv_nbitmaps;
 
 trv_pixel_t g_sky_color;
 trv_pixel_t g_ground_color;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: trv_initialize_bitmaps
+ *
+ * Description:
+ *
+ ***************************************************************************/
+
+int trv_initialize_bitmaps(void)
+{
+  int i;
+
+  for (i = 0; i < MAX_BITMAPS; i++)
+    {
+      g_even_bitmaps[i] = NULL;
+#ifndef WEDIT
+      g_odd_bitmaps[i]  = NULL;
+#endif
+    }
+
+  g_trv_nbitmaps = 0;
+  return OK;
+}
diff --git a/apps/graphics/traveler/src/trv_loadplanes.c b/apps/graphics/traveler/src/trv_loadplanes.c
new file mode 100644
index 000000000..a57fb5105
--- /dev/null
+++ b/apps/graphics/traveler/src/trv_loadplanes.c
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * apps/graphics/traveler/src/trv_loadplanes.c
+ * This file contains the logic to load the world data from the opened file
+ *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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"
+
+#include <stdio.h>
+#include <errno.h>
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Type Declarations
+ ***************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: trv_load_worldplane
+ *
+ * Description:
+ *
+ *   This function loads the world data for one plane
+ *
+ ***************************************************************************/
+
+static int trv_load_worldplane(FAR FILE *fp, FAR struct trv_rect_head_s *head,
+                               uint8_t nrects)
+{
+  FAR struct trv_rect_list_s *rect;
+  int ret;
+  int i;
+
+  for (i = 0; i < nrects; i++)
+    {
+      /* Allocate space for the next rectangle */
+
+      rect = trv_new_plane();
+      if (!rect)
+        {
+          return -ENOMEM;
+        }
+
+      /* Read the next rectangle from the input file */
+
+      ret = fread((char*)&rect->d, RESIZEOF_TRVRECTDATA_T, 1, fp);
+      if (ret != 1)
+        {
+          int errcode = errno;
+          fprintf(stderr, "Error: read of rectangle %d (of %d) failed\n",
+                  i, nrects);
+          fprintf(stderr, "feof=%d ferror=%d errno=%d\n",
+                  feof(fp), ferror(fp), errcode);
+          return -errcode;
+        }
+
+      /* Put the new rectangle into the plane list */
+
+      trv_add_plane(rect, head);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: trv_load_planes
+ * Description:
+ * This function loads the world data from the opened file
+ ***************************************************************************/
+
+int trv_load_planes(FAR FILE *fp)
+{
+  struct trv_planefile_header_s header;
+  int ret;
+
+  /* Read the plane file header */
+
+  ret = fread((char*)&header, SIZEOF_TRVPLANEFILEHEADER_T, 1, fp);
+  if (ret != 1)
+    {
+      int errcode = errno;
+      fprintf(stderr, "Error: Failed to read of file header\n");
+      fprintf(stderr, "feof=%d ferror=%d errno=%d\n",
+              feof(fp), ferror(fp), errcode);
+      return -errcode;
+    }
+
+  /* Then load each grid, performing run length (rle) decoding */
+
+  ret = trv_load_worldplane(fp, &g_xplane, header.nxrects);
+  if (ret == OK)
+    {
+      ret = trv_load_worldplane(fp, &g_yplane, header.nyrects);
+    }
+
+  if (ret == OK)
+    {
+      ret = trv_load_worldplane(fp, &g_zplane, header.nzrects);
+    }
+
+  return ret;
+}
diff --git a/apps/graphics/traveler/src/trv_nxserver.c b/apps/graphics/traveler/src/trv_nxserver.c
index ea2501fff..be753299d 100644
--- a/apps/graphics/traveler/src/trv_nxserver.c
+++ b/apps/graphics/traveler/src/trv_nxserver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/traveler/trv_nxlistener.c
+ * apps/graphics/traveler/trv_nxserver.c
  * NX server logic
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
diff --git a/apps/graphics/traveler/src/trv_plane.c b/apps/graphics/traveler/src/trv_plane.c
index 58d36e90a..7337c482d 100644
--- a/apps/graphics/traveler/src/trv_plane.c
+++ b/apps/graphics/traveler/src/trv_plane.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * apps/graphics/traveler/src/trv_bitmaps.c
+ * apps/graphics/traveler/src/trv_plane.c
  * This file contains the global variable declarations needed by the world
  * plane management logic.
  *
@@ -63,6 +63,26 @@ struct trv_rect_list_s *g_rect_freelist;
  ****************************************************************************/
 
 /****************************************************************************
+ * Name: trv_initialize_planes
+ *
+ * Description:
+ *
+ ***************************************************************************/
+
+int trv_initialize_planes(void)
+{
+  g_xplane.head   = NULL;
+  g_xplane.tail   = NULL;
+  g_yplane.head   = NULL;
+  g_yplane.tail   = NULL;
+  g_zplane.head   = NULL;
+  g_zplane.tail   = NULL;
+  g_rect_freelist = NULL;
+
+  return OK;
+}
+
+/****************************************************************************
  * Name: trv_add_plane
  *
  * Description:
@@ -221,7 +241,7 @@ void trv_merge_planelists(FAR struct trv_rect_head_s *outlist,
       if (!outrect)
         {
           /* No rectangle with plane larger than the one to be added
-           * was found in the list.  The inrect goes at the end of
+           * was found in the list.  The 'inrect' goes at the end of
            * the list.
            */
 
diff --git a/apps/graphics/traveler/src/trv_raycast.c b/apps/graphics/traveler/src/trv_raycast.c
index 96f81748e..88fbe5b72 100644
--- a/apps/graphics/traveler/src/trv_raycast.c
+++ b/apps/graphics/traveler/src/trv_raycast.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * apps/graphics/traveler/src/trv_bitmaps.c
+ * apps/graphics/traveler/src/trv_raycast.c
  * This file contains the low-level ray casting logic
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
diff --git a/apps/graphics/traveler/src/trv_trigtbl.c b/apps/graphics/traveler/src/trv_trigtbl.c
index 4a00233ea..5e58ef85c 100644
--- a/apps/graphics/traveler/src/trv_trigtbl.c
+++ b/apps/graphics/traveler/src/trv_trigtbl.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/traveler/src/trv_trigtable.c
+ * apps/graphics/traveler/src/trv_trigtbl.c
  * Provides look-up tables for trigonometric functions.
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.