projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add LuaSecureRandom
[oweals/minetest.git]
/
src
/
mapgen_singlenode.cpp
diff --git
a/src/mapgen_singlenode.cpp
b/src/mapgen_singlenode.cpp
index fd443995c6ef50a0c9040f484260ff82a5266baa..8b6c25a59ea8065fd25245441733a18af76b3ee3 100644
(file)
--- a/
src/mapgen_singlenode.cpp
+++ b/
src/mapgen_singlenode.cpp
@@
-1,6
+1,6
@@
/*
Minetest
/*
Minetest
-Copyright (C) 2010-201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-201
5
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 Lesser General Public License as published by
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
@@
-24,32
+24,32
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "map.h"
#include "nodedef.h"
#include "voxelalgorithms.h"
#include "map.h"
#include "nodedef.h"
#include "voxelalgorithms.h"
-#include "profiler.h"
#include "emerge.h"
#include "emerge.h"
-//////////////////////// Mapgen Singlenode parameter read/write
-bool MapgenSinglenodeParams::readParams(Settings *settings) {
- return true;
-}
-
-
-void MapgenSinglenodeParams::writeParams(Settings *settings) {
-}
+MapgenSinglenode::MapgenSinglenode(int mapgenid,
+ MapgenParams *params, EmergeManager *emerge)
+ : Mapgen(mapgenid, params, emerge)
+{
+ flags = params->flags;
-///////////////////////////////////////////////////////////////////////////////
+ INodeDefManager *ndef = emerge->ndef;
-MapgenSinglenode::MapgenSinglenode(int mapgenid, MapgenSinglenodeParams *params) {
- flags = params->flags;
+ c_node = ndef->getId("mapgen_singlenode");
+ if (c_node == CONTENT_IGNORE)
+ c_node = CONTENT_AIR;
}
}
-MapgenSinglenode::~MapgenSinglenode() {
+MapgenSinglenode::~MapgenSinglenode()
+{
}
//////////////////////// Map generator
}
//////////////////////// Map generator
-void MapgenSinglenode::makeChunk(BlockMakeData *data) {
+void MapgenSinglenode::makeChunk(BlockMakeData *data)
+{
+ // Pre-conditions
assert(data->vmanip);
assert(data->nodedef);
assert(data->blockpos_requested.X >= data->blockpos_min.X &&
assert(data->vmanip);
assert(data->nodedef);
assert(data->blockpos_requested.X >= data->blockpos_min.X &&
@@
-60,9
+60,9
@@
void MapgenSinglenode::makeChunk(BlockMakeData *data) {
data->blockpos_requested.Z <= data->blockpos_max.Z);
this->generating = true;
data->blockpos_requested.Z <= data->blockpos_max.Z);
this->generating = true;
- this->vm = data->vmanip;
+ this->vm = data->vmanip;
this->ndef = data->nodedef;
this->ndef = data->nodedef;
-
+
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
@@
-70,12
+70,10
@@
void MapgenSinglenode::makeChunk(BlockMakeData *data) {
v3s16 node_min = blockpos_min*MAP_BLOCKSIZE;
v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1);
v3s16 node_min = blockpos_min*MAP_BLOCKSIZE;
v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1);
- content_t c_node = ndef->getId("mapgen_singlenode");
- if (c_node == CONTENT_IGNORE)
- c_node = CONTENT_AIR;
-
+ blockseed = getBlockSeed2(node_min, data->seed);
+
MapNode n_node(c_node);
MapNode n_node(c_node);
-
+
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 y = node_min.Y; y <= node_max.Y; y++) {
u32 i = vm->m_area.index(node_min.X, y, z);
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 y = node_min.Y; y <= node_max.Y; y++) {
u32 i = vm->m_area.index(node_min.X, y, z);
@@
-90,14
+88,14
@@
void MapgenSinglenode::makeChunk(BlockMakeData *data) {
updateLiquid(&data->transforming_liquid, node_min, node_max);
// Calculate lighting
updateLiquid(&data->transforming_liquid, node_min, node_max);
// Calculate lighting
- if (!(flags & MG_NOLIGHT))
- calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
- node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
-
+ if (flags & MG_LIGHT)
+ calcLighting(node_min, node_max);
+
this->generating = false;
}
this->generating = false;
}
-int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p) {
+int MapgenSinglenode::getGroundLevelAtPoint(v2s16 p)
+{
return 0;
}
return 0;
}