maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Collision margin.

Browse source
This commit is contained in:
Lubos Lenco 2016-05-06 23:46:04 +02:00
parent 3162a01974
commit 7034be1da1
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Sources/cycles/trait/RigidBody.hx
View file

@ -32,6 +32,7 @@ class RigidBody extends Trait {
public var mass:Float;
public var friction:Float;
public var collisionMargin:Float;
public var body:BtRigidBodyPointer = null;
public var bodyCreated = false;
@ -42,17 +43,22 @@ class RigidBody extends Trait {
public var onCreated:Void->Void = null;
public function new(mass:Float = 1, shape:Int = SHAPE_BOX, friction:Float = 0.5) {
public function new(mass = 1.0, shape = SHAPE_BOX, friction = 0.5, collisionMargin = 0.0) {
super();
this.mass = mass;
this.shape = shape;
this.friction = friction;
this.collisionMargin = collisionMargin;
requestInit(init);
requestLateUpdate(lateUpdate);
requestRemove(removeFromWorld);
}
inline function withMargin(f:Float) {
return f - f * collisionMargin;
}
public function init() {
@ -69,12 +75,12 @@ class RigidBody extends Trait {
if (shape == SHAPE_BOX) {
_shape = BtBoxShape.create(BtVector3.create(
transform.size.x / 2,
transform.size.y / 2,
transform.size.z / 2).value);
withMargin(transform.size.x / 2),
withMargin(transform.size.y / 2),
withMargin(transform.size.z / 2)).value);
}
else if (shape == SHAPE_SPHERE) {
_shape = BtSphereShape.create(transform.size.x / 2);
_shape = BtSphereShape.create(withMargin(transform.size.x / 2));
}
else if (shape == SHAPE_CONVEX_HULL || shape == SHAPE_MESH) { // Use convex hull for mesh for now
_shapeConvex = BtConvexHullShape.create();
@ -83,19 +89,19 @@ class RigidBody extends Trait {
}
else if (shape == SHAPE_CONE) {
_shape = BtConeShapeZ.create(
transform.size.x / 2, // Radius
transform.size.z); // Height
withMargin(transform.size.x / 2), // Radius
withMargin(transform.size.z)); // Height
}
else if (shape == SHAPE_CYLINDER) {
_shape = BtCylinderShapeZ.create(BtVector3.create(
transform.size.x / 2,
transform.size.y / 2,
transform.size.z / 2).value);
withMargin(transform.size.x / 2),
withMargin(transform.size.y / 2),
withMargin(transform.size.z / 2)).value);
}
else if (shape == SHAPE_CAPSULE) {
_shape = BtCapsuleShapeZ.create(
(transform.size.x / 2),// * scaleX, // Radius
transform.size.z);// * scaleZ); // Height
withMargin(transform.size.x / 2),// * scaleX, // Radius
withMargin(transform.size.z));// * scaleZ); // Height
}
//else if (shape == SHAPE_TERRAIN) {
// throw "Terrain not yet supported, use static mesh instead.";

2
blender/armory.py
View file

@ -2107,6 +2107,8 @@ class ArmoryExporter(bpy.types.Operator, ExportHelper):
x.type = 'Script'
x.class_name = 'RigidBody'
x.parameters = [body_mass, shape, rb.friction]
if rb.use_margin:
x.parameters.append(rb.collision_margin)
o.traits.append(x)
def cb_export_camera(self, object, o):

5
raw/forward/forward.frag.glsl
View file

@ -124,7 +124,8 @@ float shadowTest(vec4 lPos) {
lPosH.x = (lPosH.x + 1.0) / 2.0;
lPosH.y = 1.0 - ((-lPosH.y + 1.0) / (2.0));
return PCF(vec2(2048.0, 2048.0), lPosH.st, lPosH.z - 0.005);
const float bias = 0.008;
return PCF(vec2(2048.0, 2048.0), lPosH.st, lPosH.z - bias);
// return VSM(lPosH.st, lPosH.z);
// shadow2DSampler
@ -285,7 +286,7 @@ void main() {
if (receiveShadow) {
if (lPos.w > 0.0) {
visibility = shadowTest(lPos);
visibility = 1.0;
// visibility = 1.0;
}
}