mirror of
https://github.com/moparisthebest/minetest
synced 2024-11-11 20:05:05 -05:00
f33d31693e
See: https://github.com/minetest/minetest/issues/1525 Background Wuzzy2: If you attempt to spawn a L-system tree with minetest.spawn_tree, you can make Minetest crash if it is attempted to pop an empty stack. ShadowNinja: This shouldn't cause a segmentation fault, but it should throw a Lua error Commit Description This commit throws a Lua error instead of causing a segmentation fault. The server will still "crash" but will include a Lua backtrace. L-Systems fix randomness Unless a random seed is provided (via Lua treedef) seed the PRNG with a different seed for each tree Resolves: https://github.com/minetest/minetest/issues/1469 Fix l-system crash when treedef random_level not set by Lua
92 lines
2.8 KiB
C++
92 lines
2.8 KiB
C++
/*
|
|
Minetest
|
|
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>,
|
|
2012-2013 RealBadAngel, Maciej Kasatkin <mk@realbadangel.pl>
|
|
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.
|
|
*/
|
|
|
|
#ifndef TREEGEN_HEADER
|
|
#define TREEGEN_HEADER
|
|
|
|
#include <matrix4.h>
|
|
#include "noise.h"
|
|
|
|
class ManualMapVoxelManipulator;
|
|
class INodeDefManager;
|
|
class ServerEnvironment;
|
|
|
|
|
|
namespace treegen {
|
|
|
|
enum error {
|
|
SUCCESS,
|
|
UNBALANCED_BRACKETS
|
|
};
|
|
|
|
struct TreeDef {
|
|
std::string initial_axiom;
|
|
std::string rules_a;
|
|
std::string rules_b;
|
|
std::string rules_c;
|
|
std::string rules_d;
|
|
|
|
MapNode trunknode;
|
|
MapNode leavesnode;
|
|
MapNode leaves2node;
|
|
|
|
int leaves2_chance;
|
|
int angle;
|
|
int iterations;
|
|
int iterations_random_level;
|
|
std::string trunk_type;
|
|
bool thin_branches;
|
|
MapNode fruitnode;
|
|
int fruit_chance;
|
|
int seed;
|
|
bool explicit_seed;
|
|
};
|
|
|
|
// Add default tree
|
|
void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
|
|
bool is_apple_tree, INodeDefManager *ndef, int seed);
|
|
// Add jungle tree
|
|
void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
|
|
INodeDefManager *ndef, int seed);
|
|
|
|
// Add L-Systems tree (used by engine)
|
|
treegen::error make_ltree(ManualMapVoxelManipulator &vmanip, v3s16 p0, INodeDefManager *ndef,
|
|
TreeDef tree_definition);
|
|
// Spawn L-systems tree from LUA
|
|
treegen::error spawn_ltree (ServerEnvironment *env, v3s16 p0, INodeDefManager *ndef,
|
|
TreeDef tree_definition);
|
|
|
|
// L-System tree gen helper functions
|
|
void tree_node_placement(ManualMapVoxelManipulator &vmanip, v3f p0,
|
|
MapNode node);
|
|
void tree_trunk_placement(ManualMapVoxelManipulator &vmanip, v3f p0,
|
|
TreeDef &tree_definition);
|
|
void tree_leaves_placement(ManualMapVoxelManipulator &vmanip, v3f p0,
|
|
PseudoRandom ps, TreeDef &tree_definition);
|
|
void tree_single_leaves_placement(ManualMapVoxelManipulator &vmanip, v3f p0,
|
|
PseudoRandom ps, TreeDef &tree_definition);
|
|
void tree_fruit_placement(ManualMapVoxelManipulator &vmanip, v3f p0,
|
|
TreeDef &tree_definition);
|
|
irr::core::matrix4 setRotationAxisRadians(irr::core::matrix4 M, double angle, v3f axis);
|
|
|
|
v3f transposeMatrix(irr::core::matrix4 M ,v3f v);
|
|
|
|
}; // namespace treegen
|
|
#endif
|