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

23
data/cube.mtl
View File

@@ -1,11 +1,14 @@
# Blender MTL File: 'None' newmtl cube
# Material Count: 1 Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.0000 0.0000 0.0000
Kd 0.5880 0.5880 0.5880
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka cube.png
map_Kd cube.png
newmtl Material
Ns 96.078431
Ka 0.000000 0.000000 0.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ni 1.000000
d 1.000000
illum 2

72
data/cube.obj
View File

@@ -1,26 +1,48 @@
# Blender v2.66 (sub 1) OBJ File: '' # cube.obj
# www.blender.org #
o cube
mtllib cube.mtl mtllib cube.mtl
o Cube
v 1.000000 -1.000000 -1.000000 v -0.500000 -0.500000 0.500000
v 1.000000 -1.000000 1.000000 v 0.500000 -0.500000 0.500000
v -1.000000 -1.000000 1.000000 v -0.500000 0.500000 0.500000
v -1.000000 -1.000000 -1.000000 v 0.500000 0.500000 0.500000
v 1.000000 1.000000 -0.999999 v -0.500000 0.500000 -0.500000
v 0.999999 1.000000 1.000001 v 0.500000 0.500000 -0.500000
v -1.000000 1.000000 1.000000 v -0.500000 -0.500000 -0.500000
v -1.000000 1.000000 -1.000000 v 0.500000 -0.500000 -0.500000
usemtl Material
s off vt 0.000000 0.000000
f 1 2 3 vt 1.000000 0.000000
f 5 8 7 vt 0.000000 1.000000
f 1 5 6 vt 1.000000 1.000000
f 2 6 3
f 3 7 4 vn 0.000000 0.000000 1.000000
f 5 1 4 vn 0.000000 1.000000 0.000000
f 4 1 3 vn 0.000000 0.000000 -1.000000
f 6 5 7 vn 0.000000 -1.000000 0.000000
f 2 1 6 vn 1.000000 0.000000 0.000000
f 6 7 3 vn -1.000000 0.000000 0.000000
f 7 8 4
f 8 5 4 g cube
usemtl cube
s 1
f 1/1/1 2/2/1 3/3/1
f 3/3/1 2/2/1 4/4/1
s 2
f 3/1/2 4/2/2 5/3/2
f 5/3/2 4/2/2 6/4/2
s 3
f 5/4/3 6/3/3 7/2/3
f 7/2/3 6/3/3 8/1/3
s 4
f 7/1/4 8/2/4 1/3/4
f 1/3/4 8/2/4 2/4/4
s 5
f 2/1/5 8/2/5 4/3/5
f 4/3/5 8/2/5 6/4/5
s 6
f 7/1/6 1/2/6 5/3/6
f 5/3/6 1/2/6 3/4/6

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

@@ -59,7 +59,7 @@ void ImportObjSetup::initPhysics()
m_dynamicsWorld->getDebugDrawer()->setDebugMode(btIDebugDraw::DBG_DrawWireframe); 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]; char relativeFileName[1024];
if (b3ResourcePath::findResourcePath(fileName, relativeFileName, 1024)) if (b3ResourcePath::findResourcePath(fileName, relativeFileName, 1024))
{ {
@@ -70,7 +70,7 @@ void ImportObjSetup::initPhysics()
btVector3 shift(0,0,0); btVector3 shift(0,0,0);
btVector3 scaling(10,10,10); btVector3 scaling(1,1,1);
// int index=10; // 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 Copyright (c) 2010 Facepunch Studios
This software is provided 'as-is', without any express or implied warranty.
Permission is hereby granted, free of charge, to any person obtaining a copy In no event will the authors be held liable for any damages arising from the use of this software.
of this software and associated documentation files (the "Software"), to deal Permission is granted to anyone to use this software for any purpose,
in the Software without restriction, including without limitation the rights including commercial applications, and to alter it and redistribute it freely,
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell subject to the following restrictions:
copies of the Software, and to permit persons to whom the Software is 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.
furnished to do so, subject to the following conditions: 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.
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.
*/ */
#ifndef GWEN_GWEN_H #ifndef GWEN_GWEN_H