From 05a8f87262c29f9bf5508a291432f8e3a3277c17 Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Mon, 7 Jan 2019 15:04:42 -0500
Subject: [PATCH] condense test_scene.json, and increase near clip plane

---
 TODO.md              |   2 +
 data/level.2.dae     | 112 +++++++++++++++++++++++++++++++++++++++++++
 data/test_scene.json |  88 ++++++++++++----------------------
 src/camera.cpp       |   2 +-
 4 files changed, 145 insertions(+), 59 deletions(-)
 create mode 100644 data/level.2.dae

diff --git a/TODO.md b/TODO.md
index 2d5be87..5d5a60f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -17,6 +17,8 @@
 	- pass in frame time to camera movement functions to decouple speed from framerate
 	- test camera speed when moving with composite vector
 		- may be fixed?? need to test by examining camera position between frames and compare the distance
+	- show debug mesh for light positions
+	- attenuate point lights in shader
 - remove checks for colors, textures from render_group functions
 	- actually cannot remove checks for texture because some meshes aren't loaded properly
 	- maybe can cause loading mesh to fail when more than one mesh per file
diff --git a/data/level.2.dae b/data/level.2.dae
new file mode 100644
index 0000000..b306928
--- /dev/null
+++ b/data/level.2.dae
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <asset>
+    <contributor>
+      <author>Blender User</author>
+      <authoring_tool>Blender 2.79.6 commit date:2018-12-22, commit time:14:10, hash:2c0c1f494dcf</authoring_tool>
+    </contributor>
+    <created>2019-01-07T14:49:49</created>
+    <modified>2019-01-07T14:49:49</modified>
+    <unit name="meter" meter="1"/>
+    <up_axis>Z_UP</up_axis>
+  </asset>
+  <library_images>
+    <image id="palette_png" name="palette_png">
+      <init_from>/home/doug/dev/blender.projects/palette.png</init_from>
+    </image>
+  </library_images>
+  <library_effects>
+    <effect id="palette_png-effect">
+      <profile_COMMON>
+        <newparam sid="palette_png-surface">
+          <surface type="2D">
+            <init_from>palette_png</init_from>
+          </surface>
+        </newparam>
+        <newparam sid="palette_png-sampler">
+          <sampler2D>
+            <source>palette_png-surface</source>
+          </sampler2D>
+        </newparam>
+        <technique sid="common">
+          <phong>
+            <diffuse>
+              <texture texture="palette_png-sampler" texcoord="palette_png"/>
+            </diffuse>
+            <specular>
+              <color sid="specular">0 0 0 1</color>
+            </specular>
+          </phong>
+        </technique>
+      </profile_COMMON>
+    </effect>
+  </library_effects>
+  <library_materials>
+    <material id="palette_png-material" name="palette_png">
+      <instance_effect url="#palette_png-effect"/>
+    </material>
+  </library_materials>
+  <library_geometries>
+    <geometry id="Plane-mesh" name="Plane">
+      <mesh>
+        <source id="Plane-mesh-positions">
+          <float_array id="Plane-mesh-positions-array" count="378">1 -1 0 -1 1 0 -1 0 0 1 0 0 0 0 0 -1 -0.5 0 0.5 -1 0 -0.5 1 0 -1 0.5 0 -0.5 -1 0 0 0.5 0 0 -0.5 0 -0.5 -0.5 0 0.5 0.5 0 -1 -0.75 0 1 0.75 0 -0.75 1 0 -1 0.25 0 -0.25 -1 0 1 -0.25 0 0 -0.25 0 0.25 0 0 -1 -0.25 0 -0.75 -1 0 1 -0.75 0 0.75 1 0 0 0.25 0 -0.25 0 0 0.5 -0.75 0 0.25 -0.5 0 0.75 -0.5 0 -0.5 -0.75 0 -0.5 0.75 0 -0.75 0.5 0 0.5 0.75 0 0.75 0.5 0 0.75 0.25 0 -0.75 0.25 0 -0.75 0.75 0 0.75 -0.75 0 0.25 -0.75 0 -0.25 -0.25 0 -0.25 0.75 0 -1.99973 0 0 -1.99973 -0.25 0 -1.99973 0.25 0 -3.99973 0 0 -2.99973 0 0 -2.49973 0 0 -1.99973 -0.75 0 -3.99973 -0.25 0 -2.49973 1 0 -3.49973 0 0 -2.99973 -0.75 0 -2.99973 -0.25 0 -2.49973 -0.25 0 -3.49973 -0.25 0 -1 -1 0 0.75 -1 0 1 1 0 0 -1 0 0.25 1 0 0 1 0 0 0.75 0 -0.75 0 0 0.25 -1 0 1 0.25 0 1 0.5 0 -0.25 1 0 -1 0.75 0 1 -0.5 0 0.5 1 0 0 -0.75 0 -0.5 0 0 0.75 0 0 0.5 0 0 0.5 -0.25 0 0.5 -0.5 0 -0.5 -0.25 0 -0.75 -0.5 0 -0.25 -0.5 0 -0.5 0.25 0 -0.5 0.5 0 -0.25 0.5 0 0.5 0.25 0 0.25 0.5 0 0.25 0.25 0 0.25 0.75 0 -0.25 0.25 0 -0.25 -0.75 0 -0.75 -0.75 0 -0.75 -0.25 0 0.25 -0.25 0 0.75 -0.25 0 0.75 0.75 0 -3.99973 0.75 0 -3.99973 1 0 -1.99973 -1 0 -2.49973 -1 0 -1.99973 1 0 -3.99973 0.25 0 -3.99973 0.5 0 -3.49973 -1 0 -2.99973 -1 0 -3.99973 -0.75 0 -3.99973 -0.5 0 -1.99973 0.75 0 -1.99973 0.5 0 -3.49973 1 0 -2.99973 1 0 -2.99973 0.75 0 -2.99973 0.25 0 -2.99973 0.5 0 -2.49973 0.5 0 -3.49973 0.5 0 -2.99973 -0.5 0 -3.49973 -0.5 0 -2.49973 -0.5 0 -1.99973 -0.5 0 -3.99973 -1 0 -3.49973 -0.75 0 -3.49973 0.25 0 -2.49973 0.25 0 -2.49973 0.75 0 -3.49973 0.75 0 -2.49973 -0.75 0</float_array>
+          <technique_common>
+            <accessor source="#Plane-mesh-positions-array" count="126" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Plane-mesh-normals">
+          <float_array id="Plane-mesh-normals-array" count="3">0 0 1</float_array>
+          <technique_common>
+            <accessor source="#Plane-mesh-normals-array" count="1" stride="3">
+              <param name="X" type="float"/>
+              <param name="Y" type="float"/>
+              <param name="Z" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <source id="Plane-mesh-map-0">
+          <float_array id="Plane-mesh-map-0-array" count="1176">0.1017179 0.9735111 0.1011635 0.9739962 0.1017179 0.9739962 0.1017179 0.9754515 0.1011635 0.9759367 0.1017179 0.9759367 0.1039355 0.9754515 0.1033811 0.9759367 0.1039355 0.9759367 0.1039355 0.9735111 0.1033811 0.9739962 0.1039355 0.9739962 0.1039355 0.9744814 0.1033811 0.9749664 0.1039355 0.9749664 0.1050443 0.9744814 0.1044899 0.9749664 0.1050443 0.9749664 0.1050443 0.9735111 0.1044899 0.9739962 0.1050443 0.9739963 0.1050443 0.9764217 0.1044899 0.9769068 0.1050443 0.9769068 0.1050443 0.9754515 0.1044899 0.9759367 0.1050443 0.9759367 0.1017178 0.9764217 0.1011635 0.9769068 0.1017179 0.9769068 0.1028267 0.9764217 0.1022723 0.9769068 0.1028267 0.9769068 0.1028267 0.9754515 0.1022723 0.9759367 0.1028267 0.9759367 0.1017179 0.9744814 0.1011635 0.9749664 0.1017179 0.9749664 0.1028267 0.9744814 0.1022723 0.9749664 0.1028267 0.9749664 0.1028267 0.9735111 0.1022723 0.9739963 0.1028267 0.9739962 0.1028267 0.9739962 0.1022723 0.9744814 0.1028267 0.9744814 0.1033811 0.9739962 0.1028267 0.9744814 0.1033811 0.9744814 0.1033811 0.9735111 0.1028267 0.9739962 0.1033811 0.9739962 0.1028267 0.9749664 0.1022723 0.9754515 0.1028267 0.9754515 0.1033811 0.9749664 0.1028267 0.9754515 0.1033811 0.9754515 0.1033811 0.9744814 0.1028267 0.9749664 0.1033811 0.9749664 0.1022723 0.9749664 0.1017179 0.9754515 0.1022723 0.9754515 0.1022723 0.9744814 0.1017179 0.9749664 0.1022723 0.9749664 0.1033811 0.9759367 0.1028267 0.9764217 0.1033811 0.9764217 0.1033811 0.9754515 0.1028267 0.9759367 0.1033811 0.9759367 0.1028267 0.9769068 0.1022723 0.977392 0.1028267 0.977392 0.1033811 0.9769068 0.1028267 0.977392 0.1033811 0.977392 0.1033811 0.9764217 0.1028267 0.9769068 0.1033811 0.9769068 0.1017179 0.9769068 0.1011635 0.977392 0.1017179 0.977392 0.1022723 0.9769068 0.1017179 0.977392 0.1022723 0.977392 0.1022723 0.9764217 0.1017179 0.9769068 0.1022723 0.9769068 0.1050443 0.9759367 0.1044899 0.9764217 0.1050443 0.9764217 0.1055987 0.9759367 0.1050443 0.9764217 0.1055987 0.9764217 0.1055987 0.9754515 0.1050443 0.9759367 0.1055987 0.9759367 0.1050443 0.9769068 0.1044899 0.977392 0.1050443 0.977392 0.1055987 0.9769068 0.1050443 0.977392 0.1055987 0.977392 0.1055987 0.9764217 0.1050443 0.9769068 0.1055987 0.9769068 0.1039355 0.9769068 0.1033811 0.977392 0.1039355 0.977392 0.1044899 0.9769068 0.1039355 0.977392 0.1044899 0.977392 0.1044899 0.9764217 0.1039355 0.9769068 0.1044899 0.9769068 0.1050443 0.9739963 0.1044899 0.9744814 0.1050443 0.9744814 0.1055987 0.9739963 0.1050443 0.9744814 0.1055987 0.9744814 0.1055987 0.9735111 0.1050443 0.9739963 0.1055987 0.9739963 0.1050443 0.9749664 0.1044899 0.9754515 0.1050443 0.9754515 0.1055987 0.9749664 0.1050443 0.9754515 0.1055987 0.9754515 0.1055987 0.9744814 0.1050443 0.9749664 0.1055987 0.9749664 0.1039355 0.9749664 0.1033811 0.9754515 0.1039355 0.9754515 0.1044899 0.9749664 0.1039355 0.9754515 0.1044899 0.9754515 0.1044899 0.9744814 0.1039355 0.9749664 0.1044899 0.9749664 0.1044899 0.9739962 0.1039355 0.9744814 0.1044899 0.9744814 0.1044899 0.9735111 0.1039355 0.9739962 0.1044899 0.9739962 0.1039355 0.9759367 0.1033811 0.9764217 0.1039355 0.9764217 0.1044899 0.9759367 0.1039355 0.9764217 0.1044899 0.9764217 0.1044899 0.9754515 0.1039355 0.9759367 0.1044899 0.9759367 0.1017179 0.9759367 0.1011635 0.9764217 0.1017178 0.9764217 0.1022723 0.9759367 0.1017178 0.9764217 0.1022723 0.9764217 0.1022723 0.9754515 0.1017179 0.9759367 0.1022723 0.9759367 0.1017179 0.9739962 0.1011635 0.9744814 0.1017179 0.9744814 0.1022723 0.9739963 0.1017179 0.9744814 0.1022723 0.9744814 0.1022723 0.9735111 0.1017179 0.9739962 0.1022723 0.9739963 0.1033811 0.977392 0.1039355 0.9793319 0.1039355 0.977392 0.1028267 0.977392 0.1033811 0.9793319 0.1033811 0.977392 0.1055987 0.9744814 0.1061531 0.9735111 0.1061531 0.9744814 0.1072619 0.9783621 0.1078163 0.977392 0.1078163 0.9783621 0.1055987 0.9764217 0.1061531 0.9754515 0.1061531 0.9764217 0.1067075 0.9764217 0.1072619 0.9754515 0.1072619 0.9764217 0.1067075 0.9744814 0.1072619 0.9735111 0.1072619 0.9744814 0.1067075 0.9754515 0.1072619 0.9744814 0.1072619 0.9754515 0.1072619 0.9754515 0.1078163 0.9744814 0.1078163 0.9754515 0.1072619 0.9744814 0.1078163 0.9735111 0.1078163 0.9744814 0.1067075 0.977392 0.1072619 0.9764217 0.1072619 0.977392 0.1072619 0.977392 0.1078163 0.9764217 0.1078163 0.977392 0.1072619 0.9764217 0.1078163 0.9754515 0.1078163 0.9764217 0.1061531 0.9764217 0.1067075 0.9754515 0.1067075 0.9764217 0.1083707 0.9754515 0.1078163 0.9764217 0.1078163 0.9754515 0.1083707 0.9764217 0.1078163 0.977392 0.1078163 0.9764217 0.1089251 0.9735111 0.1083707 0.9744814 0.1083707 0.9735111 0.1083707 0.9735111 0.1078163 0.9744814 0.1078163 0.9735111 0.1083707 0.9744814 0.1078163 0.9754515 0.1078163 0.9744814 0.1072619 0.9793323 0.1078163 0.9783621 0.1078163 0.9793323 0.1055987 0.9754515 0.1061531 0.9744814 0.1061531 0.9754515 0.1061531 0.9754515 0.1067075 0.9744814 0.1067075 0.9754515 0.1061531 0.9744814 0.1067075 0.9735111 0.1067075 0.9744814 0.1033811 0.9793319 0.1039355 0.9798169 0.1033811 0.9798169 0.1044899 0.9793319 0.1039355 0.9798169 0.1039355 0.9793319 0.1028267 0.9793319 0.1022723 0.9798169 0.1022723 0.9793319 0.1028267 0.9793319 0.1033811 0.9798169 0.1028267 0.9798169 0.1055987 0.9803026 0.1061531 0.9812727 0.1061531 0.9803026 0.1067075 0.9783621 0.1072619 0.9793323 0.1072619 0.9783621 0.1067075 0.9803026 0.1072619 0.9812727 0.1072619 0.9803026 0.1011635 0.980302 0.1022723 0.9798169 0.1011635 0.9798169 0.1011635 0.9798169 0.1022723 0.9793319 0.1011635 0.9793319 0.1067075 0.9793323 0.1072619 0.9803026 0.1072619 0.9793323 0.1061531 0.977392 0.1067075 0.9783621 0.1067075 0.977392 0.1061531 0.9783621 0.1067075 0.9793323 0.1067075 0.9783621 0.1055987 0.9793323 0.1061531 0.9803026 0.1061531 0.9793323 0.1061531 0.9793323 0.1067075 0.9803026 0.1067075 0.9793323 0.1061531 0.9803026 0.1067075 0.9812727 0.1067075 0.9803026 0.1017179 0.9735111 0.1011635 0.9735111 0.1011635 0.9739962 0.1017179 0.9754515 0.1011635 0.9754515 0.1011635 0.9759367 0.1039355 0.9754515 0.1033811 0.9754515 0.1033811 0.9759367 0.1039355 0.9735111 0.1033811 0.9735111 0.1033811 0.9739962 0.1039355 0.9744814 0.1033811 0.9744814 0.1033811 0.9749664 0.1050443 0.9744814 0.1044899 0.9744814 0.1044899 0.9749664 0.1050443 0.9735111 0.1044899 0.9735111 0.1044899 0.9739962 0.1050443 0.9764217 0.1044899 0.9764217 0.1044899 0.9769068 0.1050443 0.9754515 0.1044899 0.9754515 0.1044899 0.9759367 0.1017178 0.9764217 0.1011635 0.9764217 0.1011635 0.9769068 0.1028267 0.9764217 0.1022723 0.9764217 0.1022723 0.9769068 0.1028267 0.9754515 0.1022723 0.9754515 0.1022723 0.9759367 0.1017179 0.9744814 0.1011635 0.9744814 0.1011635 0.9749664 0.1028267 0.9744814 0.1022723 0.9744814 0.1022723 0.9749664 0.1028267 0.9735111 0.1022723 0.9735111 0.1022723 0.9739963 0.1028267 0.9739962 0.1022723 0.9739963 0.1022723 0.9744814 0.1033811 0.9739962 0.1028267 0.9739962 0.1028267 0.9744814 0.1033811 0.9735111 0.1028267 0.9735111 0.1028267 0.9739962 0.1028267 0.9749664 0.1022723 0.9749664 0.1022723 0.9754515 0.1033811 0.9749664 0.1028267 0.9749664 0.1028267 0.9754515 0.1033811 0.9744814 0.1028267 0.9744814 0.1028267 0.9749664 0.1022723 0.9749664 0.1017179 0.9749664 0.1017179 0.9754515 0.1022723 0.9744814 0.1017179 0.9744814 0.1017179 0.9749664 0.1033811 0.9759367 0.1028267 0.9759367 0.1028267 0.9764217 0.1033811 0.9754515 0.1028267 0.9754515 0.1028267 0.9759367 0.1028267 0.9769068 0.1022723 0.9769068 0.1022723 0.977392 0.1033811 0.9769068 0.1028267 0.9769068 0.1028267 0.977392 0.1033811 0.9764217 0.1028267 0.9764217 0.1028267 0.9769068 0.1017179 0.9769068 0.1011635 0.9769068 0.1011635 0.977392 0.1022723 0.9769068 0.1017179 0.9769068 0.1017179 0.977392 0.1022723 0.9764217 0.1017178 0.9764217 0.1017179 0.9769068 0.1050443 0.9759367 0.1044899 0.9759367 0.1044899 0.9764217 0.1055987 0.9759367 0.1050443 0.9759367 0.1050443 0.9764217 0.1055987 0.9754515 0.1050443 0.9754515 0.1050443 0.9759367 0.1050443 0.9769068 0.1044899 0.9769068 0.1044899 0.977392 0.1055987 0.9769068 0.1050443 0.9769068 0.1050443 0.977392 0.1055987 0.9764217 0.1050443 0.9764217 0.1050443 0.9769068 0.1039355 0.9769068 0.1033811 0.9769068 0.1033811 0.977392 0.1044899 0.9769068 0.1039355 0.9769068 0.1039355 0.977392 0.1044899 0.9764217 0.1039355 0.9764217 0.1039355 0.9769068 0.1050443 0.9739963 0.1044899 0.9739962 0.1044899 0.9744814 0.1055987 0.9739963 0.1050443 0.9739963 0.1050443 0.9744814 0.1055987 0.9735111 0.1050443 0.9735111 0.1050443 0.9739963 0.1050443 0.9749664 0.1044899 0.9749664 0.1044899 0.9754515 0.1055987 0.9749664 0.1050443 0.9749664 0.1050443 0.9754515 0.1055987 0.9744814 0.1050443 0.9744814 0.1050443 0.9749664 0.1039355 0.9749664 0.1033811 0.9749664 0.1033811 0.9754515 0.1044899 0.9749664 0.1039355 0.9749664 0.1039355 0.9754515 0.1044899 0.9744814 0.1039355 0.9744814 0.1039355 0.9749664 0.1044899 0.9739962 0.1039355 0.9739962 0.1039355 0.9744814 0.1044899 0.9735111 0.1039355 0.9735111 0.1039355 0.9739962 0.1039355 0.9759367 0.1033811 0.9759367 0.1033811 0.9764217 0.1044899 0.9759367 0.1039355 0.9759367 0.1039355 0.9764217 0.1044899 0.9754515 0.1039355 0.9754515 0.1039355 0.9759367 0.1017179 0.9759367 0.1011635 0.9759367 0.1011635 0.9764217 0.1022723 0.9759367 0.1017179 0.9759367 0.1017178 0.9764217 0.1022723 0.9754515 0.1017179 0.9754515 0.1017179 0.9759367 0.1017179 0.9739962 0.1011635 0.9739962 0.1011635 0.9744814 0.1022723 0.9739963 0.1017179 0.9739962 0.1017179 0.9744814 0.1022723 0.9735111 0.1017179 0.9735111 0.1017179 0.9739962 0.1033811 0.977392 0.1033811 0.9793319 0.1039355 0.9793319 0.1028267 0.977392 0.1028267 0.9793319 0.1033811 0.9793319 0.1055987 0.9744814 0.1055987 0.9735111 0.1061531 0.9735111 0.1072619 0.9783621 0.1072619 0.977392 0.1078163 0.977392 0.1055987 0.9764217 0.1055987 0.9754515 0.1061531 0.9754515 0.1067075 0.9764217 0.1067075 0.9754515 0.1072619 0.9754515 0.1067075 0.9744814 0.1067075 0.9735111 0.1072619 0.9735111 0.1067075 0.9754515 0.1067075 0.9744814 0.1072619 0.9744814 0.1072619 0.9754515 0.1072619 0.9744814 0.1078163 0.9744814 0.1072619 0.9744814 0.1072619 0.9735111 0.1078163 0.9735111 0.1067075 0.977392 0.1067075 0.9764217 0.1072619 0.9764217 0.1072619 0.977392 0.1072619 0.9764217 0.1078163 0.9764217 0.1072619 0.9764217 0.1072619 0.9754515 0.1078163 0.9754515 0.1061531 0.9764217 0.1061531 0.9754515 0.1067075 0.9754515 0.1083707 0.9754515 0.1083707 0.9764217 0.1078163 0.9764217 0.1083707 0.9764217 0.1083707 0.977392 0.1078163 0.977392 0.1089251 0.9735111 0.1089251 0.9744814 0.1083707 0.9744814 0.1083707 0.9735111 0.1083707 0.9744814 0.1078163 0.9744814 0.1083707 0.9744814 0.1083707 0.9754515 0.1078163 0.9754515 0.1072619 0.9793323 0.1072619 0.9783621 0.1078163 0.9783621 0.1055987 0.9754515 0.1055987 0.9744814 0.1061531 0.9744814 0.1061531 0.9754515 0.1061531 0.9744814 0.1067075 0.9744814 0.1061531 0.9744814 0.1061531 0.9735111 0.1067075 0.9735111 0.1033811 0.9793319 0.1039355 0.9793319 0.1039355 0.9798169 0.1044899 0.9793319 0.1044899 0.9798169 0.1039355 0.9798169 0.1028267 0.9793319 0.1028267 0.9798169 0.1022723 0.9798169 0.1028267 0.9793319 0.1033811 0.9793319 0.1033811 0.9798169 0.1055987 0.9803026 0.1055987 0.9812727 0.1061531 0.9812727 0.1067075 0.9783621 0.1067075 0.9793323 0.1072619 0.9793323 0.1067075 0.9803026 0.1067075 0.9812727 0.1072619 0.9812727 0.1011635 0.980302 0.1022723 0.980302 0.1022723 0.9798169 0.1011635 0.9798169 0.1022723 0.9798169 0.1022723 0.9793319 0.1067075 0.9793323 0.1067075 0.9803026 0.1072619 0.9803026 0.1061531 0.977392 0.1061531 0.9783621 0.1067075 0.9783621 0.1061531 0.9783621 0.1061531 0.9793323 0.1067075 0.9793323 0.1055987 0.9793323 0.1055987 0.9803026 0.1061531 0.9803026 0.1061531 0.9793323 0.1061531 0.9803026 0.1067075 0.9803026 0.1061531 0.9803026 0.1061531 0.9812727 0.1067075 0.9812727</float_array>
+          <technique_common>
+            <accessor source="#Plane-mesh-map-0-array" count="588" stride="2">
+              <param name="S" type="float"/>
+              <param name="T" type="float"/>
+            </accessor>
+          </technique_common>
+        </source>
+        <vertices id="Plane-mesh-vertices">
+          <input semantic="POSITION" source="#Plane-mesh-positions"/>
+        </vertices>
+        <triangles material="palette_png-material" count="196">
+          <input semantic="VERTEX" source="#Plane-mesh-vertices" offset="0"/>
+          <input semantic="NORMAL" source="#Plane-mesh-normals" offset="1"/>
+          <input semantic="TEXCOORD" source="#Plane-mesh-map-0" offset="2" set="0"/>
+          <p>15 0 0 25 0 1 94 0 2 63 0 3 68 0 4 42 0 5 20 0 6 27 0 7 41 0 8 19 0 9 74 0 10 93 0 11 76 0 12 21 0 13 92 0 14 28 0 15 29 0 16 40 0 17 24 0 18 30 0 19 39 0 20 31 0 21 79 0 22 90 0 23 72 0 24 80 0 25 89 0 26 32 0 27 16 0 28 38 0 29 81 0 30 33 0 31 37 0 32 26 0 33 83 0 34 88 0 35 34 0 36 61 0 37 87 0 38 84 0 39 85 0 40 86 0 41 66 0 42 35 0 43 36 0 44 36 0 45 13 0 46 84 0 47 74 0 48 84 0 49 75 0 50 3 0 51 36 0 52 74 0 53 86 0 54 10 0 55 26 0 56 21 0 57 26 0 58 4 0 59 75 0 60 86 0 61 21 0 62 85 0 63 63 0 64 10 0 65 13 0 66 87 0 67 85 0 68 27 0 69 81 0 70 73 0 71 4 0 72 88 0 73 27 0 74 37 0 75 8 0 76 17 0 77 64 0 78 17 0 79 2 0 80 73 0 81 37 0 82 64 0 83 38 0 84 1 0 85 69 0 86 33 0 87 69 0 88 8 0 89 82 0 90 38 0 91 33 0 92 89 0 93 12 0 94 31 0 95 18 0 96 31 0 97 9 0 98 60 0 99 89 0 100 18 0 101 90 0 102 5 0 103 14 0 104 23 0 105 14 0 106 57 0 107 9 0 108 90 0 109 23 0 110 91 0 111 2 0 112 22 0 113 79 0 114 22 0 115 5 0 116 12 0 117 91 0 118 79 0 119 39 0 120 77 0 121 28 0 122 58 0 123 28 0 124 6 0 125 0 0 126 39 0 127 58 0 128 40 0 129 11 0 130 72 0 131 65 0 132 72 0 133 60 0 134 6 0 135 40 0 136 65 0 137 92 0 138 4 0 139 20 0 140 29 0 141 20 0 142 11 0 143 77 0 144 92 0 145 29 0 146 30 0 147 76 0 148 77 0 149 70 0 150 93 0 151 30 0 152 41 0 153 73 0 154 78 0 155 80 0 156 78 0 157 12 0 158 11 0 159 41 0 160 80 0 161 42 0 162 7 0 163 32 0 164 83 0 165 32 0 166 82 0 167 10 0 168 42 0 169 83 0 170 94 0 171 71 0 172 34 0 173 35 0 174 34 0 175 13 0 176 67 0 177 94 0 178 35 0 179 2 0 180 44 0 181 22 0 182 17 0 183 43 0 184 2 0 185 98 0 186 49 0 187 125 0 188 51 0 189 110 0 190 123 0 191 102 0 192 53 0 193 120 0 194 116 0 195 54 0 196 56 0 197 117 0 198 44 0 199 55 0 200 115 0 201 55 0 202 54 0 203 54 0 204 48 0 205 47 0 206 55 0 207 43 0 208 48 0 209 105 0 210 56 0 211 50 0 212 50 0 213 52 0 214 46 0 215 56 0 216 47 0 217 52 0 218 120 0 219 115 0 220 116 0 221 111 0 222 52 0 223 47 0 224 121 0 225 46 0 226 52 0 227 107 0 228 122 0 229 45 0 230 45 0 231 48 0 232 43 0 233 122 0 234 47 0 235 48 0 236 99 0 237 123 0 238 106 0 239 103 0 240 125 0 241 53 0 242 53 0 243 117 0 244 115 0 245 125 0 246 118 0 247 117 0 248 78 0 249 64 0 250 91 0 251 87 0 252 62 0 253 63 0 254 88 0 255 82 0 256 81 0 257 93 0 258 75 0 259 76 0 260 108 0 261 95 0 262 124 0 263 113 0 264 111 0 265 122 0 266 114 0 267 100 0 268 121 0 269 119 0 270 120 0 271 104 0 272 104 0 273 116 0 274 105 0 275 112 0 276 121 0 277 111 0 278 106 0 279 113 0 280 107 0 281 123 0 282 112 0 283 113 0 284 109 0 285 124 0 286 110 0 287 110 0 288 114 0 289 112 0 290 124 0 291 101 0 292 114 0 293 15 0 294 59 0 295 25 0 296 63 0 297 62 0 298 68 0 299 20 0 300 4 0 301 27 0 302 19 0 303 3 0 304 74 0 305 76 0 306 75 0 307 21 0 308 28 0 309 77 0 310 29 0 311 24 0 312 70 0 313 30 0 314 31 0 315 12 0 316 79 0 317 72 0 318 11 0 319 80 0 320 32 0 321 7 0 322 16 0 323 81 0 324 82 0 325 33 0 326 26 0 327 10 0 328 83 0 329 34 0 330 71 0 331 61 0 332 84 0 333 13 0 334 85 0 335 66 0 336 67 0 337 35 0 338 36 0 339 35 0 340 13 0 341 74 0 342 36 0 343 84 0 344 3 0 345 66 0 346 36 0 347 86 0 348 85 0 349 10 0 350 21 0 351 86 0 352 26 0 353 75 0 354 84 0 355 86 0 356 85 0 357 87 0 358 63 0 359 13 0 360 34 0 361 87 0 362 27 0 363 88 0 364 81 0 365 4 0 366 26 0 367 88 0 368 37 0 369 33 0 370 8 0 371 64 0 372 37 0 373 17 0 374 73 0 375 81 0 376 37 0 377 38 0 378 16 0 379 1 0 380 33 0 381 38 0 382 69 0 383 82 0 384 32 0 385 38 0 386 89 0 387 80 0 388 12 0 389 18 0 390 89 0 391 31 0 392 60 0 393 72 0 394 89 0 395 90 0 396 79 0 397 5 0 398 23 0 399 90 0 400 14 0 401 9 0 402 31 0 403 90 0 404 91 0 405 64 0 406 2 0 407 79 0 408 91 0 409 22 0 410 12 0 411 78 0 412 91 0 413 39 0 414 30 0 415 77 0 416 58 0 417 39 0 418 28 0 419 0 0 420 24 0 421 39 0 422 40 0 423 29 0 424 11 0 425 65 0 426 40 0 427 72 0 428 6 0 429 28 0 430 40 0 431 92 0 432 21 0 433 4 0 434 29 0 435 92 0 436 20 0 437 77 0 438 76 0 439 92 0 440 30 0 441 93 0 442 76 0 443 70 0 444 19 0 445 93 0 446 41 0 447 27 0 448 73 0 449 80 0 450 41 0 451 78 0 452 11 0 453 20 0 454 41 0 455 42 0 456 68 0 457 7 0 458 83 0 459 42 0 460 32 0 461 10 0 462 63 0 463 42 0 464 94 0 465 25 0 466 71 0 467 35 0 468 94 0 469 34 0 470 67 0 471 15 0 472 94 0 473 2 0 474 43 0 475 44 0 476 17 0 477 45 0 478 43 0 479 98 0 480 97 0 481 49 0 482 51 0 483 109 0 484 110 0 485 102 0 486 103 0 487 53 0 488 116 0 489 115 0 490 54 0 491 117 0 492 118 0 493 44 0 494 115 0 495 117 0 496 55 0 497 54 0 498 55 0 499 48 0 500 55 0 501 44 0 502 43 0 503 105 0 504 116 0 505 56 0 506 50 0 507 56 0 508 52 0 509 56 0 510 54 0 511 47 0 512 120 0 513 53 0 514 115 0 515 111 0 516 121 0 517 52 0 518 121 0 519 100 0 520 46 0 521 107 0 522 113 0 523 122 0 524 45 0 525 122 0 526 48 0 527 122 0 528 111 0 529 47 0 530 99 0 531 51 0 532 123 0 533 103 0 534 98 0 535 125 0 536 53 0 537 125 0 538 117 0 539 125 0 540 49 0 541 118 0 542 78 0 543 73 0 544 64 0 545 87 0 546 61 0 547 62 0 548 88 0 549 83 0 550 82 0 551 93 0 552 74 0 553 75 0 554 108 0 555 96 0 556 95 0 557 113 0 558 112 0 559 111 0 560 114 0 561 101 0 562 100 0 563 119 0 564 102 0 565 120 0 566 104 0 567 120 0 568 116 0 569 112 0 570 114 0 571 121 0 572 106 0 573 123 0 574 113 0 575 123 0 576 110 0 577 112 0 578 109 0 579 108 0 580 124 0 581 110 0 582 124 0 583 114 0 584 124 0 585 95 0 586 101 0 587</p>
+        </triangles>
+      </mesh>
+    </geometry>
+  </library_geometries>
+  <library_visual_scenes>
+    <visual_scene id="Scene" name="Scene">
+      <node id="Plane" name="Plane" type="NODE">
+        <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
+        <instance_geometry url="#Plane-mesh" name="Plane">
+          <bind_material>
+            <technique_common>
+              <instance_material symbol="palette_png-material" target="#palette_png-material">
+                <bind_vertex_input semantic="UVMap" input_semantic="TEXCOORD" input_set="0"/>
+              </instance_material>
+            </technique_common>
+          </bind_material>
+        </instance_geometry>
+      </node>
+    </visual_scene>
+  </library_visual_scenes>
+  <scene>
+    <instance_visual_scene url="#Scene"/>
+  </scene>
+</COLLADA>
\ No newline at end of file
diff --git a/data/test_scene.json b/data/test_scene.json
index 4c329dd..f9df173 100644
--- a/data/test_scene.json
+++ b/data/test_scene.json
@@ -1,77 +1,35 @@
 {
 	"camera" : {
-		"position" : {
-			"x" : 0,
-			"y" : -400,
-			"z" : 100
-		},
-		"target" : {
-			"x" : 140,
-			"y" : 0,
-			"z" : 0
-		},
-		"world_up" : {
-			"x" : 0,
-			"y" : 0,
-			"z" : 1
-		}
+		"position" : {"x":0,"y":-400,"z":100},
+		"target" : {"x":140,"y":0,"z":0},
+		"world_up" : {"x":0,"y":0,"z":1}
 	},
 
 	"hex_grid" : {
-		"position" : {
-			"x" : 0,
-			"y" : 0,
-			"z" : 0
-		},
+		"position" : {"x":0,"y":0,"z":0},
 		"hex_size" : 10,
 		"fill_color" : 6,
 		"selected_fill_color": 7,
 		"hex_line_color": 5,
 		"hexlib_orientation" : "layout_flat",
 		"grid_type" : "hexagon",
-		"hex_radius" : 20
+		"hex_radius" : 15
 	},
 
 	"entities" : [
 		{
 			"name" : "catepillar 1",
 			"model_file" : "catepillar.dae",
-			"position" : {
-				"x" : -140,
-				"y" : 50,
-				"z" : 0
-			},
-			"rotation" : {
-				"x" : 0,
-				"y" : 0,
-				"z" : 0,
-				"w" : 0
-			},
-			"scale" : {
-				"x" : 10,
-				"y" : 10,
-				"z" : 10
-			}
+			"position" : {"x":-140,"y":50,"z":0},
+			"rotation" : {"x":0,"y":0,"z":0,"w":0},
+			"scale" : {"x":10,"y":10,"z":10}
 		},
 		{
 			"name" : "catepillar 2",
 			"model_file" : "catepillar.dae",
-			"position" : {
-				"x" : 140,
-				"y" : 0,
-				"z" : 0
-			},
-			"rotation" : {
-				"x" : 0,
-				"y" : 0,
-				"z" : 0,
-				"w" : 0
-			},
-			"scale" : {
-				"x" : 10,
-				"y" : 10,
-				"z" : 10
-			}
+			"position" : {"x" :140,"y":0,"z":0},
+			"rotation" : {"x":0,"y":0,"z":0,"w":0},
+			"scale" : {"x":10,"y":10,"z":10}
 		},
 		{
 			"name" : "box",
@@ -95,11 +53,11 @@
 		},
 		{
 			"name" : "ground",
-			"model_file" : "test.level.dae",
+			"model_file" : "level.2.dae",
 			"position" : {
 				"x" : 0,
 				"y" : 0,
-				"z" : -100
+				"z" : -1
 			},
 			"rotation" : {
 				"x" : 0,
@@ -108,14 +66,28 @@
 				"w" : 0
 			},
 			"scale" : {
-				"x" : 500,
-				"y" : 500,
-				"z" : 500
+				"x" : 300,
+				"y" : 300,
+				"z" : 300
 			}
 		}
 	],
 
 	"lights" : [
+		{
+			"intensity" : 1.0,
+			"color" : {
+				"r" : 0,
+				"g" : 0,
+				"b" : 0
+			},
+
+			"position" : {
+				"x" : -1000,
+				"y" : 0,
+				"z" : 100
+			}
+		},
 		{
 			"intensity" : 1.0,
 			"color" : {
diff --git a/src/camera.cpp b/src/camera.cpp
index 741ca4f..667d9dd 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -9,7 +9,7 @@
 #define CAMERA_Z_CLAMP_ANGLE 85.f
 #define FOV 60.f
 #define ASPECT_RATIO 16.f/9.f
-#define NEAR_CLIP_PLANE 0.1f
+#define NEAR_CLIP_PLANE 20.f
 
 
 void