Last change
on this file since 10140 was
8393,
checked in by rgrieder, 14 years ago
|
Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).
You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.
|
-
Property svn:eol-style set to
native
|
File size:
1.4 KB
|
Line | |
---|
1 | /* |
---|
2 | Bullet Continuous Collision Detection and Physics Library |
---|
3 | Copyright (c) 2003-2009 Erwin Coumans http://bulletphysics.org |
---|
4 | |
---|
5 | This software is provided 'as-is', without any express or implied warranty. |
---|
6 | In no event will the authors be held liable for any damages arising from the use of this software. |
---|
7 | Permission is granted to anyone to use this software for any purpose, |
---|
8 | including commercial applications, and to alter it and redistribute it freely, |
---|
9 | subject to the following restrictions: |
---|
10 | |
---|
11 | 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. |
---|
12 | 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. |
---|
13 | 3. This notice may not be removed or altered from any source distribution. |
---|
14 | */ |
---|
15 | |
---|
16 | /// This file was created by Alex Silverman |
---|
17 | |
---|
18 | #ifndef BT_MATERIAL_H |
---|
19 | #define BT_MATERIAL_H |
---|
20 | |
---|
21 | // Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties |
---|
22 | class btMaterial |
---|
23 | { |
---|
24 | // public members so that materials can change due to world events |
---|
25 | public: |
---|
26 | btScalar m_friction; |
---|
27 | btScalar m_restitution; |
---|
28 | int pad[2]; |
---|
29 | |
---|
30 | btMaterial(){} |
---|
31 | btMaterial(btScalar fric, btScalar rest) { m_friction = fric; m_restitution = rest; } |
---|
32 | }; |
---|
33 | |
---|
34 | #endif // BT_MATERIAL_H |
---|
35 | |
---|
Note: See
TracBrowser
for help on using the repository browser.