Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

new treegrowth code

This commit is contained in:
darkrose 2015-05-28 17:31:53 +10:00
parent 21421b07d3
commit 27aa15bf5a
6 changed files with 446 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -203,6 +203,7 @@ set(common_SRCS
filesys.cpp filesys.cpp
connection.cpp connection.cpp
environment.cpp environment.cpp
plantgrowth.cpp
server.cpp server.cpp
servercommand.cpp servercommand.cpp
socket.cpp socket.cpp

269
src/environment.cpp
View File

@ -34,7 +34,7 @@
#include "serverobject.h" #include "serverobject.h"
#include "content_sao.h" #include "content_sao.h"
#include "content_mob.h" #include "content_mob.h"
#include "mapgen.h" #include "plantgrowth.h"
#include "settings.h" #include "settings.h"
#include "log.h" #include "log.h"
#include "profiler.h" #include "profiler.h"
@ -1992,41 +1992,11 @@ void ServerEnvironment::step(float dtime)
search.push_back(CONTENT_IGNORE); search.push_back(CONTENT_IGNORE);
core::map<v3s16, MapBlock*> modified_blocks; core::map<v3s16, MapBlock*> modified_blocks;
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
if (!searchNearInv(p,v3s16(-10,2,-10),v3s16(10,12,10),search,NULL)) { if (!searchNearInv(p,v3s16(-10,2,-10),v3s16(10,12,10),search,NULL)) {
mapgen::make_largetree(vmanip, tree_p); plantgrowth_largetree(this,p);
}else{ }else{
mapgen::make_tree(vmanip, tree_p); plantgrowth_tree(this,p);
} }
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
}else if (n.envticks > 15) { }else if (n.envticks > 15) {
std::vector<content_t> search; std::vector<content_t> search;
search.push_back(CONTENT_AIR); search.push_back(CONTENT_AIR);
@ -2112,42 +2082,11 @@ void ServerEnvironment::step(float dtime)
actionstream<<"A sapling grows into a tree at " actionstream<<"A sapling grows into a tree at "
<<PP(p)<<std::endl; <<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks;
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
if (!searchNearInv(p,v3s16(-10,2,-10),v3s16(10,12,10),search,NULL)) { if (!searchNearInv(p,v3s16(-10,2,-10),v3s16(10,12,10),search,NULL)) {
mapgen::make_largetree(vmanip, tree_p); plantgrowth_largetree(this,p);
}else{ }else{
mapgen::make_tree(vmanip, tree_p); plantgrowth_tree(this,p);
} }
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
} }
} }
} }
@ -2160,38 +2099,7 @@ void ServerEnvironment::step(float dtime)
if (n.envticks > 1000) { if (n.envticks > 1000) {
actionstream<<"A sapling grows into a tree at "<<PP(p)<<std::endl; actionstream<<"A sapling grows into a tree at "<<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_appletree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_appletree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
}else if (n.envticks > 15) { }else if (n.envticks > 15) {
std::vector<content_t> search; std::vector<content_t> search;
search.push_back(CONTENT_AIR); search.push_back(CONTENT_AIR);
@ -2276,38 +2184,7 @@ void ServerEnvironment::step(float dtime)
actionstream<<"A sapling grows into a tree at " actionstream<<"A sapling grows into a tree at "
<<PP(p)<<std::endl; <<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_appletree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_appletree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
} }
} }
} }
@ -2320,38 +2197,7 @@ void ServerEnvironment::step(float dtime)
if (n.envticks > 1000) { if (n.envticks > 1000) {
actionstream<<"A sapling grows into a jungle tree at "<<PP(p)<<std::endl; actionstream<<"A sapling grows into a jungle tree at "<<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_jungletree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_jungletree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
}else if (n.envticks > 15) { }else if (n.envticks > 15) {
std::vector<content_t> search; std::vector<content_t> search;
search.push_back(CONTENT_AIR); search.push_back(CONTENT_AIR);
@ -2438,38 +2284,7 @@ void ServerEnvironment::step(float dtime)
actionstream<<"A sapling grows into a jungle tree at " actionstream<<"A sapling grows into a jungle tree at "
<<PP(p)<<std::endl; <<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_jungletree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_jungletree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
} }
} }
} }
@ -2482,38 +2297,7 @@ void ServerEnvironment::step(float dtime)
if (n.envticks > 1000) { if (n.envticks > 1000) {
actionstream<<"A sapling grows into a conifer tree at "<<PP(p)<<std::endl; actionstream<<"A sapling grows into a conifer tree at "<<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_conifertree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_conifertree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
}else if (n.envticks > 15) { }else if (n.envticks > 15) {
std::vector<content_t> search; std::vector<content_t> search;
search.push_back(CONTENT_AIR); search.push_back(CONTENT_AIR);
@ -2599,38 +2383,7 @@ void ServerEnvironment::step(float dtime)
actionstream<<"A sapling grows into a conifer tree at " actionstream<<"A sapling grows into a conifer tree at "
<<PP(p)<<std::endl; <<PP(p)<<std::endl;
core::map<v3s16, MapBlock*> modified_blocks; plantgrowth_conifertree(this,p);
v3s16 tree_p = p;
ManualMapVoxelManipulator vmanip(m_map);
v3s16 tree_blockp = getNodeBlockPos(tree_p);
vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1));
mapgen::make_conifertree(vmanip, tree_p);
vmanip.blitBackAll(&modified_blocks);
// update lighting
core::map<v3s16, MapBlock*> lighting_modified_blocks;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue());
}
m_map->updateLighting(lighting_modified_blocks, modified_blocks);
// Send a MEET_OTHER event
MapEditEvent event;
event.type = MEET_OTHER;
for(core::map<v3s16, MapBlock*>::Iterator
i = modified_blocks.getIterator();
i.atEnd() == false; i++)
{
v3s16 p = i.getNode()->getKey();
event.modified_blocks.insert(p, true);
}
m_map->dispatchEvent(&event);
// work-around for lighting bug
MapNode nn = m_map->getNodeNoEx(p);
m_map->addNodeWithEvent(p,nn);
} }
} }
} }

14
src/mapgen.cpp
View File

@ -39,7 +39,7 @@ namespace mapgen
Some helper functions for the map generator Some helper functions for the map generator
*/ */
void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0) static void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode treenode(CONTENT_TREE); MapNode treenode(CONTENT_TREE);
MapNode leavesnode(CONTENT_LEAVES); MapNode leavesnode(CONTENT_LEAVES);
@ -110,7 +110,7 @@ void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
} }
} }
void make_appletree(ManualMapVoxelManipulator &vmanip, v3s16 p0) static void make_appletree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode treenode(CONTENT_APPLE_TREE); MapNode treenode(CONTENT_APPLE_TREE);
MapNode leavesnode(CONTENT_APPLE_LEAVES); MapNode leavesnode(CONTENT_APPLE_LEAVES);
@ -190,7 +190,7 @@ void make_appletree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
} }
} }
void make_conifertree(ManualMapVoxelManipulator &vmanip, v3s16 p0) static void make_conifertree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode treenode(CONTENT_CONIFER_TREE); MapNode treenode(CONTENT_CONIFER_TREE);
MapNode leavesnode(CONTENT_CONIFER_LEAVES); MapNode leavesnode(CONTENT_CONIFER_LEAVES);
@ -227,7 +227,7 @@ void make_conifertree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
} }
void make_largetree(ManualMapVoxelManipulator &vmanip, v3s16 p0) static void make_largetree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode treenode(CONTENT_TREE); MapNode treenode(CONTENT_TREE);
MapNode leavesnode(CONTENT_LEAVES); MapNode leavesnode(CONTENT_LEAVES);
@ -332,7 +332,7 @@ void make_largetree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
} }
} }
void make_jungletree(ManualMapVoxelManipulator &vmanip, v3s16 p0) static void make_jungletree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode treenode(CONTENT_JUNGLETREE); MapNode treenode(CONTENT_JUNGLETREE);
MapNode leavesnode(CONTENT_JUNGLELEAVES); MapNode leavesnode(CONTENT_JUNGLELEAVES);
@ -418,7 +418,7 @@ void make_jungletree(ManualMapVoxelManipulator &vmanip, v3s16 p0)
} }
} }
void make_papyrus(VoxelManipulator &vmanip, v3s16 p0) static void make_papyrus(VoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode papyrusnode(CONTENT_PAPYRUS); MapNode papyrusnode(CONTENT_PAPYRUS);
@ -431,7 +431,7 @@ void make_papyrus(VoxelManipulator &vmanip, v3s16 p0)
} }
} }
void make_cactus(VoxelManipulator &vmanip, v3s16 p0) static void make_cactus(VoxelManipulator &vmanip, v3s16 p0)
{ {
MapNode cactusnode(CONTENT_CACTUS); MapNode cactusnode(CONTENT_CACTUS);

12
src/mapgen.h
View File

@ -67,17 +67,6 @@ namespace mapgen
// Main map generation routine // Main map generation routine
void make_block(BlockMakeData *data); void make_block(BlockMakeData *data);
// Add a tree
void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0);
// Add an apple tree
void make_appletree(ManualMapVoxelManipulator &vmanip, v3s16 p0);
// Add a large tree
void make_largetree(ManualMapVoxelManipulator &vmanip, v3s16 p0);
// Add a jungle tree
void make_jungletree(ManualMapVoxelManipulator &vmanip, v3s16 p0);
// Add a conifer tree
void make_conifertree(ManualMapVoxelManipulator &vmanip, v3s16 p0);
/* /*
These are used by FarMesh These are used by FarMesh
*/ */
@ -87,4 +76,3 @@ namespace mapgen
}; // namespace mapgen }; // namespace mapgen
#endif #endif

395
src/plantgrowth.cpp Normal file
View File

@ -0,0 +1,395 @@
/************************************************************************
* plantgrowth.cpp
* voxelands - 3d voxel world sandbox game
* Copyright (C) Lisa 'darkrose' Milne 2015 <lisa@ltmnet.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 3 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, see <http://www.gnu.org/licenses/>
*
* License updated from GPLv2 or later to GPLv3 or later by Lisa Milne
* for Voxelands.
************************************************************************/
#include "environment.h"
#include "content_mapnode.h"
#include "mapblock.h"
#include "map.h"
void plantgrowth_tree(ServerEnvironment *env, v3s16 p0)
{
MapNode treenode(CONTENT_TREE);
MapNode leavesnode(CONTENT_LEAVES);
Map *map = &env->getMap();
s16 trunk_h = myrand_range(5,6);
v3s16 p1 = p0;
for (s16 ii=0; ii<trunk_h; ii++) {
map->addNodeWithEvent(p1,treenode);
p1.Y++;
}
// p1 is now the last piece of the trunk
p1.Y -= 1;
VoxelArea leaves_a(v3s16(-2,-1,-2), v3s16(2,2,2));
Buffer<u8> leaves_d(leaves_a.getVolume());
for (s32 i=0; i<leaves_a.getVolume(); i++) {
leaves_d[i] = 0;
}
// Force leaves at near the end of the trunk
for (s16 z=-1; z<=1; z++) {
for (s16 y=-1; y<=1; y++) {
for (s16 x=-1; x<=1; x++) {
leaves_d[leaves_a.index(v3s16(x,y,z))] = 1;
}
}
}
// Add leaves randomly
for (u32 iii=0; iii<7; iii++) {
v3s16 p(
myrand_range(leaves_a.MinEdge.X, leaves_a.MaxEdge.X-1),
myrand_range(leaves_a.MinEdge.Y, leaves_a.MaxEdge.Y-1),
myrand_range(leaves_a.MinEdge.Z, leaves_a.MaxEdge.Z-1)
);
for (s16 z=0; z<=1; z++) {
for (s16 y=0; y<=1; y++) {
for (s16 x=0; x<=1; x++) {
leaves_d[leaves_a.index(p+v3s16(x,y,z))] = 1;
}
}
}
}
// Blit leaves to vmanip
for (s16 z=leaves_a.MinEdge.Z; z<=leaves_a.MaxEdge.Z; z++) {
for (s16 y=leaves_a.MinEdge.Y; y<=leaves_a.MaxEdge.Y; y++) {
for (s16 x=leaves_a.MinEdge.X; x<=leaves_a.MaxEdge.X; x++) {
v3s16 p(x,y,z);
p += p1;
u32 i = leaves_a.index(x,y,z);
if (leaves_d[i] != 1)
continue;
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
map->addNodeWithEvent(p,leavesnode);
}
}
}
}
void plantgrowth_appletree(ServerEnvironment *env, v3s16 p0)
{
MapNode treenode(CONTENT_APPLE_TREE);
MapNode leavesnode(CONTENT_APPLE_LEAVES);
MapNode applenode(CONTENT_APPLE);
Map *map = &env->getMap();
s16 trunk_h = myrand_range(4, 5);
v3s16 p1 = p0;
for (s16 ii=0; ii<trunk_h; ii++) {
map->addNodeWithEvent(p1,treenode);
p1.Y++;
}
// p1 is now the last piece of the trunk
p1.Y -= 1;
VoxelArea leaves_a(v3s16(-2,-1,-2), v3s16(2,2,2));
Buffer<u8> leaves_d(leaves_a.getVolume());
for (s32 i=0; i<leaves_a.getVolume(); i++) {
leaves_d[i] = 0;
}
// Force leaves at near the end of the trunk
for (s16 z=-1; z<=1; z++) {
for (s16 y=-1; y<=1; y++) {
for (s16 x=-1; x<=1; x++) {
leaves_d[leaves_a.index(v3s16(x,y,z))] = 1;
}
}
}
// Add leaves randomly
for (u32 iii=0; iii<7; iii++) {
v3s16 p(
myrand_range(leaves_a.MinEdge.X, leaves_a.MaxEdge.X-1),
myrand_range(leaves_a.MinEdge.Y, leaves_a.MaxEdge.Y-1),
myrand_range(leaves_a.MinEdge.Z, leaves_a.MaxEdge.Z-1)
);
for (s16 z=0; z<=1; z++) {
for (s16 y=0; y<=1; y++) {
for (s16 x=0; x<=1; x++) {
leaves_d[leaves_a.index(p+v3s16(x,y,z))] = 1;
}
}
}
}
// not all apple trees have apples
bool have_fruit = (myrand_range(0,4) == 0);
// Blit leaves to vmanip
for (s16 z=leaves_a.MinEdge.Z; z<=leaves_a.MaxEdge.Z; z++) {
for (s16 y=leaves_a.MinEdge.Y; y<=leaves_a.MaxEdge.Y; y++) {
for (s16 x=leaves_a.MinEdge.X; x<=leaves_a.MaxEdge.X; x++) {
v3s16 p(x,y,z);
p += p1;
u32 i = leaves_a.index(x,y,z);
if (leaves_d[i] != 1)
continue;
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
if (have_fruit && myrand_range(0,99) < 10) {
map->addNodeWithEvent(p,applenode);
}else{
map->addNodeWithEvent(p,leavesnode);
}
}
}
}
}
void plantgrowth_conifertree(ServerEnvironment *env, v3s16 p0)
{
MapNode treenode(CONTENT_CONIFER_TREE);
MapNode leavesnode(CONTENT_CONIFER_LEAVES);
Map *map = &env->getMap();
s16 trunk_h = myrand_range(8, 11);
v3s16 p1 = p0;
for (s16 ii=0; ii<trunk_h; ii++) {
map->addNodeWithEvent(p1,treenode);
p1.Y++;
}
// p1 is now the last piece of the trunk
map->addNodeWithEvent(p1+v3s16(0,1,0),leavesnode);
for (s16 z=-1; z<=1; z++) {
for (s16 y=-2; y<=0; y++) {
for (s16 x=-1; x<=1; x++) {
if (!x && !z)
continue;
v3s16 p = p1+v3s16(x,y,z);
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
map->addNodeWithEvent(p,leavesnode);
}
}
}
for (s16 z=-2; z<=2; z++) {
for (s16 y=-5; y<-2; y++) {
for (s16 x=-2; x<=2; x++) {
if (!x && !z)
continue;
v3s16 p = p1+v3s16(x,y,z);
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
map->addNodeWithEvent(p,leavesnode);
}
}
}
}
void plantgrowth_largetree(ServerEnvironment *env, v3s16 p0)
{
MapNode treenode(CONTENT_TREE);
MapNode leavesnode(CONTENT_LEAVES);
Map *map = &env->getMap();
s16 trunk_h = myrand_range(10, 12);
v3s16 p1 = p0;
for (s16 ii=0; ii<trunk_h; ii++) {
map->addNodeWithEvent(p1,treenode);
p1.Y++;
}
// p1 is now the last piece of the trunk
p1.Y -= 1;
VoxelArea leaves_a(v3s16(-3,-3,-3), v3s16(3,3,3));
Buffer<u8> leaves_d(leaves_a.getVolume());
for (s32 i=0; i<leaves_a.getVolume(); i++) {
leaves_d[i] = 0;
}
for (s16 k=0; k<5; k++) {
if (k == 1) {
p1.Y -= 3;
for (s16 ki=0; ki<4; ki++) {
p1.X++;
map->addNodeWithEvent(p1,treenode);
}
p1.X--;
}else if (k == 2) {
p1.X -= 3;
for (s16 ki=0; ki<4; ki++) {
p1.X--;
map->addNodeWithEvent(p1,treenode);
}
p1.X++;
}else if (k == 3) {
p1.X += 3;
for (s16 ki=0; ki<4; ki++) {
p1.Z++;
map->addNodeWithEvent(p1,treenode);
}
p1.Z--;
}else if (k == 4) {
p1.Z -= 3;
for (s16 ki=0; ki<4; ki++) {
p1.Z--;
map->addNodeWithEvent(p1,treenode);
}
p1.Z++;
}else{
map->addNodeWithEvent(p1,treenode);
}
// Force leaves at near the end of the trunk
for (s16 z=-1; z<=1; z++) {
for (s16 y=-1; y<=1; y++) {
for (s16 x=-1; x<=1; x++) {
leaves_d[leaves_a.index(v3s16(x,y,z))] = 1;
}
}
}
if (k) {
// Add leaves randomly
for (u32 iii=0; iii<10; iii++) {
v3s16 p(
myrand_range(leaves_a.MinEdge.X, leaves_a.MaxEdge.X-1),
myrand_range(leaves_a.MinEdge.Y, leaves_a.MaxEdge.Y-1),
myrand_range(leaves_a.MinEdge.Z, leaves_a.MaxEdge.Z-1)
);
for (s16 z=0; z<=1; z++) {
for (s16 y=0; y<=1; y++) {
for (s16 x=0; x<=1; x++) {
leaves_d[leaves_a.index(p+v3s16(x,y,z))] = 1;
}
}
}
}
}
// Blit leaves to vmanip
for (s16 z=leaves_a.MinEdge.Z; z<=leaves_a.MaxEdge.Z; z++) {
for (s16 y=leaves_a.MinEdge.Y; y<=leaves_a.MaxEdge.Y; y++) {
for (s16 x=leaves_a.MinEdge.X; x<=leaves_a.MaxEdge.X; x++) {
v3s16 p(x,y,z);
p += p1;
u32 i = leaves_a.index(x,y,z);
if (leaves_d[i] != 1)
continue;
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
map->addNodeWithEvent(p,leavesnode);
}
}
}
}
}
void plantgrowth_jungletree(ServerEnvironment *env, v3s16 p0)
{
MapNode treenode(CONTENT_JUNGLETREE);
MapNode leavesnode(CONTENT_JUNGLELEAVES);
Map *map = &env->getMap();
for (s16 x=-1; x<=1; x++) {
for (s16 z=-1; z<=1; z++) {
if (myrand_range(0, 2) == 0)
continue;
v3s16 p1 = p0 + v3s16(x,0,z);
v3s16 p2 = p0 + v3s16(x,-1,z);
MapNode n1 = map->getNodeNoEx(p1);
MapNode n2 = map->getNodeNoEx(p2);
if (n2.getContent() == CONTENT_AIR) {
map->addNodeWithEvent(p2,treenode);
}else if (n1.getContent() == CONTENT_AIR) {
map->addNodeWithEvent(p1,treenode);
}
}
}
s16 trunk_h = myrand_range(8, 12);
v3s16 p1 = p0;
for (s16 ii=0; ii<trunk_h; ii++) {
map->addNodeWithEvent(p1,treenode);
p1.Y++;
}
// p1 is now the last piece of the trunk
p1.Y -= 1;
VoxelArea leaves_a(v3s16(-3,-2,-3), v3s16(3,2,3));
//SharedPtr<u8> leaves_d(new u8[leaves_a.getVolume()]);
Buffer<u8> leaves_d(leaves_a.getVolume());
for (s32 i=0; i<leaves_a.getVolume(); i++) {
leaves_d[i] = 0;
}
// Force leaves at near the end of the trunk
for (s16 z=-1; z<=1; z++) {
for (s16 y=-1; y<=1; y++) {
for (s16 x=-1; x<=1; x++) {
leaves_d[leaves_a.index(v3s16(x,y,z))] = 1;
}
}
}
// Add leaves randomly
for (u32 iii=0; iii<30; iii++) {
v3s16 p(
myrand_range(leaves_a.MinEdge.X, leaves_a.MaxEdge.X-1),
myrand_range(leaves_a.MinEdge.Y, leaves_a.MaxEdge.Y-1),
myrand_range(leaves_a.MinEdge.Z, leaves_a.MaxEdge.Z-1)
);
for (s16 z=0; z<=1; z++) {
for (s16 y=0; y<=1; y++) {
for (s16 x=0; x<=1; x++) {
leaves_d[leaves_a.index(p+v3s16(x,y,z))] = 1;
}
}
}
}
// Blit leaves to vmanip
for (s16 z=leaves_a.MinEdge.Z; z<=leaves_a.MaxEdge.Z; z++) {
for (s16 y=leaves_a.MinEdge.Y; y<=leaves_a.MaxEdge.Y; y++) {
for (s16 x=leaves_a.MinEdge.X; x<=leaves_a.MaxEdge.X; x++) {
v3s16 p(x,y,z);
p += p1;
u32 i = leaves_a.index(x,y,z);
if (leaves_d[i] != 1)
continue;
MapNode n = map->getNodeNoEx(p);
if (n.getContent() != CONTENT_AIR)
continue;
map->addNodeWithEvent(p,leavesnode);
}
}
}
}

32
src/plantgrowth.h Normal file
View File

@ -0,0 +1,32 @@
/************************************************************************
* plantgrowth.h
* voxelands - 3d voxel world sandbox game
* Copyright (C) Lisa 'darkrose' Milne 2015 <lisa@ltmnet.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 3 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, see <http://www.gnu.org/licenses/>
*
* License updated from GPLv2 or later to GPLv3 or later by Lisa Milne
* for Voxelands.
************************************************************************/
#ifndef PLANTGROWTH_HEADER
#define PLANTGROWTH_HEADER
void plantgrowth_tree(ServerEnvironment *env, v3s16 p0);
void plantgrowth_appletree(ServerEnvironment *env, v3s16 p0);
void plantgrowth_conifertree(ServerEnvironment *env, v3s16 p0);
void plantgrowth_largetree(ServerEnvironment *env, v3s16 p0);
void plantgrowth_jungletree(ServerEnvironment *env, v3s16 p0);
#endif