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

Merge pull request #1747 from Sanva/master

Browse source 
Fixed `armory.trait.physics.bullet.PhysicsWorld.rayCast` for Hashlink.
This commit is contained in:
Lubos Lenco 2020-06-29 16:19:13 +02:00 committed by GitHub
parent 9b80b426e5 f89ac4ba7d
commit e9bd442386
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,7 @@ class PhysicsWorld extends Trait {
#if js
rayCallback.set_m_collisionFilterGroup(group);
rayCallback.set_m_collisionFilterMask(mask);
#elseif cpp
#elseif (cpp || hl)
rayCallback.m_collisionFilterGroup = group;
rayCallback.m_collisionFilterMask = mask;
#end
@ -348,7 +348,7 @@ class PhysicsWorld extends Trait {
hitNormalWorld.set(norm.x(), norm.y(), norm.z());
rb = rbMap.get(untyped body.userIndex);
hitInfo = new Hit(rb, hitPointWorld, hitNormalWorld);
#elseif cpp
#elseif (cpp || hl)
var hit = rayCallback.m_hitPointWorld;
hitPointWorld.set(hit.x(), hit.y(), hit.z());
var norm = rayCallback.m_hitNormalWorld;