Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalize Collision Pick API naming convention for intersectingObjects

Browse source
This commit is contained in:
sabrina-shanman 2018-08-09 16:59:23 -07:00
parent 4f077080b0
commit c5e9f02372
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/raypick/CollisionPick.cpp
View file

@ -47,8 +47,8 @@ QVariantMap CollisionPickResult::toVariantMap() const {
} }
QVariantMap collisionPointPair; QVariantMap collisionPointPair;
collisionPointPair["pickContactPoint"] = vec3toVariant(objectIntersection.testCollisionPoint); collisionPointPair["pointOnPick"] = vec3toVariant(objectIntersection.testCollisionPoint);
collisionPointPair["objectContactPoint"] = vec3toVariant(objectIntersection.foundCollisionPoint); collisionPointPair["pointOnObject"] = vec3toVariant(objectIntersection.foundCollisionPoint);
collisionPointPairs[objectIntersection.foundID].append(collisionPointPair); collisionPointPairs[objectIntersection.foundID].append(collisionPointPair);
} }
@ -59,7 +59,7 @@ QVariantMap CollisionPickResult::toVariantMap() const {
const QUuid& id = intersectionKeyVal.first; const QUuid& id = intersectionKeyVal.first;
QVariantMap& intersection = intersectionKeyVal.second; QVariantMap& intersection = intersectionKeyVal.second;
intersection["contactPointPairs"] = collisionPointPairs[id]; intersection["collisionContacts"] = collisionPointPairs[id];
qIntersectingObjects.append(intersection); qIntersectingObjects.append(intersection);
} }

8
interface/src/raypick/PickScriptingInterface.h
View file

@ -161,15 +161,15 @@ public:
* @typedef {object} IntersectingObject * @typedef {object} IntersectingObject
* @property {QUuid} id The ID of the object. * @property {QUuid} id The ID of the object.
* @property {number} type The type of the object, either Picks.INTERSECTED_ENTITY() or Picks.INTERSECTED_AVATAR() * @property {number} type The type of the object, either Picks.INTERSECTED_ENTITY() or Picks.INTERSECTED_AVATAR()
* @property {ContactPointPair[]} contactPointPairs Pairs of points representing penetration information between the pick and the object * @property {CollisionContact[]} collisionContacts Pairs of points representing penetration information between the pick and the object
*/ */
/**jsdoc /**jsdoc
* A pair of points that represents part of an overlap between a Collision Pick and an object in the physics engine. Points which are further apart represent deeper overlap * A pair of points that represents part of an overlap between a Collision Pick and an object in the physics engine. Points which are further apart represent deeper overlap
* *
* @typedef {object} ContactPointPair * @typedef {object} CollisionContact
* @property {Vec3} pickContactPoint A point representing a penetration of the object's surface into the volume of the pick, in world space. * @property {Vec3} pointOnPick A point representing a penetration of the object's surface into the volume of the pick, in world space.
* @property {Vec3} objectContactPoint A point representing a penetration of the pick's surface into the volume of the found object, in world space. * @property {Vec3} pointOnObject A point representing a penetration of the pick's surface into the volume of the found object, in world space.
*/ */
/**jsdoc /**jsdoc