Fix usage of destroyed mutex

[minetest.git] / src / mapblock_mesh.h

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index d5733120b8b3cce4a6a4a9979e836a35991f2a22..b334ce46914c4fae321bdb9c5fa962574c63b7e6 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPBLOCK_MESH_HEADER
 #define MAPBLOCK_MESH_HEADER
 
-#include "common_irrlicht.h"
-#include "tile.h"
+#include "irrlichttypes_extrabloated.h"
+#include "client/tile.h"
 #include "voxel.h"
 #include <map>
 
@@ -39,10 +39,15 @@ struct MeshMakeData
        VoxelManipulator m_vmanip;
        v3s16 m_blockpos;
        v3s16 m_crack_pos_relative;
+       v3s16 m_highlighted_pos_relative;
        bool m_smooth_lighting;
+       bool m_show_hud;
+       video::SColor m_highlight_mesh_color;
+
        IGameDef *m_gamedef;
+       bool m_use_shaders;
 
-       MeshMakeData(IGameDef *gamedef);
+       MeshMakeData(IGameDef *gamedef, bool use_shaders);
 
        /*
                Copy central data directly from block, and other data from
@@ -60,6 +65,11 @@ struct MeshMakeData
        */
        void setCrack(int crack_level, v3s16 crack_pos);
 
+       /*
+               Set the highlighted node position
+       */
+
+       void setHighlighted(v3s16 highlighted_pos, bool show_hud);
        /*
                Enable or disable smooth lighting
        */
@@ -81,7 +91,7 @@ class MapBlockMesh
 {
 public:
        // Builds the mesh given
-       MapBlockMesh(MeshMakeData *data);
+       MapBlockMesh(MeshMakeData *data, v3s16 camera_offset);
        ~MapBlockMesh();
 
        // Main animation function, parameters:
@@ -107,11 +117,18 @@ class MapBlockMesh
                if(m_animation_force_timer > 0)
                        m_animation_force_timer--;
        }
+       
+       void updateCameraOffset(v3s16 camera_offset);
 
 private:
        scene::SMesh *m_mesh;
        IGameDef *m_gamedef;
 
+       bool m_enable_shaders;
+       bool m_enable_highlighting;
+
+       video::SColor m_highlight_mesh_color;
+       
        // Must animate() be called before rendering?
        bool m_has_animation;
        int m_animation_force_timer;
@@ -121,6 +138,7 @@ class MapBlockMesh
        int m_last_crack;
        // Maps mesh buffer (i.e. material) indices to base texture names
        std::map<u32, std::string> m_crack_materials;
+       std::list<u32> m_highlighted_materials;
 
        // Animation info: texture animationi
        // Maps meshbuffers to TileSpecs
@@ -133,6 +151,9 @@ class MapBlockMesh
        u32 m_last_daynight_ratio;
        // For each meshbuffer, maps vertex indices to (day,night) pairs
        std::map<u32, std::map<u32, std::pair<u8, u8> > > m_daynight_diffs;
+       
+       // Camera offset info -> do we have to translate the mesh?
+       v3s16 m_camera_offset;
 };
 
 
@@ -143,33 +164,43 @@ class MapBlockMesh
 struct PreMeshBuffer
 {
        TileSpec tile;
-       core::array<u16> indices;
-       core::array<video::S3DVertex> vertices;
+       std::vector<u16> indices;
+       std::vector<video::S3DVertex> vertices;
 };
 
 struct MeshCollector
 {
-       core::array<PreMeshBuffer> prebuffers;
+       std::vector<PreMeshBuffer> prebuffers;
 
        void append(const TileSpec &material,
                        const video::S3DVertex *vertices, u32 numVertices,
                        const u16 *indices, u32 numIndices);
+       void append(const TileSpec &material,
+                       const video::S3DVertex *vertices, u32 numVertices,
+                       const u16 *indices, u32 numIndices,
+                       v3f pos, video::SColor c);
 };
 
 // This encodes
 //   alpha in the A channel of the returned SColor
 //   day light (0-255) in the R channel of the returned SColor
 //   night light (0-255) in the G channel of the returned SColor
-inline video::SColor MapBlock_LightColor(u8 alpha, u16 light)
+//   light source (0-255) in the B channel of the returned SColor
+inline video::SColor MapBlock_LightColor(u8 alpha, u16 light, u8 light_source=0)
 {
-       return video::SColor(alpha, (light & 0xff), (light >> 8), 0);
+       return video::SColor(alpha, (light & 0xff), (light >> 8), light_source);
 }
 
 // Compute light at node
-u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data);
-u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, MeshMakeData *data);
+u16 getInteriorLight(MapNode n, s32 increment, INodeDefManager *ndef);
+u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, INodeDefManager *ndef);
 u16 getSmoothLight(v3s16 p, v3s16 corner, MeshMakeData *data);
 
+// Converts from day + night color values (0..255)
+// and a given daynight_ratio to the final SColor shown on screen.
+void finalColorBlend(video::SColor& result,
+               u8 day, u8 night, u32 daynight_ratio);
+
 // Retrieves the TileSpec of a face of a node
 // Adds MATERIAL_FLAG_CRACK if the node is cracked
 TileSpec getNodeTileN(MapNode mn, v3s16 p, u8 tileindex, MeshMakeData *data);