/*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "gamedef.h"
#include "mesh.h"
#include "content_mapblock.h"
+#include "noise.h"
+#include "shader.h"
+#include "settings.h"
+#include "util/directiontables.h"
+
+float srgb_linear_multiply(float f, float m, float max)
+{
+ f = f * f; // SRGB -> Linear
+ f *= m;
+ f = sqrt(f); // Linear -> SRGB
+ if(f > max)
+ f = max;
+ return f;
+}
/*
MeshMakeData
// Get map
Map *map = block->getParent();
- for(u16 i=0; i<6; i++)
+ for(u16 i=0; i<26; i++)
{
- const v3s16 &dir = g_6dirs[i];
+ const v3s16 &dir = g_26dirs[i];
v3s16 bp = m_blockpos + dir;
MapBlock *b = map->getBlockNoCreateNoEx(bp);
if(b)
};
static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3,
- v3f p, v3s16 dir, v3f scale, core::array<FastFace> &dest)
+ v3f p, v3s16 dir, v3f scale, u8 light_source, std::vector<FastFace> &dest)
{
FastFace face;
v3f vertex_pos[4];
v3s16 vertex_dirs[4];
getNodeVertexDirs(dir, vertex_dirs);
+ v3s16 t;
+ switch (tile.rotation)
+ {
+ case 0:
+ break;
+ case 1: //R90
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[3];
+ vertex_dirs[3] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[1];
+ vertex_dirs[1] = t;
+ break;
+ case 2: //R180
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[2];
+ vertex_dirs[2] = t;
+ t = vertex_dirs[1];
+ vertex_dirs[1] = vertex_dirs[3];
+ vertex_dirs[3] = t;
+ break;
+ case 3: //R270
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[1];
+ vertex_dirs[1] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[3];
+ vertex_dirs[3] = t;
+ break;
+ case 4: //FXR90
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[3];
+ vertex_dirs[3] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[1];
+ vertex_dirs[1] = t;
+ tile.texture.pos.Y += tile.texture.size.Y;
+ tile.texture.size.Y *= -1;
+ break;
+ case 5: //FXR270
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[1];
+ vertex_dirs[1] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[3];
+ vertex_dirs[3] = t;
+ tile.texture.pos.Y += tile.texture.size.Y;
+ tile.texture.size.Y *= -1;
+ break;
+ case 6: //FYR90
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[3];
+ vertex_dirs[3] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[1];
+ vertex_dirs[1] = t;
+ tile.texture.pos.X += tile.texture.size.X;
+ tile.texture.size.X *= -1;
+ break;
+ case 7: //FYR270
+ t = vertex_dirs[0];
+ vertex_dirs[0] = vertex_dirs[1];
+ vertex_dirs[1] = vertex_dirs[2];
+ vertex_dirs[2] = vertex_dirs[3];
+ vertex_dirs[3] = t;
+ tile.texture.pos.X += tile.texture.size.X;
+ tile.texture.size.X *= -1;
+ break;
+ case 8: //FX
+ tile.texture.pos.Y += tile.texture.size.Y;
+ tile.texture.size.Y *= -1;
+ break;
+ case 9: //FY
+ tile.texture.pos.X += tile.texture.size.X;
+ tile.texture.size.X *= -1;
+ break;
+ default:
+ break;
+ }
for(u16 i=0; i<4; i++)
{
vertex_pos[i] = v3f(
float h = tile.texture.size.Y;
face.vertices[0] = video::S3DVertex(vertex_pos[0], normal,
- MapBlock_LightColor(alpha, li0),
+ MapBlock_LightColor(alpha, li0, light_source),
core::vector2d<f32>(x0+w*abs_scale, y0+h));
face.vertices[1] = video::S3DVertex(vertex_pos[1], normal,
- MapBlock_LightColor(alpha, li1),
+ MapBlock_LightColor(alpha, li1, light_source),
core::vector2d<f32>(x0, y0+h));
face.vertices[2] = video::S3DVertex(vertex_pos[2], normal,
- MapBlock_LightColor(alpha, li2),
+ MapBlock_LightColor(alpha, li2, light_source),
core::vector2d<f32>(x0, y0));
face.vertices[3] = video::S3DVertex(vertex_pos[3], normal,
- MapBlock_LightColor(alpha, li3),
+ MapBlock_LightColor(alpha, li3, light_source),
core::vector2d<f32>(x0+w*abs_scale, y0));
face.tile = tile;
spec.material_flags |= MATERIAL_FLAG_CRACK;
spec.texture = data->m_gamedef->tsrc()->getTextureRawAP(spec.texture);
}
+ // If animated, replace tile texture with one without texture atlas
+ if(spec.material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
+ {
+ spec.texture = data->m_gamedef->tsrc()->getTextureRawAP(spec.texture);
+ }
return spec;
}
// 5 = (0,0,-1)
// 6 = (0,-1,0)
// 7 = (-1,0,0)
- u8 dir_i = (dir.X + 2 * dir.Y + 3 * dir.Z) & 7;
+ u8 dir_i = ((dir.X + 2 * dir.Y + 3 * dir.Z) & 7)*2;
// Get rotation for things like chests
u8 facedir = mn.getFaceDir(ndef);
- assert(facedir <= 3);
-
- static const u8 dir_to_tile[4 * 8] =
+ assert(facedir <= 23);
+ static const u16 dir_to_tile[24 * 16] =
{
- // 0 +X +Y +Z 0 -Z -Y -X
- 0, 2, 0, 4, 0, 5, 1, 3, // facedir = 0
- 0, 4, 0, 3, 0, 2, 1, 5, // facedir = 1
- 0, 3, 0, 5, 0, 4, 1, 2, // facedir = 2
- 0, 5, 0, 2, 0, 3, 1, 4, // facedir = 3
+ // 0 +X +Y +Z -Z -Y -X -> value=tile,rotation
+ 0,0, 2,0 , 0,0 , 4,0 , 0,0, 5,0 , 1,0 , 3,0 , // rotate around y+ 0 - 3
+ 0,0, 4,0 , 0,3 , 3,0 , 0,0, 2,0 , 1,1 , 5,0 ,
+ 0,0, 3,0 , 0,2 , 5,0 , 0,0, 4,0 , 1,2 , 2,0 ,
+ 0,0, 5,0 , 0,1 , 2,0 , 0,0, 3,0 , 1,3 , 4,0 ,
+
+ 0,0, 2,3 , 5,0 , 0,2 , 0,0, 1,0 , 4,2 , 3,1 , // rotate around z+ 4 - 7
+ 0,0, 4,3 , 2,0 , 0,3 , 0,0, 1,1 , 3,2 , 5,1 ,
+ 0,0, 3,3 , 4,0 , 0,0 , 0,0, 1,2 , 5,2 , 2,1 ,
+ 0,0, 5,3 , 3,0 , 0,1 , 0,0, 1,3 , 2,2 , 4,1 ,
+
+ 0,0, 2,1 , 4,2 , 1,2 , 0,0, 0,0 , 5,0 , 3,3 , // rotate around z- 8 - 11
+ 0,0, 4,1 , 3,2 , 1,3 , 0,0, 0,3 , 2,0 , 5,3 ,
+ 0,0, 3,1 , 5,2 , 1,0 , 0,0, 0,2 , 4,0 , 2,3 ,
+ 0,0, 5,1 , 2,2 , 1,1 , 0,0, 0,1 , 3,0 , 4,3 ,
+
+ 0,0, 0,3 , 3,3 , 4,1 , 0,0, 5,3 , 2,3 , 1,3 , // rotate around x+ 12 - 15
+ 0,0, 0,2 , 5,3 , 3,1 , 0,0, 2,3 , 4,3 , 1,0 ,
+ 0,0, 0,1 , 2,3 , 5,1 , 0,0, 4,3 , 3,3 , 1,1 ,
+ 0,0, 0,0 , 4,3 , 2,1 , 0,0, 3,3 , 5,3 , 1,2 ,
+
+ 0,0, 1,1 , 2,1 , 4,3 , 0,0, 5,1 , 3,1 , 0,1 , // rotate around x- 16 - 19
+ 0,0, 1,2 , 4,1 , 3,3 , 0,0, 2,1 , 5,1 , 0,0 ,
+ 0,0, 1,3 , 3,1 , 5,3 , 0,0, 4,1 , 2,1 , 0,3 ,
+ 0,0, 1,0 , 5,1 , 2,3 , 0,0, 3,1 , 4,1 , 0,2 ,
+
+ 0,0, 3,2 , 1,2 , 4,2 , 0,0, 5,2 , 0,2 , 2,2 , // rotate around y- 20 - 23
+ 0,0, 5,2 , 1,3 , 3,2 , 0,0, 2,2 , 0,1 , 4,2 ,
+ 0,0, 2,2 , 1,0 , 5,2 , 0,0, 4,2 , 0,0 , 3,2 ,
+ 0,0, 4,2 , 1,1 , 2,2 , 0,0, 3,2 , 0,3 , 5,2
+
};
- u8 tileindex = dir_to_tile[facedir*8 + dir_i];
- return getNodeTileN(mn, p, tileindex, data);
+ u16 tile_index=facedir*16 + dir_i;
+ TileSpec spec = getNodeTileN(mn, p, dir_to_tile[tile_index], data);
+ spec.rotation=dir_to_tile[tile_index + 1];
+ std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id);
+ spec.texture = data->m_gamedef->tsrc()->getTexture(name);
+ return spec;
}
static void getTileInfo(
v3s16 &p_corrected,
v3s16 &face_dir_corrected,
u16 *lights,
- TileSpec &tile
+ TileSpec &tile,
+ u8 &light_source
)
{
VoxelManipulator &vmanip = data->m_vmanip;
tile = tile0;
p_corrected = p;
face_dir_corrected = face_dir;
+ light_source = ndef->get(n0).light_source;
}
else
{
tile = tile1;
p_corrected = p + face_dir;
face_dir_corrected = -face_dir;
+ light_source = ndef->get(n1).light_source;
}
// eg. water and glass
if(equivalent)
tile.material_flags |= MATERIAL_FLAG_BACKFACE_CULLING;
-
+
if(data->m_smooth_lighting == false)
{
lights[0] = lights[1] = lights[2] = lights[3] =
v3f translate_dir_f,
v3s16 face_dir,
v3f face_dir_f,
- core::array<FastFace> &dest)
+ std::vector<FastFace> &dest)
{
v3s16 p = startpos;
v3s16 face_dir_corrected;
u16 lights[4] = {0,0,0,0};
TileSpec tile;
+ u8 light_source = 0;
getTileInfo(data, p, face_dir,
makes_face, p_corrected, face_dir_corrected,
- lights, tile);
+ lights, tile, light_source);
for(u16 j=0; j<MAP_BLOCKSIZE; j++)
{
v3s16 next_face_dir_corrected;
u16 next_lights[4] = {0,0,0,0};
TileSpec next_tile;
+ u8 next_light_source = 0;
// If at last position, there is nothing to compare to and
// the face must be drawn anyway
getTileInfo(data, p_next, face_dir,
next_makes_face, next_p_corrected,
next_face_dir_corrected, next_lights,
- next_tile);
+ next_tile, next_light_source);
if(next_makes_face == makes_face
&& next_p_corrected == p_corrected + translate_dir
&& next_lights[1] == lights[1]
&& next_lights[2] == lights[2]
&& next_lights[3] == lights[3]
- && next_tile == tile)
+ && next_tile == tile
+ && tile.rotation == 0
+ && next_light_source == light_source)
{
next_is_different = false;
}
}
makeFastFace(tile, lights[0], lights[1], lights[2], lights[3],
- sp, face_dir_corrected, scale,
+ sp, face_dir_corrected, scale, light_source,
dest);
g_profiler->avg("Meshgen: faces drawn by tiling", 0);
lights[2] = next_lights[2];
lights[3] = next_lights[3];
tile = next_tile;
+ light_source = next_light_source;
}
p = p_next;
}
static void updateAllFastFaceRows(MeshMakeData *data,
- core::array<FastFace> &dest)
+ std::vector<FastFace> &dest)
{
/*
Go through every y,z and get top(y+) faces in rows of x+
// 24-155ms for MAP_BLOCKSIZE=32 (NOTE: probably outdated)
//TimeTaker timer1("MapBlockMesh()");
- core::array<FastFace> fastfaces_new;
+ std::vector<FastFace> fastfaces_new;
/*
We are including the faces of the trailing edges of the block.
Convert MeshCollector to SMesh
Also store animation info
*/
+ bool enable_shaders = (g_settings->getS32("enable_shaders") > 0);
+ video::E_MATERIAL_TYPE shadermat1 = m_gamedef->getShaderSource()->
+ getShader("test_shader_1").material;
+ video::E_MATERIAL_TYPE shadermat2 = m_gamedef->getShaderSource()->
+ getShader("test_shader_2").material;
for(u32 i = 0; i < collector.prebuffers.size(); i++)
{
PreMeshBuffer &p = collector.prebuffers[i];
crack_basename += "^[crack";
m_crack_materials.insert(std::make_pair(i, crack_basename));
}
- // - Lighting
- for(u32 j = 0; j < p.vertices.size(); j++)
+ // - Texture animation
+ if(p.tile.material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
{
- video::SColor &vc = p.vertices[j].Color;
- u8 day = vc.getRed();
- u8 night = vc.getGreen();
- finalColorBlend(vc, day, night, 1000);
- if(day != night)
- m_daynight_diffs[i][j] = std::make_pair(day, night);
+ ITextureSource *tsrc = data->m_gamedef->tsrc();
+ // Add to MapBlockMesh in order to animate these tiles
+ m_animation_tiles[i] = p.tile;
+ m_animation_frames[i] = 0;
+ if(g_settings->getBool("desynchronize_mapblock_texture_animation")){
+ // Get starting position from noise
+ m_animation_frame_offsets[i] = 100000 * (2.0 + noise3d(
+ data->m_blockpos.X, data->m_blockpos.Y,
+ data->m_blockpos.Z, 0));
+ } else {
+ // Play all synchronized
+ m_animation_frame_offsets[i] = 0;
+ }
+ // Replace tile texture with the first animation frame
+ std::ostringstream os(std::ios::binary);
+ os<<tsrc->getTextureName(p.tile.texture.id);
+ os<<"^[verticalframe:"<<(int)p.tile.animation_frame_count<<":0";
+ p.tile.texture = tsrc->getTexture(os.str());
+ }
+ // - Classic lighting (shaders handle this by themselves)
+ if(!enable_shaders)
+ {
+ for(u32 j = 0; j < p.vertices.size(); j++)
+ {
+ video::SColor &vc = p.vertices[j].Color;
+ // Set initial real color and store for later updates
+ u8 day = vc.getRed();
+ u8 night = vc.getGreen();
+ finalColorBlend(vc, day, night, 1000);
+ if(day != night)
+ m_daynight_diffs[i][j] = std::make_pair(day, night);
+ // Brighten topside (no shaders)
+ if(p.vertices[j].Normal.Y > 0.5)
+ {
+ vc.setRed (srgb_linear_multiply(vc.getRed(), 1.3, 255.0));
+ vc.setGreen(srgb_linear_multiply(vc.getGreen(), 1.3, 255.0));
+ vc.setBlue (srgb_linear_multiply(vc.getBlue(), 1.3, 255.0));
+ }
+ }
}
-
// Create material
video::SMaterial material;
material.MaterialType
= video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
material.setTexture(0, p.tile.texture.atlas);
- p.tile.applyMaterialOptions(material);
+ if(enable_shaders)
+ p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2);
+ else
+ p.tile.applyMaterialOptions(material);
// Create meshbuffer
m_mesh->addMeshBuffer(buf);
// Mesh grabbed it
buf->drop();
- buf->append(p.vertices.pointer(), p.vertices.size(),
- p.indices.pointer(), p.indices.size());
+ buf->append(&p.vertices[0], p.vertices.size(),
+ &p.indices[0], p.indices.size());
}
/*
// Check if animation is required for this mesh
m_has_animation =
!m_crack_materials.empty() ||
- !m_daynight_diffs.empty();
+ !m_daynight_diffs.empty() ||
+ !m_animation_tiles.empty();
}
MapBlockMesh::~MapBlockMesh()
m_last_crack = crack;
}
+
+ // Texture animation
+ for(std::map<u32, TileSpec>::iterator
+ i = m_animation_tiles.begin();
+ i != m_animation_tiles.end(); i++)
+ {
+ const TileSpec &tile = i->second;
+ // Figure out current frame
+ int frameoffset = m_animation_frame_offsets[i->first];
+ int frame = (int)(time * 1000 / tile.animation_frame_length_ms
+ + frameoffset) % tile.animation_frame_count;
+ // If frame doesn't change, skip
+ if(frame == m_animation_frames[i->first])
+ continue;
+
+ m_animation_frames[i->first] = frame;
+
+ scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i->first);
+ ITextureSource *tsrc = m_gamedef->getTextureSource();
+
+ // Create new texture name from original
+ std::ostringstream os(std::ios::binary);
+ os<<tsrc->getTextureName(tile.texture.id);
+ os<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
+ // Set the texture
+ AtlasPointer ap = tsrc->getTexture(os.str());
+ buf->getMaterial().setTexture(0, ap.atlas);
+ }
// Day-night transition
if(daynight_ratio != m_last_daynight_ratio)
u8 night = j->second.second;
finalColorBlend(vertices[vertexIndex].Color,
day, night, daynight_ratio);
+ // Brighten topside (no shaders)
+ if(vertices[vertexIndex].Normal.Y > 0.5)
+ {
+ video::SColor &vc = vertices[vertexIndex].Color;
+ vc.setRed (srgb_linear_multiply(vc.getRed(), 1.3, 255.0));
+ vc.setGreen(srgb_linear_multiply(vc.getGreen(), 1.3, 255.0));
+ vc.setBlue (srgb_linear_multiply(vc.getBlue(), 1.3, 255.0));
+ }
}
}
m_last_daynight_ratio = daynight_ratio;
projects / dragonfireclient.git / blobdiff