LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / content_mapblock.h

diff --git a/src/content_mapblock.h b/src/content_mapblock.h
index c8425024f11f0a2f7c2231290348085c07aa3145..51c5fc6ea70cb1bf3009a2eb82731700e6233b87 100644 (file)
--- a/src/content_mapblock.h
+++ b/src/content_mapblock.h
@@ -39,7 +39,6 @@ public:
        MeshCollector *collector;
 
        INodeDefManager *nodedef;
-       scene::ISceneManager *smgr;
        scene::IMeshManipulator *meshmanip;
 
 // options
@@ -60,15 +59,17 @@ public:
 // lighting
        void getSmoothLightFrame();
        u16 blendLight(const v3f &vertex_pos);
-       video::SColor blendLight(const v3f &vertex_pos, video::SColor tile_color);
-       video::SColor blendLight(const v3f &vertex_pos, const v3f &vertex_normal, video::SColor tile_color);
+       video::SColor blendLightColor(const v3f &vertex_pos);
+       video::SColor blendLightColor(const v3f &vertex_pos, const v3f &vertex_normal);
 
-       void useTile(int index, bool disable_backface_culling);
-       void useDefaultTile(bool set_color = true);
-       TileSpec getTile(const v3s16 &direction);
+       void useTile(int index = 0, u8 set_flags = MATERIAL_FLAG_CRACK_OVERLAY,
+               u8 reset_flags = 0, bool special = false);
+       void getTile(v3s16 direction, TileSpec *tile);
+       void getSpecialTile(int index, TileSpec *tile, bool apply_crack = false);
 
 // face drawing
-       void drawQuad(v3f *vertices, const v3s16 &normal = v3s16(0, 0, 0));
+       void drawQuad(v3f *vertices, const v3s16 &normal = v3s16(0, 0, 0),
+               float vertical_tiling = 1.0);
 
 // cuboid drawing!
        void drawCuboid(const aabb3f &box, TileSpec *tiles, int tilecount,
@@ -93,13 +94,12 @@ public:
        NeighborData liquid_neighbors[3][3];
        f32 corner_levels[2][2];
 
-       void prepareLiquidNodeDrawing(bool flowing);
-       void getLiquidNeighborhood(bool flowing);
-       void resetCornerLevels();
+       void prepareLiquidNodeDrawing();
+       void getLiquidNeighborhood();
        void calculateCornerLevels();
        f32 getCornerLevel(int i, int k);
-       void drawLiquidSides(bool flowing);
-       void drawLiquidTop(bool flowing);
+       void drawLiquidSides();
+       void drawLiquidTop();
 
 // raillike-specific
        // name of the group that enables connecting to raillike nodes of different kind
@@ -113,22 +113,25 @@ public:
        int rotate_degree;
        bool random_offset_Y;
        int face_num;
+       float plant_height;
 
        void drawPlantlikeQuad(float rotation, float quad_offset = 0,
                bool offset_top_only = false);
+       void drawPlantlike();
 
 // firelike-specific
        void drawFirelikeQuad(float rotation, float opening_angle,
                float offset_h, float offset_v = 0.0);
 
 // drawtypes
-       void drawLiquidNode(bool flowing);
+       void drawLiquidNode();
        void drawGlasslikeNode();
        void drawGlasslikeFramedNode();
        void drawAllfacesNode();
        void drawTorchlikeNode();
        void drawSignlikeNode();
        void drawPlantlikeNode();
+       void drawPlantlikeRootedNode();
        void drawFirelikeNode();
        void drawFencelikeNode();
        void drawRaillikeNode();