Add two files that were missed in a previous commit

4 files changed, 331 insertions, 1 deletions

diff --git a/apps/graphics/traveler/Makefile b/apps/graphics/traveler/Makefile
index 71dbabeaf..8008fb487 100644
--- a/apps/graphics/traveler/Makefile
+++ b/apps/graphics/traveler/Makefile
@@ -46,7 +46,7 @@ STACKSIZE = 2048
 # Hello, World! Example
 
 ASRCS =
-CSRCS = trv_color.c trv_graphics.c trv_input.c trv_mem.c
+CSRCS = trv_color.c trv_graphics.c trv_input.c trv_mem.c trv_pov.c
 MAINSRC = trv_main.c
 
 ifeq ($(CONFIG_NX),y)
diff --git a/apps/graphics/traveler/include/trv_rayavoid.h b/apps/graphics/traveler/include/trv_rayavoid.h
new file mode 100644
index 000000000..8778ed7de
--- /dev/null
+++ b/apps/graphics/traveler/include/trv_rayavoid.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+ * apps/graphics/traveler/include/trv_rayavoid.h
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYAVOID_H
+#define __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYAVOID_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "trv_types.h"
+#include "trv_world.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+extern trv_coord_t trv_rayclip_player_xmotion(FAR struct trv_camera_s *pov,
+                                              trv_coord_t dist, int16_t yaw,
+                                              trv_coord_t height);
+extern trv_coord_t trv_rayclip_player_ymotion(FAR struct trv_camera_s *pov,
+                                              trv_coord_t dist, int16_t yaw,
+                                              trv_coord_t height);
+extern trv_coord_t trv_ray_adjust_zpos(FAR struct trv_camera_s *pov,
+                                       trv_coord_t height);
+
+#endif /* __APPS_GRAPHICS_TRAVELER_INCLUDE_TRV_RAYAVOID_H */
diff --git a/apps/graphics/traveler/include/trv_trigtbl.h b/apps/graphics/traveler/include/trv_trigtbl.h
index 2b73647c2..deac5a0fb 100644
--- a/apps/graphics/traveler/include/trv_trigtbl.h
+++ b/apps/graphics/traveler/include/trv_trigtbl.h
@@ -62,6 +62,7 @@
 #define ANGLE_6       32
 #define ANGLE_9       48
 #define ANGLE_30     160
+#define ANGLE_45     240
 #define ANGLE_60     320
 #define ANGLE_90     480
 #define ANGLE_180    960
diff --git a/apps/graphics/traveler/src/trv_pov.c b/apps/graphics/traveler/src/trv_pov.c
new file mode 100644
index 000000000..33d66a1f6
--- /dev/null
+++ b/apps/graphics/traveler/src/trv_pov.c
@@ -0,0 +1,262 @@
+/****************************************************************************
+ * apps/graphics/traveler/trv_pov.c
+ *
+ *   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_input.h"
+#include "trv_trigtbl.h"
+#include "trv_rayavoid.h"
+#include "trv_pov.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/* This structure defines the current camera position of the player's eyes */
+
+struct trv_camera_s g_trv_player;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  trv_new_viewangle
+ * Description:
+ * This function determines the new POV to use on this cycle
+ ****************************************************************************/
+
+static void trv_new_viewangle(void)
+{
+  /* Are we turning to the left or right (yaw)? */
+
+  if (g_trv_input.yawrate != 0)
+    {
+      /* Determine the amount to rotate on this cycle */
+
+      g_trv_player.yaw += g_trv_input.yawrate;
+
+      /* Make sure that yaw is still within range */
+
+      if (g_trv_player.yaw >= ANGLE_360)
+        {
+          g_trv_player.yaw -= ANGLE_360;
+        }
+      else if (g_trv_player.yaw < ANGLE_0)
+        {
+          g_trv_player.yaw += ANGLE_360;
+        }
+    }
+
+  /* Are we "nodding" up or down (pitch) */
+
+  if (g_trv_input.pitchrate != 0)
+    {
+      g_trv_player.pitch += g_trv_input.pitchrate;
+
+      /* Make sure that pitch is still within range */
+
+      if (g_trv_player.pitch >= ANGLE_360)
+        {
+          g_trv_player.pitch -= ANGLE_360;
+        }
+      else if (g_trv_player.pitch < ANGLE_0)
+        {
+          g_trv_player.pitch += ANGLE_360;
+        }
+
+     /* Don't let the player look up more than thirty degrees */
+
+     if (g_trv_player.pitch > ANGLE_30 &&
+         g_trv_player.pitch < ANGLE_180)
+       {
+          g_trv_player.pitch = ANGLE_30;
+        }
+
+      /* Don't let the player look down more than thirty degrees */
+
+      else if (g_trv_player.pitch < (ANGLE_360 - ANGLE_30) &&
+               g_trv_player.pitch > ANGLE_180)
+        {
+          g_trv_player.pitch = (ANGLE_360 - ANGLE_30);
+        }
+    }
+}
+
+/****************************************************************************
+ * Name:  trv_new_playerposition
+ *
+ * Description:
+ *   This function determines the new POV to use on this cycle
+ *
+ ****************************************************************************/
+
+static void trv_new_playerposition(void)
+{
+  int16_t     move_angle;
+  int16_t     left_angle;
+  trv_coord_t fwd_distance;
+  trv_coord_t left_distance;
+  trv_coord_t move_distance;
+
+  /* Assume that we are moving forward */
+
+  move_angle    = g_trv_player.yaw;
+  left_angle    = ANGLE_90;
+  fwd_distance  = g_trv_input.fwdrate;
+  left_distance = g_trv_input.leftrate;
+
+  /* Are we are moving "backward" */
+
+  if (fwd_distance < 0)
+    {
+      /* Yes.. switch to moving backward at 180 degrees.  Moving left now
+       * becomes moving right.
+       */
+
+      fwd_distance  = -fwd_distance;
+      left_distance = -left_distance;
+
+      move_angle   += ANGLE_180;
+      if (move_angle >= ANGLE_360)
+        {
+          move_angle -= (int16_t)ANGLE_360;
+        }
+
+      /* If we also doing horizontal movement, it the angle should actually
+       * be based on the relative magnitude forward and lateral movement
+       * distance.  But we will just use 45 degrees which should be good
+       * enough for out purposes.
+       */
+
+     left_angle = ANGLE_45;
+    }
+
+  /* Are we moving left or right? */
+
+  if (left_distance > 0)
+    {
+      move_angle = g_trv_player.yaw - left_angle;
+    }
+  else if (left_distance < 0)
+    {
+      left_distance = -left_distance;
+      move_angle = g_trv_player.yaw + left_angle;
+    }
+
+  if (move_angle < ANGLE_0)
+    {
+      move_angle += (int16_t)ANGLE_360;
+    }
+  else if (move_angle >= ANGLE_360)
+    {
+      move_angle -= (int16_t)ANGLE_360;
+    }
+
+  /* The move distance is approximated as follows */
+
+  if (left_distance > fwd_distance)
+    {
+      move_distance = left_distance + (fwd_distance >> 1);
+    }
+  else
+    {
+      move_distance = fwd_distance + (left_distance >> 1);
+    }
+
+  /* Decompose the desired move distance into X and Y components
+   * and clip these components to avoid collisions with walls and objects
+   */
+
+  g_trv_player.x +=
+    trv_rayclip_player_xmotion(&g_trv_player, move_distance,
+                               move_angle, g_trv_input.stepheight);
+  g_trv_player.y +=
+    trv_rayclip_player_ymotion(&g_trv_player, move_distance,
+                               move_angle, g_trv_input.stepheight);
+
+  /* Adjust the player's vertical position (he may have fallen down or
+   * stepped up something.
+   */
+
+  g_trv_player.z += trv_ray_adjust_zpos(&g_trv_player, g_player_height);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  trv_pov_reset
+ *
+ * Description:
+ *   This function returns the player to the starting position
+ *
+ ****************************************************************************/
+
+void trv_pov_reset(void)
+{
+  g_trv_player = g_initial_camera;
+}
+
+/****************************************************************************
+ * Name:  trv_pov_new
+ *
+ * Description:
+ *   This function determines the new POV to use on this cycle based on the
+ *   current inputs
+ ****************************************************************************/
+
+void trv_pov_new(void)
+{
+  /* Get angular changes first */
+
+  trv_new_viewangle();
+
+  /* The get the player motion along the new angles */
+
+  trv_new_playerposition();
+}