From 74907ece372e2c10a5119ffca5047bb04c3e136d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 9 Sep 2018 18:07:47 +0200
Subject: [PATCH] Update demo2

---
 demo2.cpp | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/demo2.cpp b/demo2.cpp
index 92936c2..27e5cb6 100644
--- a/demo2.cpp
+++ b/demo2.cpp
@@ -10,8 +10,6 @@
 #define FPS 60
 #define PLAYER_SPEED (UNITS_PER_SQUARE * 3)
 
-#define SUBSAMPLE 1
-
 #include "general.hpp"
 
 #define LEVEL_X_RES 32
@@ -28,22 +26,24 @@ Sprite sprites[SPRITES];
 
 const unsigned char level[] =
 {
-  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,1,1,1,1,0,1,1,1,3,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  1,3,1,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+/*                    10  12  14  16  18  20  22  24  26  28  30
+  0 1 2 3 4 5 6 7 8 9   11  13  15  17  19  21  23  25  27  29  31 */
+  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0, // 0
+  0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0, // 1
+  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2
+  0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3
+  0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 4
+  0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 5
+  0,0,1,1,1,1,0,1,1,1,3,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 6
+  0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 7
+  0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 8
+  0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 9
+  0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 10
+  0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 11
+  1,3,1,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 12
+  0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 13
+  0,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 14
+  0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  // 15
 };
 
 const unsigned char texture1[] =
@@ -482,6 +482,8 @@ Unit textureAt(int16_t x, int16_t y)
   return 0;
 }
 
+uint8_t cFloor, cCeiling;
+
 /**
   Function for drawing a single pixel (like fragment shader).
 */
@@ -495,10 +497,10 @@ inline void pixelFunc(PixelInfo pixel)
   if (pixel.isWall)
   {
     c = sampleImage(textures[pixel.hit.type],pixel.hit.textureCoord,pixel.textureCoordY);
-    c = addIntensity(c,pixel.hit.direction % 2 == 0 ? 2 : 0);
+    c = addIntensity(c,2 - pixel.depth / (UNITS_PER_SQUARE * 2) + (pixel.hit.direction % 2 == 0 ? 2 : 0));
   }
   else
-    c = pixel.isFloor ? 100 : 50;
+    c = pixel.isFloor ? cFloor: cCeiling;
 
   uint8_t *buf = pokitto.display.screenbuffer;
 
@@ -560,8 +562,10 @@ pokitto.display.print(player.mCamera.direction);
 
 int main()
 {
-  pokitto.begin();
-  initPalette();
+  initGeneral();
+
+  cFloor = rgbToIndex(0,1,1);
+  cCeiling = rgbToIndex(1,0,1);
 
   player.setPositionSquare(6,5);
   player.mCamera.height = CAMERA_COLL_HEIGHT_BELOW;
@@ -571,10 +575,6 @@ int main()
   sprites[2] = Sprite(sprite2,15,19,1,150);
   sprites[2].mHeight -= UNITS_PER_SQUARE / 2;
 
-  pokitto.display.persistence = 1;
-  pokitto.setFrameRate(FPS);
-  pokitto.display.setFont(fontTiny);
-
   uint32_t previousTime = 0;
   uint32_t dt;