libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 19:54:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MATH: convert LGPL code to GPL

Browse Source
This commit is contained in:
Pawel Kolodziejski 2015-01-17 21:08:27 +01:00
parent a8d4f76f37
commit cdd837f379
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING.LGPL
View File

@ -1,6 +1,4 @@
NOTE: Only certain parts of the ResidualVM project are under the GNU LGPL.
ResidualVM use some math code of plib and Portalib3d software. Look into
source code files "math/quat.cpp" and "math/matrix4.cpp" for more info.
The majority of the files are under the GNU GPL. See the headers of the
individual files to find out the exact license.

24
math/matrix4.cpp
View File

@ -20,6 +20,19 @@
*
*/
/*
* The following functions: inverseTranslate, inverseRotate, transpose
* are adapted from Portalib3d, which is no longer available on the net.
* But is available through archive.org, for reference:
* http://web.archive.org/web/20050205215104/http://rsn.gamedev.net/pl3d/changelog.html
*
* This code was originally made available under the LGPL license (no version specified).
* Copyright (C)2000, 2001, Brett Porter. All Rights Reserved.
*
* This code (and our modifications) is made available here under the GPLv2 (or later).
*
*/
#include "math/matrix4.h"
#include "math/vector4d.h"
#include "math/squarematrix.h"
@ -118,17 +131,6 @@ void Matrix<4, 4>::invertAffineOrthonormal() {
setPosition(position);
}
// The following functions are adapted from Portalib3d, which no longer is
// available on the net, but was used in the iconoclast-project:
// http://code.google.com/p/iconoclast/
// Original copyright notice (license.txt was not supplied in iconoclast)
// http://web.archive.org/web/20050209062435/http://rsn.gamedev.net/pl3d/license.txt
// Author: Brett Porter
// Email: brettporter@yahoo.com
// Website: http://rsn.gamedev.net/pl3d
// Copyright (C)2000, 2001, Brett Porter. All Rights Reserved.
// This source code is released under the LGPL. See license.txt for details.
void Matrix<4, 4>::inverseTranslate(Vector3d *v) const {
v->x() = v->x() - getValue(0, 3);
v->y() = v->y() - getValue(1, 3);

22
math/quat.cpp
View File

@ -20,17 +20,21 @@
*
*/
// Quaternion-math originally borrowed from plib http://plib.sourceforge.net/index.html
// Which is covered by LGPL2
// And has this additional copyright note:
/*
Quaternion routines are Copyright (C) 1999
Kevin B. Thompson <kevinbthompson@yahoo.com>
Modified by Sylvan W. Clebsch <sylvan@stanford.edu>
Largely rewritten by "Negative0" <negative0@earthlink.net>
* Quaternion-math originally borrowed from plib http://plib.sourceforge.net/index.html
* This code was originally made available under the LGPLv2 license (or later).
*
* Quaternion routines are Copyright (C) 1999
* Kevin B. Thompson <kevinbthompson@yahoo.com>
* Modified by Sylvan W. Clebsch <sylvan@stanford.edu>
* Largely rewritten by "Negative0" <negative0@earthlink.net>
*
* This code (and our modifications) is made available here under the GPLv2 (or later).
*
* Additional changes written based on the math presented in
* http://www.swarthmore.edu/NatSci/mzucker1/e27/diebel2006attitude.pdf
*
*/
// Additional changes written based on the math presented in
// http://www.swarthmore.edu/NatSci/mzucker1/e27/diebel2006attitude.pdf
#include "common/streamdebug.h"