aboutsummaryrefslogtreecommitdiff
path: root/src/noise.cpp
Commit message (Collapse)AuthorAge
* Fix spelling of noise_thresholdJun Zhang2015-12-06
|
* Fix Noise compiled under clang >= 3.7.x with -O2 or higherkwolekr2015-11-01
| | | | | | | | | | When compiled with optimizations, the most recent versions of clang seem to 'optimize' out a crucial "and %reg, 0x7FFFFFFF" instruction in noise2d(), probably because it somehow assumed the variable n would never become greater than that amount. Indeed, signed integer underflow is undefined behavior in C and C++, so while this optimization is "correct" in that sense, it breaks lots of existing code. Solved by changing n to an unsigned type, making behavior well-defined.
* Fix Lua PcgRandomest312015-08-12
| | | | | | | | | | | | | | | | Before, this lua code led to a crash: local pcg = PcgRandom(42) local value = pcg:next() This was because if you called s32 PcgRandom::range(min, max) with the minimum and maximum possible values for s32 integers (which the lua binding code did), u32 PcgRandom::range(bound) got called with 0 as the bound. The bound however is one above the maximum value, so 0 is a "special" value to pass to this function. This commit fixes the lua crash by assigning the RNG's full range to the bound 0, which is also fits to the "maximum is bound - 1" principle, as (u32)-1 is the maximum value in the u32 range.
* Remove some old dead code. Fix some Clang warnings in SRP (ng->N... willLoic Blot2015-07-24
| | | | always evaluate to true.
* Misc. minor fixeskwolekr2015-07-10
|
* Noise: Fix interpolation at negative coordinateskwolekr2015-05-17
|
* Add -Wsign-compare for Clang builds and fix some signed/unsigned compiler ↵kwolekr2015-05-16
| | | | warnings
* Noise: Make buffer size parameters unsignedkwolekr2015-05-15
|
* Fix MSVC compatibilitykwolekr2015-04-29
| | | | | | Make sure to include random unittests in android builds, too Use SWAP() macro Ensure that negative ranges are tested as well in random unittests
* Noise: Fix PcgRandom::randNormalDist() when range contains negative numberskwolekr2015-04-27
| | | | | This fixes an issue with erroneous float-to-int rounding that resulted in truncation toward 0, causing a biased distribution.
* Replace PRNG assertions with PrngExceptionkwolekr2015-04-27
|
* Noise: Add noise unittestskwolekr2015-04-21
| | | | | Fix buffer size calculation for lacunarity < 1.0 Add guard against absurd noise parameters
* Noise: Correct noise objects created with invalid dimensionskwolekr2015-04-19
|
* Fix endianness inconsistency with PcgRandom::bytes()kwolekr2015-03-23
|
* Fix some loose ends from 3993093fkwolekr2015-03-22
|
* Add support for the PCG32 PRNG algo (and associated script APIs)kwolekr2015-03-22
|
* Noise: Don't assume Noise is used for 2D unless gradientMap2D is actually calledkwolekr2014-12-14
|
* Clean up Noise macroskwolekr2014-12-11
|
* Noise: Automatically transform noise maps if neededkwolekr2014-12-10
|
* Noise: Create a deep copy of NoiseParamskwolekr2014-12-10
|
* Noise: Update Noise::resizeNoiseBuf to account for lacunarity not equal to 2kwolekr2014-12-09
|
* Optimize noise implementationskwolekr2014-12-08
|
* Add flags and lacunarity as new noise parameterskwolekr2014-12-07
| | | | | | | Add 'absolute value' option to noise map functions Extend persistence modulation to 3D noise Extend 'eased' option to noise2d_perlin* functions Some noise.cpp formatting fixups
* noise: Throw exception on noise allocation failurekwolekr2014-11-29
|
* Add eased 3d point-value noise functionskwolekr2014-11-12
|
* Add mgv5. New noise code, uses biome API. Eased 3d noise for terrain, caves, ↵paramat2014-11-08
| | | | blobs
* Change license of noise implementation to Simplified BSDkwolekr2014-10-27
|
* Add support for eased 3d noisekwolekr2014-10-27
|
* Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenuKahrl2013-08-14
|
* Add Mapgen V7, reorganize biomeskwolekr2013-04-07
|
* Fix most warnings, re-fix MSVC compile errorkwolekr2013-02-26
|
* Update Copyright YearsSfan52013-02-24
|
* Change Minetest-c55 to MinetestPilzAdam2013-02-24
|
* Fix and improve noise map functionskwolekr2013-02-06
|
* Finish and clean up mapgen configurationkwolekr2013-01-21
|
* Readded and optimized mapgen V6kwolekr2013-01-21
|
* Cleaned & enhanced noise object managementkwolekr2013-01-21
|
* Add initial Lua biomedef support, fixed biome selectionkwolekr2013-01-21
|
* The new mapgen, noise functions, et al.kwolekr2013-01-21
|
* Replace pow() with multiplikation to improve speedPilzAdam2012-11-02
|
* Switch the license to be LGPLv2/later, with small parts still remaining as ↵Perttu Ahola2012-06-05
| | | | GPLv2/later, by agreement of major contributors
* updated noise stuffPerttu Ahola2011-06-26
|
* New map generator added (and SQLite, messed up the commits at that time...) ↵Perttu Ahola2011-06-25
| | | | (import from temporary git repo)
* tested out and commented out some new stuff for the terrain generator, to be ↵Perttu Ahola2011-04-26
| | | | used in the future.
* mapgen work-in-progressPerttu Ahola2011-03-02
|
* mapgen tweakingPerttu Ahola2011-03-01
|
* A third try on terrain generation. No trees yet.Perttu Ahola2011-02-28
|
* fixed 3d noise and made 2d noise fasterPerttu Ahola2011-02-27
|
* 3d noise stuffPerttu Ahola2011-02-26
|
* made it to work with my windows compilerPerttu Ahola2011-02-08
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 04:35:21 +0000
t">&event); // On failure returns NULL MapSector * getSectorNoGenerateNoLock(v2s16 p2d); // Same as the above (there exists no lock anymore) MapSector * getSectorNoGenerate(v2s16 p2d); /* This is overloaded by ClientMap and ServerMap to allow their differing fetch methods. */ virtual MapSector * emergeSector(v2s16 p){ return NULL; } // Returns InvalidPositionException if not found MapBlock * getBlockNoCreate(v3s16 p); // Returns NULL if not found MapBlock * getBlockNoCreateNoEx(v3s16 p); /* Server overrides */ virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true) { return getBlockNoCreateNoEx(p); } inline const NodeDefManager * getNodeDefManager() { return m_nodedef; } bool isValidPosition(v3s16 p); // throws InvalidPositionException if not found void setNode(v3s16 p, MapNode & n); // Returns a CONTENT_IGNORE node if not found // If is_valid_position is not NULL then this will be set to true if the // position is valid, otherwise false MapNode getNode(v3s16 p, bool *is_valid_position = NULL); /* These handle lighting but not faces. */ void addNodeAndUpdate(v3s16 p, MapNode n, std::map<v3s16, MapBlock*> &modified_blocks, bool remove_metadata = true); void removeNodeAndUpdate(v3s16 p, std::map<v3s16, MapBlock*> &modified_blocks); /* Wrappers for the latter ones. These emit events. Return true if succeeded, false if not. */ bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true); bool removeNodeWithEvent(v3s16 p); // Call these before and after saving of many blocks virtual void beginSave() {} virtual void endSave() {} virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); } // Server implements these. // Client leaves them as no-op. virtual bool saveBlock(MapBlock *block) { return false; } virtual bool deleteBlock(v3s16 blockpos) { return false; } /* Updates usage timers and unloads unused blocks and sectors. Saves modified blocks before unloading on MAPTYPE_SERVER. */ void timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks, std::vector<v3s16> *unloaded_blocks=NULL); /* Unloads all blocks with a zero refCount(). Saves modified blocks before unloading on MAPTYPE_SERVER. */ void unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks=NULL); // Deletes sectors and their blocks from memory // Takes cache into account // If deleted sector is in sector cache, clears cache void deleteSectors(std::vector<v2s16> &list); // For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: " virtual void PrintInfo(std::ostream &out); void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks, ServerEnvironment *env); /* Node metadata These are basically coordinate wrappers to MapBlock */ std::vector<v3s16> findNodesWithMetadata(v3s16 p1, v3s16 p2); NodeMetadata *getNodeMetadata(v3s16 p); /** * Sets metadata for a node. * This method sets the metadata for a given node. * On success, it returns @c true and the object pointed to * by @p meta is then managed by the system and should * not be deleted by the caller. * * In case of failure, the method returns @c false and the * caller is still responsible for deleting the object! * * @param p node coordinates * @param meta pointer to @c NodeMetadata object * @return @c true on success, false on failure */ bool setNodeMetadata(v3s16 p, NodeMetadata *meta); void removeNodeMetadata(v3s16 p); /* Node Timers These are basically coordinate wrappers to MapBlock */ NodeTimer getNodeTimer(v3s16 p); void setNodeTimer(const NodeTimer &t); void removeNodeTimer(v3s16 p); /* Variables */ void transforming_liquid_add(v3s16 p); bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes); protected: friend class LuaVoxelManip; IGameDef *m_gamedef; std::set<MapEventReceiver*> m_event_receivers; std::map<v2s16, MapSector*> m_sectors; // Be sure to set this to NULL when the cached sector is deleted MapSector *m_sector_cache = nullptr; v2s16 m_sector_cache_p; // Queued transforming water nodes UniqueQueue<v3s16> m_transforming_liquid; // This stores the properties of the nodes on the map. const NodeDefManager *m_nodedef; bool determineAdditionalOcclusionCheck(const v3s16 &pos_camera, const core::aabbox3d<s16> &block_bounds, v3s16 &check); bool isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target, float step, float stepfac, float start_offset, float end_offset, u32 needed_count); private: f32 m_transforming_liquid_loop_count_multiplier = 1.0f; u32 m_unprocessed_count = 0; u64 m_inc_trending_up_start_time = 0; // milliseconds bool m_queue_size_timer_started = false; }; /* ServerMap This is the only map class that is able to generate map. */ class ServerMap : public Map { public: /* savedir: directory to which map data should be saved */ ServerMap(const std::string &savedir, IGameDef *gamedef, EmergeManager *emerge, MetricsBackend *mb); ~ServerMap(); s32 mapType() const { return MAPTYPE_SERVER; } /* Get a sector from somewhere. - Check memory - Check disk (doesn't load blocks) - Create blank one */ MapSector *createSector(v2s16 p); /* Blocks are generated by using these and makeBlock(). */ bool blockpos_over_mapgen_limit(v3s16 p); bool initBlockMake(v3s16 blockpos, BlockMakeData *data); void finishBlockMake(BlockMakeData *data, std::map<v3s16, MapBlock*> *changed_blocks); /* Get a block from somewhere. - Memory - Create blank */ MapBlock *createBlock(v3s16 p); /* Forcefully get a block from somewhere. - Memory - Load from disk - Create blank filled with CONTENT_IGNORE */ MapBlock *emergeBlock(v3s16 p, bool create_blank=true); /* Try to get a block. If it does not exist in memory, add it to the emerge queue. - Memory - Emerge Queue (deferred disk or generate) */ MapBlock *getBlockOrEmerge(v3s16 p3d); bool isBlockInQueue(v3s16 pos); /* Database functions */ static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf); // Call these before and after saving of blocks void beginSave(); void endSave(); void save(ModifiedState save_level); void listAllLoadableBlocks(std::vector<v3s16> &dst); void listAllLoadedBlocks(std::vector<v3s16> &dst); MapgenParams *getMapgenParams(); bool saveBlock(MapBlock *block); static bool saveBlock(MapBlock *block, MapDatabase *db, int compression_level = -1); MapBlock* loadBlock(v3s16 p); // Database version void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false); bool deleteBlock(v3s16 blockpos); void updateVManip(v3s16 pos); // For debug printing virtual void PrintInfo(std::ostream &out); bool isSavingEnabled(){ return m_map_saving_enabled; } u64 getSeed(); /*! * Fixes lighting in one map block. * May modify other blocks as well, as light can spread * out of the specified block. * Returns false if the block is not generated (so nothing * changed), true otherwise. */ bool repairBlockLight(v3s16 blockpos, std::map<v3s16, MapBlock *> *modified_blocks); MapSettingsManager settings_mgr; private: // Emerge manager EmergeManager *m_emerge; std::string m_savedir; bool m_map_saving_enabled; int m_map_compression_level; std::set<v3s16> m_chunks_in_progress; /* Metadata is re-written on disk only if this is true. This is reset to false when written on disk. */ bool m_map_metadata_changed = true; MapDatabase *dbase = nullptr; MapDatabase *dbase_ro = nullptr; MetricCounterPtr m_save_time_counter; }; #define VMANIP_BLOCK_DATA_INEXIST 1 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2 class MMVManip : public VoxelManipulator { public: MMVManip(Map *map); virtual ~MMVManip() = default; virtual void clear() { VoxelManipulator::clear(); m_loaded_blocks.clear(); } void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max, bool load_if_inexistent = true); // This is much faster with big chunks of generated data void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks, bool overwrite_generated = true); bool m_is_dirty = false; protected: Map *m_map; /* key = blockpos value = flags describing the block */ std::map<v3s16, u8> m_loaded_blocks; };
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 04:35:17 +0000