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

Merge pull request #1847 from QuantumCoderQC/master

Browse source 
Add getGravity method. Fix getGravity logic node.
This commit is contained in:
Lubos Lenco 2020-09-08 20:20:43 +02:00 committed by GitHub
parent 036e8d6a13 cc35b01684
commit dc16740360
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sources/armory/logicnode/GetGravityNode.hx
View file

@ -10,7 +10,7 @@ class GetGravityNode extends LogicNode {
#if arm_physics #if arm_physics
var physics = armory.trait.physics.PhysicsWorld.active; var physics = armory.trait.physics.PhysicsWorld.active;
return physics.world.getGravity(); return physics.getGravity();
#end #end
return null; return null;

5
Sources/armory/trait/physics/bullet/PhysicsWorld.hx
View file

@ -150,6 +150,11 @@ class PhysicsWorld extends Trait {
world.setGravity(vec1); world.setGravity(vec1);
} }
public function getGravity(): Vec4{
var g = world.getGravity();
return (new Vec4(g.x(), g.y(), g.z()));
}
public function addRigidBody(body: RigidBody) { public function addRigidBody(body: RigidBody) {
#if js #if js
world.addRigidBodyToGroup(body.body, body.group, body.mask); world.addRigidBodyToGroup(body.body, body.group, body.mask);

2
blender/arm/logicnode/physics_get_gravity.py
View file

@ -10,6 +10,6 @@ class GetGravityNode(Node, ArmLogicTreeNode):
bl_icon = 'NONE' bl_icon = 'NONE'
def init(self, context): def init(self, context):
self.inputs.new('NodeSocketVector', 'Gravity') self.outputs.new('NodeSocketVector', 'Gravity')
add_node(GetGravityNode, category='Physics') add_node(GetGravityNode, category='Physics')