Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #505 from erwincoumans/master

Browse Source 
Update to ZLib license for GWEN files with permission from Garry Newman
This commit is contained in:
erwincoumans
2015-10-26 14:26:10 -07:00
parent 9731d82ee8 163b797d8b
commit 67cb01c0b1
4 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Importers/ImportObjDemo/ImportObjExample.cpp
View File

@@ -59,7 +59,7 @@ void ImportObjSetup::initPhysics()
m_dynamicsWorld->getDebugDrawer()->setDebugMode(btIDebugDraw::DBG_DrawWireframe);
const char* fileName = "sphere8.obj";//sponza_closed.obj";//sphere8.obj";
const char* fileName = "cube.obj";//sphere8.obj";//sponza_closed.obj";//sphere8.obj";
char relativeFileName[1024];
if (b3ResourcePath::findResourcePath(fileName, relativeFileName, 1024))
{
@@ -70,7 +70,7 @@ void ImportObjSetup::initPhysics()
btVector3 shift(0,0,0);
btVector3 scaling(10,10,10);
btVector3 scaling(1,1,1);
// int index=10;
{

32
examples/ThirdPartyLibs/Gwen/Gwen.h
View File

@@ -1,27 +1,17 @@
/*
GWEN
Copyright (c) 2010 Facepunch Studios
GWEN modified and adapted for the Bullet Physics Library
Using the Zlib license with permission from Garry Newman
MIT License
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Copyright (c) 2010 Facepunch Studios
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef GWEN_GWEN_H