minetest.git - modified minetest for gpcfs purposes

diff options

author	Perttu Ahola <celeron55@gmail.com>	2012-04-13 17:20:43 +0300
committer	Perttu Ahola <celeron55@gmail.com>	2012-04-13 17:20:48 +0300
commit	24603d7ad3421284246116656abb533098a24631 (patch)
tree	dd84204bd3b8c174c935b2e617a85e1ec5883470 /builtin
parent	1eac6ff8ff1bde7d4cceb80147ad2347b871c18d (diff)
download	minetest-24603d7ad3421284246116656abb533098a24631.tar.gz minetest-24603d7ad3421284246116656abb533098a24631.tar.bz2 minetest-24603d7ad3421284246116656abb533098a24631.zip

Fix executing register_chatcommand-defined commands even in the middle of a chat line

Diffstat (limited to 'builtin')

-rw-r--r--

builtin/chatcommands.lua

1 files changed, 1 insertions, 1 deletions

/* Minetest-c55 Copyright (C) 2010-2011 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 (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. You should have received a copy of the GNU 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 "mapblock_mesh.h" #include "light.h" #include "mapblock.h" #include "map.h" #include "main.h" // For g_settings and g_texturesource #include "content_mapblock.h" #include "settings.h" #include "profiler.h" void MeshMakeData::fill(u32 daynight_ratio, MapBlock *block) { m_daynight_ratio = daynight_ratio; m_blockpos = block->getPos(); v3s16 blockpos_nodes = m_blockpos*MAP_BLOCKSIZE; /* There is no harm not copying the TempMods of the neighbors because they are already copied to this block */ m_temp_mods.clear(); block->copyTempMods(m_temp_mods); /* Copy data */ // Allocate this block + neighbors m_vmanip.clear(); m_vmanip.addArea(VoxelArea(blockpos_nodes-v3s16(1,1,1)*MAP_BLOCKSIZE, blockpos_nodes+v3s16(1,1,1)*MAP_BLOCKSIZE*2-v3s16(1,1,1))); { //TimeTaker timer("copy central block data"); // 0ms // Copy our data block->copyTo(m_vmanip); } { //TimeTaker timer("copy neighbor block data"); // 0ms /* Copy neighbors. This is lightning fast. Copying only the borders would be *very* slow. */ // Get map Map *map = block->getParent(); for(u16 i=0; i<6; i++) { const v3s16 &dir = g_6dirs[i]; v3s16 bp = m_blockpos + dir; MapBlock *b = map->getBlockNoCreateNoEx(bp); if(b) b->copyTo(m_vmanip); } } } /* vertex_dirs: v3s16[4] */ void getNodeVertexDirs(v3s16 dir, v3s16 *vertex_dirs) { /* If looked from outside the node towards the face, the corners are: 0: bottom-right 1: bottom-left 2: top-left 3: top-right */ if(dir == v3s16(0,0,1)) { // If looking towards z+, this is the face that is behind // the center point, facing towards z+. vertex_dirs[0] = v3s16(-1,-1, 1); vertex_dirs[1] = v3s16( 1,-1, 1); vertex_dirs[2] = v3s16( 1, 1, 1); vertex_dirs[3] = v3s16(-1, 1, 1); } else if(dir == v3s16(0,0,-1)) { // faces towards Z- vertex_dirs[0] = v3s16( 1,-1,-1); vertex_dirs[1] = v3s16(-1,-1,-1); vertex_dirs[2] = v3s16(-1, 1,-1); vertex_dirs[3] = v3s16( 1, 1,-1); } else if(dir == v3s16(1,0,0)) { // faces towards X+ vertex_dirs[0] = v3s16( 1,-1, 1); vertex_dirs[1] = v3s16( 1,-1,-1); vertex_dirs[2] = v3s16( 1, 1,-1); vertex_dirs[3] = v3s16( 1, 1, 1); } else if(dir == v3s16(-1,0,0)) { // faces towards X- vertex_dirs[0] = v3s16(-1,-1,-1); vertex_dirs[1] = v3s16(-1,-1, 1); vertex_dirs[2] = v3s16(-1, 1, 1); vertex_dirs[3] = v3s16(-1, 1,-1); } else if(dir == v3s16(0,1,0)) { // faces towards Y+ (assume Z- as "down" in texture) vertex_dirs[0] = v3s16( 1, 1,-1); vertex_dirs[1] = v3s16(-1, 1,-1); vertex_dirs[2] = v3s16(-1, 1, 1); vertex_dirs[3] = v3s16( 1, 1, 1); } else if(dir == v3s16(0,-1,0)) { // faces towards Y- (assume Z+ as "down" in texture) vertex_dirs[0] = v3s16( 1,-1, 1); vertex_dirs[1] = v3s16(-1,-1, 1); vertex_dirs[2] = v3s16(-1,-1,-1); vertex_dirs[3] = v3s16( 1,-1,-1); } } video::SColor MapBlock_LightColor(u8 alpha, u8 light) { #if 0 return video::SColor(alpha,light,light,light); #endif //return video::SColor(alpha,light,light,MYMAX(0, (s16)light-25)+25); /*return video::SColor(alpha,light,light,MYMAX(0, pow((float)light/255.0, 0.8)*255.0));*/ #if 1 // Emphase blue a bit in darker places float lim = 80; float power = 0.8; if(light > lim) return video::SColor(alpha,light,light,light); else return video::SColor(alpha,light,light,MYMAX(0, pow((float)light/lim, power)*lim)); #endif } struct FastFace { TileSpec tile; video::S3DVertex vertices[4]; // Precalculated vertices }; void makeFastFace(TileSpec tile, u8 li0, u8 li1, u8 li2, u8 li3, v3f p, v3s16 dir, v3f scale, v3f posRelative_f, core::array<FastFace> &dest) { FastFace face; // Position is at the center of the cube. v3f pos = p * BS; posRelative_f *= BS; v3f vertex_pos[4]; v3s16 vertex_dirs[4]; getNodeVertexDirs(dir, vertex_dirs); for(u16 i=0; i<4; i++) { vertex_pos[i] = v3f( BS/2*vertex_dirs[i].X, BS/2*vertex_dirs[i].Y, BS/2*vertex_dirs[i].Z ); } for(u16 i=0; i<4; i++) { vertex_pos[i].X *= scale.X; vertex_pos[i].Y *= scale.Y; vertex_pos[i].Z *= scale.Z; vertex_pos[i] += pos + posRelative_f; } f32 abs_scale = 1.; 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; v3f zerovector = v3f(0,0,0); u8 alpha = tile.alpha; /*u8 alpha = 255; if(tile.id == TILE_WATER) alpha = WATER_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; /*video::SColor c = MapBlock_LightColor(alpha, li); face.vertices[0] = video::S3DVertex(vertex_pos[0], v3f(0,1,0), c, core::vector2d<f32>(x0+w*abs_scale, y0+h)); face.vertices[1] = video::S3DVertex(vertex_pos[1], v3f(0,1,0), c, core::vector2d<f32>(x0, y0+h)); face.vertices[2] = video::S3DVertex(vertex_pos[2], v3f(0,1,0), c, core::vector2d<f32>(x0, y0)); face.vertices[3] = video::S3DVertex(vertex_pos[3], v3f(0,1,0), c, core::vector2d<f32>(x0+w*abs_scale, y0));*/ face.vertices[0] = video::S3DVertex(vertex_pos[0], v3f(0,1,0), MapBlock_LightColor(alpha, li0), core::vector2d<f32>(x0+w*abs_scale, y0+h)); face.vertices[1] = video::S3DVertex(vertex_pos[1], v3f(0,1,0), MapBlock_LightColor(alpha, li1), core::vector2d<f32>(x0, y0+h)); face.vertices[2] = video::S3DVertex(vertex_pos[2], v3f(0,1,0), MapBlock_LightColor(alpha, li2), core::vector2d<f32>(x0, y0)); face.vertices[3] = video::S3DVertex(vertex_pos[3], v3f(0,1,0), MapBlock_LightColor(alpha, li3), core::vector2d<f32>(x0+w*abs_scale, y0)); face.tile = tile; //DEBUG //f->tile = TILE_STONE; dest.push_back(face); } /* Gets node tile from any place relative to block. Returns TILE_NODE if doesn't exist or should not be drawn. */ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 face_dir, NodeModMap &temp_mods) { TileSpec spec; spec = mn.getTile(face_dir); /* Check temporary modifications on this node */ /*core::map<v3s16, NodeMod>::Node *n; n = m_temp_mods.find(p); // If modified if(n != NULL) { struct NodeMod mod = n->getValue();*/ NodeMod mod; if(temp_mods.get(p, &mod)) { if(mod.type == NODEMOD_CHANGECONTENT) { MapNode mn2(mod.param); spec = mn2.getTile(face_dir); } if(mod.type == NODEMOD_CRACK) { /* Get texture id, translate it to name, append stuff to name, get texture id */ // Get original texture name u32 orig_id = spec.texture.id; std::string orig_name = g_texturesource->getTextureName(orig_id); // Create new texture name std::ostringstream os; os<<orig_name<<"^[crack"<<mod.param; // Get new texture u32 new_id = g_texturesource->getTextureId(os.str()); /*dstream<<"MapBlock::getNodeTile(): Switching from " <<orig_name<<" to "<<os.str()<<" (" <<orig_id<<" to "<<new_id<<")"<<std::endl;*/ spec.texture = g_texturesource->getTexture(new_id); } } return spec; } content_t getNodeContent(v3s16 p, MapNode mn, NodeModMap &temp_mods) { /* Check temporary modifications on this node */ /*core::map<v3s16, NodeMod>::Node *n; n = m_temp_mods.find(p); // If modified if(n != NULL) { struct NodeMod mod = n->getValue();*/ NodeMod mod; if(temp_mods.get(p, &mod)) { if(mod.type == NODEMOD_CHANGECONTENT) { // Overrides content return mod.param; } if(mod.type == NODEMOD_CRACK) { /* Content doesn't change. face_contents works just like it should, because there should not be faces between differently cracked nodes. If a semi-transparent node is cracked in front an another one, it really doesn't matter whether there is a cracked face drawn in between or not. */ } } return mn.getContent(); } v3s16 dirs8[8] = { v3s16(0,0,0), v3s16(0,0,1), v3s16(0,1,0), v3s16(0,1,1), v3s16(1,0,0), v3s16(1,1,0), v3s16(1,0,1), v3s16(1,1,1), }; // Calculate lighting at the XYZ- corner of p u8 getSmoothLight(v3s16 p, VoxelManipulator &vmanip, u32 daynight_ratio) { u16 ambient_occlusion = 0; u16 light = 0; u16 light_count = 0; for(u32 i=0; i<8; i++) { MapNode n = vmanip.getNodeNoEx(p - dirs8[i]); if(content_features(n).param_type == CPT_LIGHT // Fast-style leaves look better this way && content_features(n).solidness != 2) { light += decode_light(n.getLightBlend(daynight_ratio)); light_count++; } else { if(n.getContent() != CONTENT_IGNORE) ambient_occlusion++; } } if(light_count == 0) return 255; light /= light_count; if(ambient_occlusion > 4) { ambient_occlusion -= 4; light = (float)light / ((float)ambient_occlusion * 0.5 + 1.0); } return light; } // Calculate lighting at the given corner of p u8 getSmoothLight(v3s16 p, v3s16 corner, VoxelManipulator &vmanip, u32 daynight_ratio) { if(corner.X == 1) p.X += 1; else assert(corner.X == -1); if(corner.Y == 1) p.Y += 1; else assert(corner.Y == -1); if(corner.Z == 1) p.Z += 1; else assert(corner.Z == -1); return getSmoothLight(p, vmanip, daynight_ratio); } void getTileInfo( // Input: v3s16 blockpos_nodes, v3s16 p, v3s16 face_dir, u32 daynight_ratio, VoxelManipulator &vmanip, NodeModMap &temp_mods, bool smooth_lighting, // Output: bool &makes_face, v3s16 &p_corrected, v3s16 &face_dir_corrected, u8 *lights, TileSpec &tile ) { MapNode n0 = vmanip.getNodeNoEx(blockpos_nodes + p); MapNode n1 = vmanip.getNodeNoEx(blockpos_nodes + p + face_dir); TileSpec tile0 = getNodeTile(n0, p, face_dir, temp_mods); TileSpec tile1 = getNodeTile(n1, p + face_dir, -face_dir, temp_mods); // This is hackish content_t content0 = getNodeContent(p, n0, temp_mods); content_t content1 = getNodeContent(p + face_dir, n1, temp_mods); bool equivalent = false; u8 mf = face_contents(content0, content1, &equivalent); if(mf == 0) { makes_face = false; return; } makes_face = true; if(mf == 1) { tile = tile0; p_corrected = p; face_dir_corrected = face_dir; } else { tile = tile1; p_corrected = p + face_dir; face_dir_corrected = -face_dir; } // eg. water and glass if(equivalent) tile.material_flags |= MATERIAL_FLAG_BACKFACE_CULLING; if(smooth_lighting == false) { lights[0] = lights[1] = lights[2] = lights[3] = decode_light(getFaceLight(daynight_ratio, n0, n1, face_dir)); } else { v3s16 vertex_dirs[4]; getNodeVertexDirs(face_dir_corrected, vertex_dirs); for(u16 i=0; i<4; i++) { lights[i] = getSmoothLight(blockpos_nodes + p_corrected, vertex_dirs[i], vmanip, daynight_ratio);


context:
space:
mode: