minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change license of noise implementation to Simplified BSD

This commit is contained in:
kwolekr 2014-10-27 21:17:07 -04:00
parent b994a7af13
commit 6ddf458504
2 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/noise.cpp
View File

@ -1,22 +1,27 @@
/* /*
Minetest * Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> * Copyright (C) 2010-2014 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net> * Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
* All rights reserved.
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 * Redistribution and use in source and binary forms, with or without modification, are
the Free Software Foundation; either version 2.1 of the License, or * permitted provided that the following conditions are met:
(at your option) any later version. * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
This program is distributed in the hope that it will be useful, * 2. Redistributions in binary form must reproduce the above copyright notice, this list
but WITHOUT ANY WARRANTY; without even the implied warranty of * of conditions and the following disclaimer in the documentation and/or other materials
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * provided with the distribution.
GNU Lesser General Public License for more details. *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
You should have received a copy of the GNU Lesser General Public License along * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
with this program; if not, write to the Free Software Foundation, Inc., * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
*/ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <math.h> #include <math.h>
#include "noise.h" #include "noise.h"

41
src/noise.h
View File

@ -1,22 +1,27 @@
/* /*
Minetest * Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> * Copyright (C) 2010-2014 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net> * Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
* All rights reserved.
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 * Redistribution and use in source and binary forms, with or without modification, are
the Free Software Foundation; either version 2.1 of the License, or * permitted provided that the following conditions are met:
(at your option) any later version. * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
This program is distributed in the hope that it will be useful, * 2. Redistributions in binary form must reproduce the above copyright notice, this list
but WITHOUT ANY WARRANTY; without even the implied warranty of * of conditions and the following disclaimer in the documentation and/or other materials
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * provided with the distribution.
GNU Lesser General Public License for more details. *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
You should have received a copy of the GNU Lesser General Public License along * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
with this program; if not, write to the Free Software Foundation, Inc., * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
*/ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef NOISE_HEADER #ifndef NOISE_HEADER
#define NOISE_HEADER #define NOISE_HEADER