Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Optimise chunk set (#4260) | peterbell10 | 2018-07-23 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | Closes #1244 Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed that the copying wasn't even the biggest slowdown. Much more time was being spent in cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made those significantly faster as well. Optimisations performed: * cSetChunkData now stores blocks in a cChunkData object * cChunkData objects can now perform moves even if they are using different pools * cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections * Similarly for cChunk::WakeUpSimulators * cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly | ||||
* | cChunk and cChunkData: Use vectors for block get and set functions (#4172) | peterbell10 | 2018-02-04 | 1 | -0/+10 |
| | | | | | * cChunkData: Change interface to use Vector3i * cChunk: Add Vector3i overloads for bounded block get and set functions. | ||||
* | cChunkInterface GetBlock, GetBlockMeta, GetBlockTypeMeta use vectors (#4050) | Bond-009 | 2017-11-20 | 1 | -5/+4 |
| | |||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -1/+2 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -1/+2 |
| | | |||||
* | | Changed int parameters to vector parameters in cCuboid and simulators (#3874) | Lane Kolbly | 2017-08-17 | 1 | -26/+38 |
|/ | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 1 | -3/+0 |
| | |||||
* | Check for intersection between placed blocks and entities. (#3850) | Lane Kolbly | 2017-07-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | * Check for intersection between placed blocks and entities. + Implemented GetPlacementCollisionBox, to permit custom placement collision boxes for blocks. * Factored block-entity placement checking into another function in cPlayer. - Removed vector min/max functions * Use GetWorld to get the world in DoesPlacingBlocksIntersectEntity. + Added block height checks, allow different cEntity subclasses to decide whether they will prevent block placement. | ||||
* | Store cChunk::m_BlockEntities in a map (#3717) | peterbell10 | 2017-05-22 | 1 | -2/+2 |
| | | | | | | * Store block entities in a map from block index * Cleanup ForEachBlockEntity * Cleanup DoWithBlockEntityAt | ||||
* | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 1 | -1/+1 |
| | |||||
* | Added cChunkDef::IsValidWidth() | Julian Laubstein | 2015-11-23 | 1 | -1/+6 |
| | |||||
* | Added cChunkDef::IsValidHeight() | Julian Laubstein | 2015-11-10 | 1 | -0/+6 |
| | |||||
* | Fixed a race condition between chunk loader and generator. | Mattes D | 2015-10-04 | 1 | -1/+2 |
| | | | | | | When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not. | ||||
* | Namechange to Cuberite | Mattes D | 2015-09-25 | 1 | -2/+2 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -17/+20 |
| | |||||
* | Changed appropriate containers to unordered_map | Tiger Wang | 2015-06-06 | 1 | -29/+0 |
| | | | | | | Thanks to @worktycho for guidance! * Potential speed improvements | ||||
* | Redstone wire and trapdoor fixes | Tiger Wang | 2015-06-06 | 1 | -0/+13 |
| | | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083 | ||||
* | Comparators | Tiger Wang | 2015-06-06 | 1 | -0/+6 |
| | |||||
* | Fixed a lot of warnings | tycho | 2015-05-19 | 1 | -2/+2 |
| | |||||
* | Replaced a std::hash specialization with explicit type. | Mattes D | 2014-12-24 | 1 | -7/+3 |
| | | | | std::hash is problematic in gcc / clang, one has a class, the other a struct. | ||||
* | gcc compilation fix. | Mattes D | 2014-12-24 | 1 | -1/+6 |
| | |||||
* | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 1 | -12/+36 |
| | | | | Fixes #1618. | ||||
* | Added a cWorld:PrepareChunk function. | Mattes D | 2014-12-10 | 1 | -1/+22 |
| | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function. | ||||
* | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 1 | -34/+30 |
|\ | |||||
| * | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 1 | -34/+30 |
|/ | |||||
* | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 1 | -8/+23 |
|\ | | | | | remove y-coord from chunks | ||||
| * | re-add the missing "s" too cChunkCoordsWithBoolList | LO1ZB | 2014-09-03 | 1 | -1/+1 |
| | | |||||
| * | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 1 | -0/+21 |
| | | |||||
| * | remove orphaned comment. | LO1ZB | 2014-08-30 | 1 | -4/+0 |
| | | |||||
| * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -4/+2 |
| | | |||||
* | | Fixed off-by-one errors in cChunkDef asserts. | madmaxoft | 2014-09-01 | 1 | -8/+8 |
|/ | |||||
* | Added initializers for class members. | Mattes D | 2014-08-21 | 1 | -1/+1 |
| | | | | As reported by Coverity, these weren't initialized. | ||||
* | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -4/+4 |
| | |||||
* | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
* | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -13/+13 |
| | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
* | Fixed issue with types not being defined for an unused parameter | Tycho | 2014-05-18 | 1 | -40/+0 |
| | |||||
* | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 1 | -9/+9 |
|\ | |||||
| * | Hopefully fixed repeated clang warnings. | madmaxoft | 2014-04-28 | 1 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 1 | -78/+40 |
|\| | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| * | Implemented comments | Tiger Wang | 2014-04-25 | 1 | -23/+42 |
| | | |||||
| * | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -67/+10 |
| | | |||||
* | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -95/+5 |
|/ | |||||
* | Attempt to fix errors | Tiger Wang | 2014-04-07 | 1 | -10/+10 |
| | |||||
* | Blocklight and skylight now compressed | Tiger Wang | 2014-04-07 | 1 | -4/+4 |
| | |||||
* | Nibbletypes are compressed | Tiger Wang | 2014-04-05 | 1 | -2/+75 |
| | | | | | + Added nibble compression * Fixed an off by one | ||||
* | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| * | Unified Vector classes | andrew | 2014-03-11 | 1 | -1/+1 |
| | | |||||
* | | Fixed Chunkdef warnings | Tycho | 2014-03-11 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into Werror | Tycho | 2014-03-11 | 1 | -16/+12 |
|\| | | | | | | | | | Conflicts: src/ChunkDef.h | ||||
| * | ChunkDef: Replaced enums with static const ints. | madmaxoft | 2014-03-09 | 1 | -10/+6 |
| | | | | | | | | This makes them easier to use in std::min et al. | ||||
* | | Fixed xofts issues | Tycho | 2014-03-10 | 1 | -18/+8 |
| | | |||||
* | | Globals.h is now warnings free again. | Tycho | 2014-03-09 | 1 | -8/+24 |
| | | | | | | | | Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs | ||||
* | | Fixed some warnings | Tycho | 2014-03-09 | 1 | -7/+10 |
|/ | |||||
* | fixed globals.h warnings | Tycho | 2014-02-23 | 1 | -0/+1 |
| | |||||
* | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -0/+1 |
| | |||||
* | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 1 | -3/+31 |
|\ | | | | | Redstone crash fix and current console line replace function | ||||
| * | Split cCoord template into one and two data types | Tiger Wang | 2014-02-01 | 1 | -10/+32 |
| | | |||||
| * | Fixed redstone simulator crash found in #570 | Tiger Wang | 2014-01-29 | 1 | -5/+11 |
| | | |||||
* | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 1 | -0/+2 |
|\ | | | | | Major refactoring of redstone | ||||
| * | Major refactoring of redstone | Tiger Wang | 2014-01-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P | ||||
* | | Include Biome enum in ChunkDef | Bill Derouin | 2014-01-10 | 1 | -2/+1 |
| | | | | | | | | Can't forward declare an enum | ||||
* | | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 1 | -91/+2 |
|/ | |||||
* | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 1 | -1/+1 |
| | | | | Also removed an unused inline header file (yuck). | ||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 1 | -1/+2 |
| | |||||
* | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | |||||
* | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 1 | -12/+12 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+617 |