X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapblock_mesh.cpp;h=080131a6f4ee20dd1edf5118eb249c57d8034b9e;hb=5ca336ea9281e87d8a2de95cef337e056266838d;hp=f68a79e411c77f88ee5a41c9788e7af3dad31052;hpb=a0566270d9fa075afa36a7e3e68c690b1b23ba90;p=dragonfireclient.git diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp index f68a79e41..080131a6f 100644 --- a/src/mapblock_mesh.cpp +++ b/src/mapblock_mesh.cpp @@ -32,14 +32,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "settings.h" #include "util/directiontables.h" -float srgb_linear_multiply(float f, float m, float max) +void applyContrast(video::SColor& color, float Factor) { - f = f * f; // SRGB -> Linear - f *= m; - f = sqrt(f); // Linear -> SRGB - if(f > max) - f = max; - return f; + float r = color.getRed(); + float g = color.getGreen(); + float b = color.getBlue(); + color.setRed(irr::core::clamp((int)sqrt(r * r * Factor), 0, 255)); + color.setGreen(irr::core::clamp((int)sqrt(g * g * Factor), 0, 255)); + color.setBlue(irr::core::clamp((int)sqrt(b * b * Factor), 0, 255)); } /* @@ -59,7 +59,7 @@ void MeshMakeData::fill(MapBlock *block) m_blockpos = block->getPos(); v3s16 blockpos_nodes = m_blockpos*MAP_BLOCKSIZE; - + /* Copy data */ @@ -84,7 +84,7 @@ void MeshMakeData::fill(MapBlock *block) Copy neighbors. This is lightning fast. Copying only the borders would be *very* slow. */ - + // Get map Map *map = block->getParent(); @@ -102,7 +102,7 @@ void MeshMakeData::fill(MapBlock *block) void MeshMakeData::fillSingleNode(MapNode *node) { m_blockpos = v3s16(0,0,0); - + v3s16 blockpos_nodes = v3s16(0,0,0); VoxelArea area(blockpos_nodes-v3s16(1,1,1)*MAP_BLOCKSIZE, blockpos_nodes+v3s16(1,1,1)*MAP_BLOCKSIZE*2-v3s16(1,1,1)); @@ -150,9 +150,8 @@ void MeshMakeData::setSmoothLighting(bool smooth_lighting) Single light bank. */ static u8 getInteriorLight(enum LightBank bank, MapNode n, s32 increment, - MeshMakeData *data) + INodeDefManager *ndef) { - INodeDefManager *ndef = data->m_gamedef->ndef(); u8 light = n.getLight(bank, ndef); while(increment > 0) @@ -173,10 +172,10 @@ static u8 getInteriorLight(enum LightBank bank, MapNode n, s32 increment, Calculate non-smooth lighting at interior of node. Both light banks. */ -u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data) +u16 getInteriorLight(MapNode n, s32 increment, INodeDefManager *ndef) { - u16 day = getInteriorLight(LIGHTBANK_DAY, n, increment, data); - u16 night = getInteriorLight(LIGHTBANK_NIGHT, n, increment, data); + u16 day = getInteriorLight(LIGHTBANK_DAY, n, increment, ndef); + u16 night = getInteriorLight(LIGHTBANK_NIGHT, n, increment, ndef); return day | (night << 8); } @@ -185,10 +184,8 @@ u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data) Single light bank. */ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2, - v3s16 face_dir, MeshMakeData *data) + v3s16 face_dir, INodeDefManager *ndef) { - INodeDefManager *ndef = data->m_gamedef->ndef(); - u8 light; u8 l1 = n.getLight(bank, ndef); u8 l2 = n2.getLight(bank, ndef); @@ -206,20 +203,6 @@ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2, //return decode_light(light_source); light = light_source; - // Make some nice difference to different sides - - // This makes light come from a corner - /*if(face_dir.X == 1 || face_dir.Z == 1 || face_dir.Y == -1) - light = diminish_light(diminish_light(light)); - else if(face_dir.X == -1 || face_dir.Z == -1) - light = diminish_light(light);*/ - - // All neighboring faces have different shade (like in minecraft) - if(face_dir.X == 1 || face_dir.X == -1 || face_dir.Y == -1) - light = diminish_light(diminish_light(light)); - else if(face_dir.Z == 1 || face_dir.Z == -1) - light = diminish_light(light); - return decode_light(light); } @@ -227,10 +210,10 @@ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2, Calculate non-smooth lighting at face of node. Both light banks. */ -u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, MeshMakeData *data) +u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, INodeDefManager *ndef) { - u16 day = getFaceLight(LIGHTBANK_DAY, n, n2, face_dir, data); - u16 night = getFaceLight(LIGHTBANK_NIGHT, n, n2, face_dir, data); + u16 day = getFaceLight(LIGHTBANK_DAY, n, n2, face_dir, ndef); + u16 night = getFaceLight(LIGHTBANK_NIGHT, n, n2, face_dir, ndef); return day | (night << 8); } @@ -260,6 +243,12 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data) for(u32 i=0; i<8; i++) { MapNode n = data->m_vmanip.getNodeNoEx(p - dirs8[i]); + + // if it's CONTENT_IGNORE we can't do any light calculations + if (n.getContent() == CONTENT_IGNORE) { + continue; + } + const ContentFeatures &f = ndef->get(n); if(f.light_source > light_source_max) light_source_max = f.light_source; @@ -270,15 +259,14 @@ static u8 getSmoothLight(enum LightBank bank, v3s16 p, MeshMakeData *data) light += decode_light(n.getLight(bank, ndef)); light_count++; } - else if(n.getContent() != CONTENT_IGNORE) - { + else { ambient_occlusion++; } } if(light_count == 0) return 255; - + light /= light_count; // Boost brightness around light sources @@ -326,7 +314,7 @@ u16 getSmoothLight(v3s16 p, v3s16 corner, MeshMakeData *data) else assert(corner.Y == -1); if(corner.Z == 1) p.Z += 1; else assert(corner.Z == -1); - + return getSmoothLight(p, data); } @@ -350,21 +338,15 @@ static void finalColorBlend(video::SColor& result, 1, 4, 6, 6, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - if(b < 0) - b = 0; - if(b > 255) - b = 255; b += emphase_blue_when_dark[b / 8]; + b = irr::core::clamp (b, 0, 255); // Artificial light is yellow-ish static u8 emphase_yellow_when_artificial[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 10, 15, 15, 15 }; rg += emphase_yellow_when_artificial[night/16]; - if(rg < 0) - rg = 0; - if(rg > 255) - rg = 255; + rg = irr::core::clamp (rg, 0, 255); result.setRed(rg); result.setGreen(rg); @@ -448,14 +430,21 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, v3f p, v3s16 dir, v3f scale, u8 light_source, std::vector &dest) { FastFace face; - + // Position is at the center of the cube. v3f pos = p * BS; + float x0 = 0.0; + float y0 = 0.0; + float w = 1.0; + float h = 1.0; + v3f vertex_pos[4]; v3s16 vertex_dirs[4]; getNodeVertexDirs(dir, vertex_dirs); + v3s16 t; + u16 t1; switch (tile.rotation) { case 0: @@ -466,6 +455,11 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, vertex_dirs[3] = vertex_dirs[2]; vertex_dirs[2] = vertex_dirs[1]; vertex_dirs[1] = t; + t1=li0; + li0=li3; + li3=li2; + li2=li1; + li1=t1; break; case 2: //R180 t = vertex_dirs[0]; @@ -474,6 +468,12 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, t = vertex_dirs[1]; vertex_dirs[1] = vertex_dirs[3]; vertex_dirs[3] = t; + t1 = li0; + li0 = li2; + li2 = t1; + t1 = li1; + li1 = li3; + li3 = t1; break; case 3: //R270 t = vertex_dirs[0]; @@ -481,6 +481,11 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, vertex_dirs[1] = vertex_dirs[2]; vertex_dirs[2] = vertex_dirs[3]; vertex_dirs[3] = t; + t1 = li0; + li0 = li1; + li1 = li2; + li2 = li3; + li3 = t1; break; case 4: //FXR90 t = vertex_dirs[0]; @@ -488,8 +493,13 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, 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; + t1 = li0; + li0 = li3; + li3 = li2; + li2 = li1; + li1 = t1; + y0 += h; + h *= -1; break; case 5: //FXR270 t = vertex_dirs[0]; @@ -497,8 +507,13 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, 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; + t1 = li0; + li0 = li1; + li1 = li2; + li2 = li3; + li3 = t1; + y0 += h; + h *= -1; break; case 6: //FYR90 t = vertex_dirs[0]; @@ -506,8 +521,13 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, 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; + t1 = li0; + li0 = li3; + li3 = li2; + li2 = li1; + li1 = t1; + x0 += w; + w *= -1; break; case 7: //FYR270 t = vertex_dirs[0]; @@ -515,20 +535,26 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, 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; + t1 = li0; + li0 = li1; + li1 = li2; + li2 = li3; + li3 = t1; + x0 += w; + w *= -1; break; case 8: //FX - tile.texture.pos.Y += tile.texture.size.Y; - tile.texture.size.Y *= -1; + y0 += h; + h *= -1; break; case 9: //FY - tile.texture.pos.X += tile.texture.size.X; - tile.texture.size.X *= -1; + x0 += w; + w *= -1; break; default: break; } + for(u16 i=0; i<4; i++) { vertex_pos[i] = v3f( @@ -546,7 +572,7 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, vertex_pos[i] += pos; } - f32 abs_scale = 1.; + f32 abs_scale = 1.0; if (scale.X < 0.999 || scale.X > 1.001) abs_scale = scale.X; else if(scale.Y < 0.999 || scale.Y > 1.001) abs_scale = scale.Y; else if(scale.Z < 0.999 || scale.Z > 1.001) abs_scale = scale.Z; @@ -555,11 +581,6 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, u8 alpha = tile.alpha; - float x0 = tile.texture.pos.X; - float y0 = tile.texture.pos.Y; - float w = tile.texture.size.X; - float h = tile.texture.size.Y; - face.vertices[0] = video::S3DVertex(vertex_pos[0], normal, MapBlock_LightColor(alpha, li0, light_source), core::vector2d(x0+w*abs_scale, y0+h)); @@ -574,7 +595,6 @@ static void makeFastFace(TileSpec tile, u16 li0, u16 li1, u16 li2, u16 li3, core::vector2d(x0+w*abs_scale, y0)); face.tile = tile; - dest.push_back(face); } @@ -595,16 +615,16 @@ static u8 face_contents(content_t m1, content_t m2, bool *equivalent, if(m1 == CONTENT_IGNORE || m2 == CONTENT_IGNORE) return 0; - + bool contents_differ = (m1 != m2); - + const ContentFeatures &f1 = ndef->get(m1); const ContentFeatures &f2 = ndef->get(m2); // Contents don't differ for different forms of same liquid if(f1.sameLiquid(f2)) contents_differ = false; - + u8 c1 = f1.solidness; u8 c2 = f2.solidness; @@ -613,12 +633,12 @@ static u8 face_contents(content_t m1, content_t m2, bool *equivalent, if(makes_face == false) return 0; - + if(c1 == 0) c1 = f1.visual_solidness; if(c2 == 0) c2 = f2.visual_solidness; - + if(c1 == c2){ *equivalent = true; // If same solidness, liquid takes precense @@ -627,7 +647,7 @@ static u8 face_contents(content_t m1, content_t m2, bool *equivalent, if(f2.isLiquid()) return 2; } - + if(c1 > c2) return 1; else @@ -645,12 +665,6 @@ TileSpec getNodeTileN(MapNode mn, v3s16 p, u8 tileindex, MeshMakeData *data) if(p == data->m_crack_pos_relative) { 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; } @@ -679,19 +693,20 @@ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data) // Get rotation for things like chests u8 facedir = mn.getFaceDir(ndef); - assert(facedir <= 23); + if (facedir > 23) + facedir = 0; static const u16 dir_to_tile[24 * 16] = { - // 0 +X +Y +Z -Z -Y -X -> value=tile,rotation + // 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, 4,3 , 2,0 , 0,1 , 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, 5,3 , 3,0 , 0,3 , 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 , @@ -702,23 +717,22 @@ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data) 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,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, 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 - + 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 + }; 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); + spec.texture = data->m_gamedef->tsrc()->getTexture(spec.texture_id); return spec; } @@ -741,10 +755,14 @@ static void getTileInfo( v3s16 blockpos_nodes = data->m_blockpos * MAP_BLOCKSIZE; MapNode n0 = vmanip.getNodeNoEx(blockpos_nodes + p); + + // Don't even try to get n1 if n0 is already CONTENT_IGNORE + if (n0.getContent() == CONTENT_IGNORE ) { + makes_face = false; + return; + } MapNode n1 = vmanip.getNodeNoEx(blockpos_nodes + p + face_dir); - TileSpec tile0 = getNodeTile(n0, p, face_dir, data); - TileSpec tile1 = getNodeTile(n1, p + face_dir, -face_dir, data); - + // This is hackish bool equivalent = false; u8 mf = face_contents(n0.getContent(), n1.getContent(), @@ -757,22 +775,22 @@ static void getTileInfo( } makes_face = true; - + if(mf == 1) { - tile = tile0; + tile = getNodeTile(n0, p, face_dir, data); p_corrected = p; face_dir_corrected = face_dir; light_source = ndef->get(n0).light_source; } else { - tile = tile1; + tile = getNodeTile(n1, p + face_dir, -face_dir, data); 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; @@ -780,7 +798,7 @@ static void getTileInfo( if(data->m_smooth_lighting == false) { lights[0] = lights[1] = lights[2] = lights[3] = - getFaceLight(n0, n1, face_dir, data); + getFaceLight(n0, n1, face_dir, ndef); } else { @@ -793,7 +811,7 @@ static void getTileInfo( vertex_dirs[i], data); } } - + return; } @@ -812,16 +830,16 @@ static void updateFastFaceRow( std::vector &dest) { v3s16 p = startpos; - + u16 continuous_tiles_count = 0; - + bool makes_face = false; v3s16 p_corrected; v3s16 face_dir_corrected; u16 lights[4] = {0,0,0,0}; TileSpec tile; u8 light_source = 0; - getTileInfo(data, p, face_dir, + getTileInfo(data, p, face_dir, makes_face, p_corrected, face_dir_corrected, lights, tile, light_source); @@ -829,27 +847,27 @@ static void updateFastFaceRow( { // If tiling can be done, this is set to false in the next step bool next_is_different = true; - + v3s16 p_next; - + bool next_makes_face = false; v3s16 next_p_corrected; 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 if(j != MAP_BLOCKSIZE - 1) { p_next = p + translate_dir; - + getTileInfo(data, p_next, face_dir, next_makes_face, next_p_corrected, next_face_dir_corrected, next_lights, next_tile, next_light_source); - + if(next_makes_face == makes_face && next_p_corrected == p_corrected + translate_dir && next_face_dir_corrected == face_dir_corrected @@ -889,24 +907,8 @@ static void updateFastFaceRow( } continuous_tiles_count++; - - // This is set to true if the texture doesn't allow more tiling - bool end_of_texture = false; - /* - If there is no texture, it can be tiled infinitely. - If tiled==0, it means the texture can be tiled infinitely. - Otherwise check tiled agains continuous_tiles_count. - */ - if(tile.texture.atlas != NULL && tile.texture.tiled != 0) - { - if(tile.texture.tiled <= continuous_tiles_count) - end_of_texture = true; - } - - // Do this to disable tiling textures - //end_of_texture = true; //DEBUG - - if(next_is_different || end_of_texture) + + if(next_is_different) { /* Create a face if there should be one @@ -933,11 +935,11 @@ static void updateFastFaceRow( { scale.Z = continuous_tiles_count; } - + makeFastFace(tile, lights[0], lights[1], lights[2], lights[3], sp, face_dir_corrected, scale, light_source, dest); - + g_profiler->avg("Meshgen: faces drawn by tiling", 0); for(int i=1; iavg("Meshgen: faces drawn by tiling", 1); @@ -945,7 +947,7 @@ static void updateFastFaceRow( } continuous_tiles_count = 0; - + makes_face = next_makes_face; p_corrected = next_p_corrected; face_dir_corrected = next_face_dir_corrected; @@ -956,7 +958,7 @@ static void updateFastFaceRow( tile = next_tile; light_source = next_light_source; } - + p = p_next; } } @@ -1014,7 +1016,7 @@ static void updateAllFastFaceRows(MeshMakeData *data, MapBlockMesh */ -MapBlockMesh::MapBlockMesh(MeshMakeData *data): +MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): m_mesh(new scene::SMesh()), m_gamedef(data->m_gamedef), m_animation_force_timer(0), // force initial animation @@ -1060,12 +1062,12 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): const u16 indices[] = {0,1,2,2,3,0}; const u16 indices_alternate[] = {0,1,3,2,3,1}; - - if(f.tile.texture.atlas == NULL) + + if(f.tile.texture == NULL) continue; const u16 *indices_p = indices; - + /* Revert triangles for nicer looking gradient if vertices 1 and 3 have same color or 0 and 2 have different color. @@ -1074,7 +1076,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): if(f.vertices[0].Color.getRed() != f.vertices[2].Color.getRed() || f.vertices[1].Color.getRed() == f.vertices[3].Color.getRed()) indices_p = indices_alternate; - + collector.append(f.tile, f.vertices, 4, indices_p, 6); } } @@ -1088,17 +1090,18 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): */ mapblock_mesh_generate_special(data, collector); - + /* 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; + ITextureSource *tsrc = m_gamedef->tsrc(); + IShaderSource *shdrsrc = m_gamedef->getShaderSource(); + + bool enable_shaders = g_settings->getBool("enable_shaders"); + bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping"); + bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion"); + for(u32 i = 0; i < collector.prebuffers.size(); i++) { PreMeshBuffer &p = collector.prebuffers[i]; @@ -1110,18 +1113,21 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): // - Cracks if(p.tile.material_flags & MATERIAL_FLAG_CRACK) { - ITextureSource *tsrc = data->m_gamedef->tsrc(); - std::string crack_basename = tsrc->getTextureName(p.tile.texture.id); + // Find the texture name plus ^[crack:N: + std::ostringstream os(std::ios::binary); + os<getTextureName(p.tile.texture_id)<<"^[crack"; if(p.tile.material_flags & MATERIAL_FLAG_CRACK_OVERLAY) - crack_basename += "^[cracko"; - else - crack_basename += "^[crack"; - m_crack_materials.insert(std::make_pair(i, crack_basename)); + os<<"o"; // use ^[cracko + os<<":"<<(u32)p.tile.animation_frame_count<<":"; + m_crack_materials.insert(std::make_pair(i, os.str())); + // Replace tile texture with the cracked one + p.tile.texture = tsrc->getTexture( + os.str()+"0", + &p.tile.texture_id); } // - Texture animation if(p.tile.material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES) { - 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; @@ -1136,29 +1142,38 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): } // Replace tile texture with the first animation frame std::ostringstream os(std::ios::binary); - os<getTextureName(p.tile.texture.id); + os<getTextureName(p.tile.texture_id); os<<"^[verticalframe:"<<(int)p.tile.animation_frame_count<<":0"; - p.tile.texture = tsrc->getTexture(os.str()); + p.tile.texture = tsrc->getTexture( + os.str(), + &p.tile.texture_id); } - // - Classic lighting (shaders handle this by themselves) - if(!enable_shaders) + + for(u32 j = 0; j < p.vertices.size(); j++) { - for(u32 j = 0; j < p.vertices.size(); j++) + video::SColor &vc = p.vertices[j].Color; + if(p.vertices[j].Normal.Y > 0.5) { + applyContrast (vc, 1.2); + } else if (p.vertices[j].Normal.Y < -0.5) { + applyContrast (vc, 0.3); + } else if (p.vertices[j].Normal.X > 0.5) { + applyContrast (vc, 0.5); + } else if (p.vertices[j].Normal.X < -0.5) { + applyContrast (vc, 0.5); + } else if (p.vertices[j].Normal.Z > 0.5) { + applyContrast (vc, 0.8); + } else if (p.vertices[j].Normal.Z < -0.5) { + applyContrast (vc, 0.8); + } + if(!enable_shaders) { - video::SColor &vc = p.vertices[j].Color; + // - Classic lighting (shaders handle this by themselves) // 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)); - } } } @@ -1170,14 +1185,38 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): material.setFlag(video::EMF_FOG_ENABLE, true); //material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_OFF); //material.setFlag(video::EMF_ANTI_ALIASING, video::EAAM_SIMPLE); - material.MaterialType - = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - material.setTexture(0, p.tile.texture.atlas); - if(enable_shaders) - p.tile.applyMaterialOptionsWithShaders(material, shadermat1, shadermat2); - else + //material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + material.setTexture(0, p.tile.texture); + + if (enable_shaders) { + material.MaterialType = shdrsrc->getShaderInfo(p.tile.shader_id).material; + p.tile.applyMaterialOptionsWithShaders(material); + material.setTexture(2, tsrc->getTexture("disable_img.png")); + if (enable_bumpmapping || enable_parallax_occlusion) { + if (tsrc->isKnownSourceImage("override_normal.png")){ + material.setTexture(1, tsrc->getTexture("override_normal.png")); + material.setTexture(2, tsrc->getTexture("enable_img.png")); + } else { + std::string fname_base = tsrc->getTextureName(p.tile.texture_id); + std::string normal_ext = "_normal.png"; + size_t pos = fname_base.find("."); + std::string fname_normal = fname_base.substr(0, pos) + normal_ext; + + if (tsrc->isKnownSourceImage(fname_normal)) { + // look for image extension and replace it + size_t i = 0; + while ((i = fname_base.find(".", i)) != std::string::npos) { + fname_base.replace(i, 4, normal_ext); + i += normal_ext.length(); + } + material.setTexture(1, tsrc->getTexture(fname_base)); + material.setTexture(2, tsrc->getTexture("enable_img.png")); + } + } + } + } else { p.tile.applyMaterialOptions(material); - + } // Create meshbuffer // This is a "Standard MeshBuffer", @@ -1193,12 +1232,13 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): &p.indices[0], p.indices.size()); } + m_camera_offset = camera_offset; + /* Do some stuff to the mesh */ - translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE, BS)); - m_mesh->recalculateBoundingBox(); // translateMesh already does this + translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE - camera_offset, BS)); if(m_mesh) { @@ -1219,7 +1259,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data): the hardware buffer and then delete the mesh */ } - + //std::cout<<"added "<getBool("enable_shaders"); + bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping"); + bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion"); + if(!m_has_animation) { m_animation_force_timer = 100000; @@ -1259,13 +1303,27 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat ITextureSource *tsrc = m_gamedef->getTextureSource(); std::ostringstream os; os<getTexture(os.str()); - buf->getMaterial().setTexture(0, ap.atlas); + u32 new_texture_id = 0; + video::ITexture *new_texture = + tsrc->getTexture(os.str(), &new_texture_id); + buf->getMaterial().setTexture(0, new_texture); + + // If the current material is also animated, + // update animation info + std::map::iterator anim_iter = + m_animation_tiles.find(i->first); + if(anim_iter != m_animation_tiles.end()){ + TileSpec &tile = anim_iter->second; + tile.texture = new_texture; + tile.texture_id = new_texture_id; + // force animation update + m_animation_frames[i->first] = -1; + } } m_last_crack = crack; } - + // Texture animation for(std::map::iterator i = m_animation_tiles.begin(); @@ -1284,14 +1342,37 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i->first); ITextureSource *tsrc = m_gamedef->getTextureSource(); + IShaderSource *shdrsrc = m_gamedef->getShaderSource(); // Create new texture name from original std::ostringstream os(std::ios::binary); - os<getTextureName(tile.texture.id); + os<getTextureName(tile.texture_id); os<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<getTexture(os.str()); - buf->getMaterial().setTexture(0, ap.atlas); + buf->getMaterial().setTexture(0, tsrc->getTexture(os.str())); + if (enable_shaders){ + buf->getMaterial().setTexture(2, tsrc->getTexture("disable_img.png")); + buf->getMaterial().MaterialType = shdrsrc->getShaderInfo(tile.shader_id).material; + if (enable_bumpmapping || enable_parallax_occlusion){ + if (tsrc->isKnownSourceImage("override_normal.png")){ + buf->getMaterial().setTexture(1, tsrc->getTexture("override_normal.png")); + buf->getMaterial().setTexture(2, tsrc->getTexture("enable_img.png")); + } else { + std::string fname_base,fname_normal; + fname_base = tsrc->getTextureName(tile.texture_id); + unsigned pos; + pos = fname_base.find("."); + fname_normal = fname_base.substr (0, pos); + fname_normal += "_normal.png"; + if (tsrc->isKnownSourceImage(fname_normal)){ + os.str(""); + os<getMaterial().setTexture(1, tsrc->getTexture(os.str())); + buf->getMaterial().setTexture(2, tsrc->getTexture("enable_img.png")); + } + } + } + } } // Day-night transition @@ -1312,14 +1393,6 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat 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; @@ -1328,6 +1401,14 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat return true; } +void MapBlockMesh::updateCameraOffset(v3s16 camera_offset) +{ + if (camera_offset != m_camera_offset) { + translateMesh(m_mesh, intToFloat(m_camera_offset-camera_offset, BS)); + m_camera_offset = camera_offset; + } +} + /* MeshCollector */ @@ -1336,12 +1417,20 @@ void MeshCollector::append(const TileSpec &tile, const video::S3DVertex *vertices, u32 numVertices, const u16 *indices, u32 numIndices) { + if(numIndices > 65535) + { + dstream<<"FIXME: MeshCollector::append() called with numIndices="< 65535) + continue; p = &pp; break; @@ -1359,11 +1448,6 @@ void MeshCollector::append(const TileSpec &tile, for(u32 i=0; i 65535) - { - dstream<<"FIXME: Meshbuffer ran out of indices"<indices.push_back(j); } for(u32 i=0; i