Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-11-21 11:22:01 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-11-21 11:22:01 +0300
commitdba9042bb5f254af6d976959560e441058afbd0c (patch)
treea548456b8231c3390f9eae0f4ba7df050edfdb6f /extern
parent2e4e4b49435074eb7b999a8cc12d32652b0de006 (diff)
added ConeZ/ConeX
Diffstat (limited to 'extern')
-rw-r--r--extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
index 4cf11f1a977..46232b3187c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
@@ -27,6 +27,18 @@ m_height(height)
m_sinAngle = (m_radius / sqrt(m_radius * m_radius + m_height * m_height));
}
+btConeShapeZ::btConeShapeZ (btScalar radius,btScalar height):
+btConeShape(radius,height)
+{
+ setConeUpIndex(2);
+}
+
+btConeShapeX::btConeShapeX (btScalar radius,btScalar height):
+btConeShape(radius,height)
+{
+ setConeUpIndex(0);
+}
+
///choose upAxis index
void btConeShape::setConeUpIndex(int upIndex)
{