From a468a8535c25dca4f420b81db6346488d22c0c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Sat, 29 Sep 2018 10:03:42 +0200 Subject: [PATCH] Add floor texture --- demo1.cpp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/demo1.cpp b/demo1.cpp index 7b34631..3433c8e 100644 --- a/demo1.cpp +++ b/demo1.cpp @@ -445,6 +445,84 @@ const unsigned char texture4[] = ,0x05,0x20 }; +const unsigned char texture5[] = +{ 32, 32 // width, height + ,0x29,0x35,0x34,0x34,0x34,0xa5,0xb7,0xb6,0xb8,0xa7,0xa6,0x33,0x35,0x33 + ,0xa7,0x33,0xa8,0xa6,0xa8,0xb7,0x33,0xb5,0xb7,0x33,0x33,0x34,0x34,0xb5 + ,0x33,0x33,0x34,0x34,0xb7,0xa7,0xa8,0x33,0x22,0x34,0x33,0xb6,0x33,0x35 + ,0xb9,0xa9,0xa8,0xb5,0xb9,0xa6,0xa6,0xb6,0xa5,0x33,0x33,0x03,0x23,0xb6 + ,0x35,0xa7,0xb6,0xa7,0xb5,0x35,0x03,0x34,0xa9,0xa7,0xb5,0xaa,0xa9,0x34 + ,0x03,0xb7,0xa7,0x33,0x33,0xb8,0xb7,0xbb,0x35,0xa8,0xb6,0x22,0x03,0xa6 + ,0x33,0xa7,0xa9,0x33,0x33,0xa6,0x33,0xa7,0x34,0x35,0x34,0x34,0xb5,0xb6 + ,0x23,0x03,0x33,0xa7,0xb8,0xa9,0xa8,0xa7,0xa5,0x03,0x33,0x34,0x34,0x34 + ,0xa5,0xb5,0xa8,0xb7,0x33,0x33,0x33,0x35,0xa5,0x33,0x34,0xa7,0x34,0x33 + ,0xb5,0x34,0x34,0x35,0xb6,0xa7,0x35,0x33,0x33,0x33,0x35,0xa7,0x35,0xb6 + ,0xa6,0x34,0x33,0x23,0xa5,0xa6,0x33,0xb6,0xb5,0xa6,0xa8,0x33,0x34,0x33 + ,0x33,0x03,0x34,0x33,0x33,0x33,0xa9,0xb6,0xa7,0x35,0x38,0xb5,0xa5,0xb5 + ,0x33,0x35,0x35,0x34,0x34,0xa6,0x33,0xb7,0xa6,0x34,0xb5,0x35,0xa7,0xa5 + ,0x34,0xb5,0xb8,0x33,0x23,0xa8,0x34,0x23,0x34,0x35,0x34,0x33,0x36,0xa7 + ,0xa8,0xab,0xa6,0xa6,0x33,0x33,0xb6,0xa8,0x34,0xa6,0x33,0xa9,0x34,0x36 + ,0xb8,0x35,0x34,0xb7,0xb5,0xb5,0xb5,0xa9,0x36,0xa7,0xa7,0x34,0xa8,0x34 + ,0xa7,0x33,0x26,0x23,0x03,0x35,0x36,0x35,0xa7,0xb5,0x35,0xb5,0xa7,0xa9 + ,0xa9,0x34,0x33,0xa7,0xb8,0xa9,0xb7,0xa9,0xa8,0xb6,0xb7,0x33,0xa7,0x34 + ,0x34,0x34,0x35,0x03,0x23,0x33,0xa8,0xaa,0xb5,0x33,0x35,0xb8,0x34,0x33 + ,0x33,0x36,0xb6,0xb8,0x23,0x35,0x33,0x35,0xa9,0x36,0xb7,0x28,0xb5,0xa7 + ,0xa7,0x33,0x34,0x33,0x33,0xa5,0x34,0x33,0x34,0x33,0xa8,0xb7,0xa6,0x35 + ,0xb5,0xa6,0xa8,0xb5,0x33,0x35,0x34,0xb5,0xa7,0xa7,0xa8,0x33,0xa7,0x33 + ,0xa9,0xac,0x33,0x23,0x33,0xb7,0x35,0x33,0xa7,0xa7,0xa7,0xb7,0x34,0x34 + ,0xa8,0x35,0xa8,0x33,0xa6,0x33,0x33,0xa9,0xa8,0x34,0x33,0xa8,0xb8,0xa7 + ,0xa7,0xa9,0xa8,0xa9,0x35,0xb7,0xb9,0xb9,0xb8,0xb5,0x33,0x34,0x33,0x03 + ,0x34,0x34,0xa7,0xa8,0xa6,0xa7,0xa6,0x33,0x33,0xa7,0x33,0xa6,0xb7,0xa6 + ,0x34,0xa5,0x34,0x24,0x34,0xa6,0x35,0x33,0xb6,0x27,0xb5,0xb8,0xa9,0xa6 + ,0x33,0x25,0xb7,0xb5,0xa6,0x34,0xb5,0xb7,0x25,0x33,0xa6,0xa9,0xb8,0xb5 + ,0x27,0xb6,0x33,0x35,0xa6,0x34,0x24,0x34,0xa5,0x34,0xa6,0xb7,0xa6,0xab + ,0xa7,0x33,0x33,0xa6,0xa7,0xa6,0xa8,0xa7,0xb6,0x33,0x03,0x33,0x34,0x33 + ,0xb5,0xb8,0xb9,0xb9,0xb7,0x35,0xa9,0xa8,0xa9,0xa7,0xa6,0xb7,0xa8,0x33 + ,0x34,0xa8,0xa9,0x33,0x33,0xa6,0x33,0xa8,0x35,0xa8,0x34,0x34,0xa6,0x35 + ,0xa7,0xa7,0x33,0x35,0xb7,0x33,0x23,0x33,0xac,0xa9,0x33,0xa7,0x33,0xa8 + ,0xa7,0xa7,0xb5,0x34,0x35,0x33,0xb5,0xa8,0xa6,0xb5,0x35,0xa6,0xbb,0xa8 + ,0x33,0x34,0xa6,0xb9,0xa5,0x33,0x33,0x34,0x33,0xa8,0x33,0xb5,0x28,0xb7 + ,0x36,0xa9,0x35,0x33,0x35,0x23,0xb8,0xb6,0x36,0x33,0x33,0x34,0xb8,0x35 + ,0x33,0xb5,0xaa,0xa8,0x33,0x23,0xa8,0xb5,0x34,0x34,0x34,0xa7,0x33,0xb7 + ,0xb7,0xa8,0xa9,0xb7,0xa9,0xb8,0xa7,0x33,0x34,0xa9,0xa9,0xa7,0xb5,0x35 + ,0xb5,0xa7,0x35,0x36,0x35,0x03,0x23,0x26,0x33,0xa7,0x33,0x23,0x34,0xa7 + ,0xa7,0x36,0xa9,0xb5,0x03,0x03,0xb7,0x34,0x35,0xb8,0xa8,0x35,0xa6,0x33 + ,0xa6,0x34,0xa8,0xb6,0x33,0x33,0xa6,0xa6,0xab,0xa8,0xa7,0x36,0x33,0x34 + ,0xa6,0xaa,0x23,0x34,0xa8,0x23,0x33,0xb8,0xa8,0x34,0xa5,0xa7,0x35,0x03 + ,0x34,0xa9,0xb8,0x33,0xa6,0x34,0x34,0x35,0x35,0x33,0xb5,0xa5,0xb5,0x38 + ,0x35,0xa7,0xb6,0xa9,0xa6,0xb6,0x33,0x34,0x03,0x33,0x33,0x34,0x33,0xa8 + ,0xa6,0xb5,0xb6,0x33,0xa6,0xa5,0x33,0x33,0x34,0xa6,0xb6,0x35,0xa7,0x35 + ,0x33,0x33,0x33,0x35,0xa7,0xb6,0x35,0x34,0xb7,0xa7,0x33,0x34,0xa7,0x34 + ,0x33,0xa5,0x35,0x33,0x33,0x33,0xb7,0xa8,0xb5,0xa5,0x34,0x34,0x34,0x33 + ,0x03,0xa5,0xa7,0xa8,0xa9,0xb8,0xa7,0x33,0x03,0x23,0xb6,0xb5,0x34,0x33 + ,0x35,0x34,0xa7,0x33,0xa6,0x33,0x33,0xa9,0xa7,0x33,0xa6,0x03,0x22,0xb6 + ,0xa8,0x35,0xba,0xb7,0xb8,0x33,0x33,0xa7,0xb7,0x03,0x34,0xa9,0xaa,0xb5 + ,0xa7,0xa9,0xa9,0xb8,0x35,0xb5,0xa7,0xb6,0xa7,0x35,0xb6,0x23,0x03,0x33 + ,0x33,0xa5,0xb6,0xa7,0xa5,0xb9,0xb5,0xa8,0xa9,0xb9,0x35,0x33,0xb6,0x33 + ,0x34,0x22,0x33,0xa8,0xa7,0xb7,0x33,0xa6,0x33,0x33,0xb5,0x34,0x34,0x33 + ,0x33,0xb7,0xb5,0x33,0xb7,0xa8,0xa6,0xa8,0x33,0x26,0x33,0x35,0x33,0xa6 + ,0xa7,0xb8,0xb6,0xb7,0xa5,0x34,0x34,0x34,0x35,0x29,0xb7,0xa7,0x33,0x33 + ,0x35,0xb5,0x34,0xb5,0x34,0x33,0xa8,0xb6,0x35,0xb6,0x33,0x03,0x33,0xb5 + ,0xb5,0x33,0xa6,0xb7,0xb8,0xb7,0xa8,0xb7,0xaa,0xb7,0x33,0x37,0xb7,0xa7 + ,0xb5,0xb6,0xa8,0xa6,0x35,0x33,0x34,0x34,0x33,0x33,0x03,0x35,0x34,0xa8 + ,0xa9,0xa6,0x25,0x33,0xa9,0xa9,0x35,0x34,0xb6,0x33,0x34,0xb6,0x34,0xa7 + ,0xa8,0xb7,0xb6,0x34,0x35,0x23,0x33,0x33,0x35,0xa6,0x33,0x33,0x33,0xb5 + ,0x33,0xa8,0xa6,0x33,0x33,0xa7,0x34,0xb5,0xa6,0x34,0x33,0xb6,0x22,0x35 + ,0xb6,0xb6,0xb6,0xa6,0x34,0xa5,0xa6,0xa5,0x34,0xa7,0x33,0x35,0x35,0xa8 + ,0x33,0xa6,0x33,0x33,0x34,0x34,0x23,0x33,0x34,0xa7,0xab,0xb6,0xb7,0xa6 + ,0x34,0xa6,0xa5,0xb7,0x34,0xa8,0x33,0x34,0xb6,0x33,0xb6,0xa7,0xb6,0x33 + ,0x33,0x33,0x33,0x34,0x35,0xa7,0x03,0x03,0x03,0xb5,0x34,0x34,0x33,0x22 + ,0x03,0x34,0x34,0xa7,0xb6,0xb6,0xb5,0x33,0x33,0xa5,0xb7,0x33,0xa8,0xaa + ,0xb7,0xb6,0x35,0xa5,0xa7,0xa6,0xa6,0xa6,0xb6,0xa7,0xa7,0x33,0x33,0xa5 + ,0x23,0x33,0x33,0x03,0x33,0xb7,0xb6,0xa6,0xa7,0xb7,0xa5,0x35,0xa9,0xa9 + ,0x34,0x33,0x34,0xa7,0xa7,0x35,0x03,0x34,0xa6,0xa6,0xb6,0xa7,0xb5,0x33 + ,0xb5,0x35,0x35,0x35,0xa7,0xa6,0xa7,0xb7,0xa8,0x35,0xb5,0xa7,0x33,0x33 + ,0xa8,0x34,0x33,0x34,0xa7,0xb8,0x03,0x23,0x33,0x33,0xb5,0xa6,0x03,0x35 + ,0xa9,0xa7,0x35,0x34,0x35,0x35,0x33,0x34,0x34,0x33,0x35,0x34,0xb5,0xa6 + ,0xb5,0xa6,0x33,0x34,0xa7,0xa8,0x35,0x22,0x34,0xa8,0xb8,0xa6,0xb6,0xb6 + ,0xb5,0xb5 +}; + const unsigned char spriteStatue[] = { 32, 32 // width, height ,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x00 @@ -959,7 +1037,7 @@ const unsigned char spriteTorch2[] = ,0x8f,0x8f }; -const unsigned char *textures[] = {texture1, texture2, texture3, texture4}; +const unsigned char *textures[] = {texture1, texture2, texture3, texture4, texture5}; #define withinMapReturn(what,whatElse)\ if (x >= 0 && x < LEVEL_X_RES && y >= 0 && y < LEVEL_Y_RES)\ @@ -1028,7 +1106,7 @@ int16_t intensity; else { color = pixel->isFloor ? - (pixel->height == RCL_FLOOR_TEXCOORDS_HEIGHT ? sampleImage(texture1,pixel->texCoords.x / 2,pixel->texCoords.y / 2) : 8) : + (pixel->height == RCL_FLOOR_TEXCOORDS_HEIGHT ? sampleImage(texture5,pixel->texCoords.x / 2,pixel->texCoords.y / 2) : HUE(1)) : 18; color = addIntensity(color,intensity);