Add wheat

Author: Vogtinator

blockrenderer.cpp

@@ -7,6 +7,7 @@
 #include "glassrenderer.h"
 #include "leavesrenderer.h"
 #include "torchrenderer.h"
+#include "wheatrenderer.h"
 
 UniversalBlockRenderer global_block_renderer;
 
@@ -143,6 +144,7 @@ UniversalBlockRenderer::UniversalBlockRenderer()
     map[BLOCK_TORCH] = std::make_shared<TorchRenderer>();
     map[BLOCK_WATER] = std::make_shared<FluidRenderer>(13, 12, "Water");
     map[BLOCK_LAVA] = std::make_shared<FluidRenderer>(13, 14, "Lava");
+    map[BLOCK_WHEAT] = std::make_shared<WheatRenderer>();
 
     auto flower_renderer = std::make_shared<BillboardRenderer>();
     flower_renderer->setEntry(0, 12, 0, "Red flower", BLOCK_SIZE, BLOCK_SIZE/2, BLOCK_SIZE);

chunk.cpp

@@ -390,7 +390,7 @@ void Chunk::render()
     }
 }
 
-BLOCK_WDATA Chunk::getLocalBlock(const int x, const int y, const int z)
+BLOCK_WDATA Chunk::getLocalBlock(const int x, const int y, const int z) const
 {
     return blocks[x][y][z];
 }
@@ -433,7 +433,7 @@ void Chunk::changeLocalBlock(const int x, const int y, const int z, const BLOCK_
     global_block_renderer.addedBlock(block, x, y, z, *this);
 }
 
-BLOCK_WDATA Chunk::getGlobalBlockRelative(int x, int y, int z)
+BLOCK_WDATA Chunk::getGlobalBlockRelative(const int x, const int y, const int z) const
 {
     if(inBounds(x, y, z))
         return getLocalBlock(x, y, z);

chunk.h

@@ -28,10 +28,10 @@ class Chunk
     void logic();
     void render();
     void setDirty() { render_dirty = true; }
-    BLOCK_WDATA getLocalBlock(const int x, const int y, const int z);
+    BLOCK_WDATA getLocalBlock(const int x, const int y, const int z) const;
     void setLocalBlock(const int x, const int y, const int z, const BLOCK_WDATA block);
     void changeLocalBlock(const int x, const int y, const int z, const BLOCK_WDATA block); //Calls removeBlock and addBlock
-    BLOCK_WDATA getGlobalBlockRelative(int x, int y, int z);
+    BLOCK_WDATA getGlobalBlockRelative(const int x, const int y, const int z) const;
     void setGlobalBlockRelative(const int x, const int y, const int z, const BLOCK_WDATA block);
     AABB &getAABB() { return aabb; }
     bool intersects(AABB &other);

main.cpp

@@ -65,6 +65,7 @@ static const BLOCK_WDATA user_selectable[] = {
     getBLOCKWDATA(BLOCK_FLOWER, 1),
     getBLOCKWDATA(BLOCK_MUSHROOM, 0),
     getBLOCKWDATA(BLOCK_MUSHROOM, 1),
+    getBLOCKWDATA(BLOCK_WHEAT, 0),
     BLOCK_SPIDERWEB,
     BLOCK_TORCH,
     BLOCK_CAKE

terrain.h

@@ -52,7 +52,8 @@ constexpr BLOCK BLOCK_MUSHROOM = 131; //Data: Mushroom type
 constexpr BLOCK BLOCK_DOOR = 132; //Data: (top: 1<<7) | BLOCK_SIDE
 constexpr BLOCK BLOCK_WATER = 133; //Data: range
 constexpr BLOCK BLOCK_LAVA = 134; //Data: range
-constexpr BLOCK BLOCK_SPECIAL_LAST = BLOCK_MUSHROOM;
+constexpr BLOCK BLOCK_WHEAT = 135; //Data: growth
+constexpr BLOCK BLOCK_SPECIAL_LAST = BLOCK_WHEAT;
 
 constexpr uint8_t RANGE_WATER = 5;
 constexpr uint8_t RANGE_LAVA = 3;

wheatrenderer.cpp

@@ -0,0 +1,61 @@
+#include <cstdlib>
+
+#include "wheatrenderer.h"
+
+void WheatRenderer::renderSpecialBlock(const BLOCK_WDATA block, GLFix x, GLFix y, GLFix z, Chunk &c)
+{
+    BlockRenderer::renderBillboard((x - c.absX()) / BLOCK_SIZE, (y - c.absY()) / BLOCK_SIZE, (z - c.absZ()) / BLOCK_SIZE, terrain_atlas[8 + getBLOCKDATA(block)][5].current, c);
+}
+
+AABB WheatRenderer::getAABB(const BLOCK_WDATA block, GLFix x, GLFix y, GLFix z)
+{
+    const GLFix height = BLOCK_SIZE / max_growth * getBLOCKDATA(block);
+
+    return {x, y, z, x + BLOCK_SIZE, y + height, z + BLOCK_SIZE};
+}
+
+void WheatRenderer::drawPreview(const BLOCK_WDATA /*block*/, TEXTURE &dest, int x, int y)
+{
+    BlockRenderer::drawTextureAtlasEntry(*terrain_resized, terrain_atlas[12][5].resized, true, dest, x, y);
+}
+
+void WheatRenderer::tick(const BLOCK_WDATA block, int local_x, int local_y, int local_z, Chunk &c)
+{
+    //If not irrigated, it's instantly withered (growth of 0)
+    if(!isIrrigated(local_x, local_y, local_z, c))
+        return c.setLocalBlock(local_x, local_y, local_z, getBLOCKWDATA(getBLOCK(block), 0));
+
+    //Grow only if lucky
+    if(rand() % 30 != 0)
+        return;
+
+    const uint8_t growth = getBLOCKDATA(block);
+    if(growth == max_growth)
+        return;
+
+    c.setLocalBlock(local_x, local_y, local_z, getBLOCKWDATA(getBLOCK(block), growth + 1));
+}
+
+void WheatRenderer::addedBlock(const BLOCK_WDATA /*block*/, int local_x, int local_y, int local_z, Chunk &c)
+{
+    if(!isIrrigated(local_x, local_y, local_z, c))
+        return c.setLocalBlock(local_x, local_y, local_z, BLOCK_AIR);
+}
+
+const char *WheatRenderer::getName(const BLOCK_WDATA)
+{
+    return "Wheat";
+}
+
+//To be irrigated, a block of water must be adjacent to the block underneath, which has to be dirt or grass
+bool WheatRenderer::isIrrigated(const int local_x, const int local_y, const int local_z, const Chunk &c)
+{
+    const BLOCK underneath = c.getGlobalBlockRelative(local_x, local_y - 1, local_z);
+    if(underneath != BLOCK_DIRT && underneath != BLOCK_GRASS)
+        return false;
+
+    return getBLOCK(c.getGlobalBlockRelative(local_x - 1, local_y - 1, local_z)) == BLOCK_WATER
+            || getBLOCK(c.getGlobalBlockRelative(local_x + 1, local_y - 1, local_z)) == BLOCK_WATER
+            || getBLOCK(c.getGlobalBlockRelative(local_x, local_y - 1, local_z - 1)) == BLOCK_WATER
+            || getBLOCK(c.getGlobalBlockRelative(local_x, local_y - 1, local_z + 1)) == BLOCK_WATER;
+}

wheatrenderer.h

@@ -0,0 +1,35 @@
+#ifndef WHEATRENDERER_H
+#define WHEATRENDERER_H
+
+#include "blockrenderer.h"
+
+class WheatRenderer : public BlockRenderer
+{
+public:
+    virtual void renderSpecialBlock(const BLOCK_WDATA block, GLFix x, GLFix y, GLFix z, Chunk &c) override;
+    virtual void geometryNormalBlock(const BLOCK_WDATA, const int /*local_x*/, const int /*local_y*/, const int /*local_z*/, const BLOCK_SIDE /*side*/, Chunk &/*c*/) override {};
+    virtual bool isOpaque(const BLOCK_WDATA /*block*/) override { return false; }
+    virtual bool isObstacle(const BLOCK_WDATA /*block*/) override { return false; }
+    virtual bool isOriented(const BLOCK_WDATA /*block*/) override { return false; }
+    virtual bool isFullyOriented(const BLOCK_WDATA /*block*/) override { return false; }
+
+    virtual bool isBlockShaped(const BLOCK_WDATA /*block*/) override { return false; }
+    virtual AABB getAABB(const BLOCK_WDATA, GLFix x, GLFix y, GLFix z) override;
+
+    virtual void drawPreview(const BLOCK_WDATA, TEXTURE &dest, int x, int y) override;
+
+    virtual bool action(const BLOCK_WDATA /*block*/, const int /*local_x*/, const int /*local_y*/, const int /*local_z*/, Chunk &/*c*/) override { return false; };
+    virtual void tick(const BLOCK_WDATA /*block*/, int /*local_x*/, int /*local_y*/, int /*local_z*/, Chunk &/*c*/) override;
+    virtual void updateBlock(const BLOCK_WDATA /*block*/, int /*local_x*/, int /*local_y*/, int /*local_z*/, Chunk &/*c*/) override {}
+    virtual void addedBlock(const BLOCK_WDATA block, int local_x, int local_y, int local_z, Chunk &c) override;
+    virtual void removedBlock(const BLOCK_WDATA /*block*/, int /*local_x*/, int /*local_y*/, int /*local_z*/, Chunk &/*c*/) override {}
+
+    virtual const char* getName(const BLOCK_WDATA) override;
+
+    bool isIrrigated(const int local_x, const int local_y, const int local_z, const Chunk &c);
+
+protected:
+    constexpr static int max_growth = 7;
+};
+
+#endif // WHEATRENDERER_H

world.cpp

@@ -38,7 +38,7 @@ constexpr int getChunk(const int global)
     return global >> 3;
 }
 
-BLOCK_WDATA World::getBlock(int x, int y, int z) const
+BLOCK_WDATA World::getBlock(const int x, const int y, const int z) const
 {
     int chunk_x = getChunk(x), chunk_y = getChunk(y), chunk_z = getChunk(z);
 

world.h

@@ -19,7 +19,7 @@ class World
     World();
     ~World();
     void generateSeed();
-    BLOCK_WDATA getBlock(int x, int y, int z) const;
+    BLOCK_WDATA getBlock(const int x, const int y, const int z) const;
     void setBlock(const int x, const int y, const int z, const BLOCK_WDATA block);
     void changeBlock(const int x, const int y, const int z, const BLOCK_WDATA block);
     void setPosition(int x, int y, int z);