Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp @ 11050

Last change on this file since 11050 was 8351, checked in by rgrieder, 14 years ago

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
  • Property svn:eol-style set to native
File size: 3.8 KB
RevLine 
[1963]1/*
2Bullet Continuous Collision Detection and Physics Library
[8351]3Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
[1963]4
5This software is provided 'as-is', without any express or implied warranty.
6In no event will the authors be held liable for any damages arising from the use of this software.
[8351]7Permission is granted to anyone to use this software for any purpose,
8including commercial applications, and to alter it and redistribute it freely,
[1963]9subject to the following restrictions:
10
111. 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.
122. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
133. This notice may not be removed or altered from any source distribution.
14*/
15
16///This file was created by Alex Silverman
17
18#include "btTriangleIndexVertexMaterialArray.h"
19
20btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
21                                   int numVertices,btScalar* vertexBase,int vertexStride,
22                                   int numMaterials, unsigned char* materialBase, int materialStride,
23                                   int* triangleMaterialsBase, int materialIndexStride) :
24btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
25{
26    btMaterialProperties mat;
27
28    mat.m_numMaterials = numMaterials;
29    mat.m_materialBase = materialBase;
30    mat.m_materialStride = materialStride;
31#ifdef BT_USE_DOUBLE_PRECISION
32    mat.m_materialType = PHY_DOUBLE;
33#else
34    mat.m_materialType = PHY_FLOAT;
35#endif
36
37    mat.m_numTriangles = numTriangles;
38    mat.m_triangleMaterialsBase = (unsigned char *)triangleMaterialsBase;
39    mat.m_triangleMaterialStride = materialIndexStride;
40    mat.m_triangleType = PHY_INTEGER;
41
42    addMaterialProperties(mat);
43}
44
45
46void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
47                                   unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
48{
49    btAssert(subpart< getNumSubParts() );
50
51    btMaterialProperties& mats = m_materials[subpart];
52
53    numMaterials = mats.m_numMaterials;
54    (*materialBase) = (unsigned char *) mats.m_materialBase;
55#ifdef BT_USE_DOUBLE_PRECISION
56    materialType = PHY_DOUBLE;
57#else
58    materialType = PHY_FLOAT;
59#endif
60    materialStride = mats.m_materialStride;
61
62    numTriangles = mats.m_numTriangles;
63    (*triangleMaterialBase) = (unsigned char *)mats.m_triangleMaterialsBase;
64    triangleMaterialStride = mats.m_triangleMaterialStride;
65    triangleType = mats.m_triangleType;
66}
67
68void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
69                                           const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
70{
71    btMaterialProperties& mats = m_materials[subpart];
72
73    numMaterials = mats.m_numMaterials;
74    (*materialBase) = (const unsigned char *) mats.m_materialBase;
75#ifdef BT_USE_DOUBLE_PRECISION
76    materialType = PHY_DOUBLE;
77#else
78    materialType = PHY_FLOAT;
79#endif
80    materialStride = mats.m_materialStride;
81
82    numTriangles = mats.m_numTriangles;
83    (*triangleMaterialBase) = (const unsigned char *)mats.m_triangleMaterialsBase;
84    triangleMaterialStride = mats.m_triangleMaterialStride;
85    triangleType = mats.m_triangleType;
86}
Note: See TracBrowser for help on using the repository browser.