Fix liquid post effect colour behaviour in third person view - minetest.git

diff options

author	red-001 <red-001@outlook.ie>	2018-02-25 22:52:05 +0000
committer	SmallJoker <mk939@ymail.com>	2018-06-03 17:32:00 +0200
commit	c40f535df83ab8d10b0f9cc93c2531ac79036dd0 (patch)
tree	6c2d3267067ce574ee0411706ed4138594f90e41 /src/cavegen.h
parent	79fde0dd52bbdeb705576a285c0da2519f948eb7 (diff)
download	minetest-c40f535df83ab8d10b0f9cc93c2531ac79036dd0.tar.gz minetest-c40f535df83ab8d10b0f9cc93c2531ac79036dd0.tar.bz2 minetest-c40f535df83ab8d10b0f9cc93c2531ac79036dd0.zip

Fix liquid post effect colour behaviour in third person view

Diffstat (limited to 'src/cavegen.h')

0 files changed, 0 insertions, 0 deletions

/* Minetest Copyright (C) 2014-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net> Copyright (C) 2015-2018 paramat 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 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 Lesser General Public License for more details. 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 "mg_decoration.h" #include "mg_schematic.h" #include "mapgen.h" #include "noise.h" #include "map.h" #include "log.h" #include "util/numeric.h" #include <algorithm> #include <vector> FlagDesc flagdesc_deco[] = { {"place_center_x", DECO_PLACE_CENTER_X}, {"place_center_y", DECO_PLACE_CENTER_Y}, {"place_center_z", DECO_PLACE_CENTER_Z}, {"force_placement", DECO_FORCE_PLACEMENT}, {"liquid_surface", DECO_LIQUID_SURFACE}, {"all_floors", DECO_ALL_FLOORS}, {"all_ceilings", DECO_ALL_CEILINGS}, {NULL, 0} }; /////////////////////////////////////////////////////////////////////////////// DecorationManager::DecorationManager(IGameDef *gamedef) : ObjDefManager(gamedef, OBJDEF_DECORATION) { } size_t DecorationManager::placeAllDecos(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) { size_t nplaced = 0; for (size_t i = 0; i != m_objects.size(); i++) { Decoration *deco = (Decoration *)m_objects[i]; if (!deco) continue; nplaced += deco->placeDeco(mg, blockseed, nmin, nmax); blockseed++; } return nplaced; } /////////////////////////////////////////////////////////////////////////////// void Decoration::resolveNodeNames() { getIdsFromNrBacklog(&c_place_on); getIdsFromNrBacklog(&c_spawnby); } bool Decoration::canPlaceDecoration(MMVManip *vm, v3s16 p) { // Check if the decoration can be placed on this node u32 vi = vm->m_area.index(p); if (!CONTAINS(c_place_on, vm->m_data[vi].getContent())) return false; // Don't continue if there are no spawnby constraints if (nspawnby == -1) return true; int nneighs = 0; static const v3s16 dirs[16] = { v3s16( 0, 0, 1), v3s16( 0, 0, -1), v3s16( 1, 0, 0), v3s16(-1, 0, 0), v3s16( 1, 0, 1), v3s16(-1, 0, 1), v3s16(-1, 0, -1), v3s16( 1, 0, -1), v3s16( 0, 1, 1), v3s16( 0, 1, -1), v3s16( 1, 1, 0), v3s16(-1, 1, 0), v3s16( 1, 1, 1), v3s16(-1, 1, 1), v3s16(-1, 1, -1), v3s16( 1, 1, -1) }; // Check these 16 neighbouring nodes for enough spawnby nodes for (size_t i = 0; i != ARRLEN(dirs); i++) { u32 index = vm->m_area.index(p + dirs[i]); if (!vm->m_area.contains(index)) continue; if (CONTAINS(c_spawnby, vm->m_data[index].getContent())) nneighs++; } if (nneighs < nspawnby) return false; return true; } size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) { PcgRandom ps(blockseed + 53); int carea_size = nmax.X - nmin.X + 1; // Divide area into parts // If chunksize is changed it may no longer be divisable by sidelen if (carea_size % sidelen) sidelen = carea_size; s16 divlen = carea_size / sidelen; int area = sidelen * sidelen; for (s16 z0 = 0; z0 < divlen; z0++) for (s16 x0 = 0; x0 < divlen; x0++) { v2s16 p2d_center( // Center position of part of division nmin.X + sidelen / 2 + sidelen * x0, nmin.Z + sidelen / 2 + sidelen * z0 ); v2s16 p2d_min( // Minimum edge of part of division nmin.X + sidelen * x0, nmin.Z + sidelen * z0 ); v2s16 p2d_max( // Maximum edge of part of division nmin.X + sidelen + sidelen * x0 - 1, nmin.Z + sidelen + sidelen * z0 - 1 ); bool cover = false; // Amount of decorations float nval = (flags & DECO_USE_NOISE) ? NoisePerlin2D(&np, p2d_center.X, p2d_center.Y, mapseed) : fill_ratio; u32 deco_count = 0; if (nval >= 10.0f) { // Complete coverage. Disable random placement to avoid // redundant multiple placements at one position. cover = true; deco_count = area; } else { float deco_count_f = (float)area * nval; if (deco_count_f >= 1.0f) { deco_count = deco_count_f; } else if (deco_count_f > 0.0f) { // For very low density calculate a chance for 1 decoration if (ps.range(1000) <= deco_count_f * 1000.0f) deco_count = 1; } } s16 x = p2d_min.X - 1; s16 z = p2d_min.Y; for (u32 i = 0; i < deco_count; i++) { if (!cover) { x = ps.range(p2d_min.X, p2d_max.X); z = ps.range(p2d_min.Y, p2d_max.Y); } else { x++; if (x == p2d_max.X + 1) { z++; x = p2d_min.X; } } int mapindex = carea_size * (z - nmin.Z) + (x - nmin.X); if ((flags & DECO_ALL_FLOORS) || (flags & DECO_ALL_CEILINGS)) { // All-surfaces decorations // Check biome of column if (mg->biomemap && !biomes.empty()) { std::unordered_set<u8>::const_iterator iter = biomes.find(mg->biomemap[mapindex]); if (iter == biomes.end()) continue; } // Get all floors and ceilings in node column u16 size = (nmax.Y - nmin.Y + 1) / 2; std::vector<s16> floors; std::vector<s16> ceilings; floors.reserve(size); ceilings.reserve(size); mg->getSurfaces(v2s16(x, z), nmin.Y, nmax.Y, floors, ceilings); if (flags & DECO_ALL_FLOORS) { // Floor decorations for (const s16 y : floors) { if (y < y_min || y > y_max) continue; v3s16 pos(x, y, z); if (generate(mg->vm, &ps, pos, false)) mg->gennotify.addEvent( GENNOTIFY_DECORATION, pos, index); } } if (flags & DECO_ALL_CEILINGS) { // Ceiling decorations for (const s16 y : ceilings) { if (y < y_min || y > y_max) continue; v3s16 pos(x, y, z); if (generate(mg->vm, &ps, pos, true)) mg->gennotify.addEvent( GENNOTIFY_DECORATION, pos, index); } } } else { // Heightmap decorations s16 y = -MAX_MAP_GENERATION_LIMIT; if (flags & DECO_LIQUID_SURFACE) y = mg->findLiquidSurface(v2s16(x, z), nmin.Y, nmax.Y); else if (mg->heightmap) y = mg->heightmap[mapindex]; else y = mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y); if (y < y_min || y > y_max || y < nmin.Y || y > nmax.Y) continue; if (mg->biomemap && !biomes.empty()) { std::unordered_set<u8>::const_iterator iter = biomes.find(mg->biomemap[mapindex]); if (iter == biomes.end()) continue; } v3s16 pos(x, y, z); if (generate(mg->vm, &ps, pos, false)) mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, index); } }


context:
space:
mode: