mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 09:48:44 +02:00
code review feedback
This commit is contained in:
parent
cd57c0706a
commit
04006a9f76
2 changed files with 3 additions and 2 deletions
|
@ -1811,7 +1811,7 @@ void MyAvatar::postUpdate(float deltaTime) {
|
||||||
updateHoldActions(_prePhysicsRoomPose, postUpdateRoomPose);
|
updateHoldActions(_prePhysicsRoomPose, postUpdateRoomPose);
|
||||||
|
|
||||||
if (_enableDebugDrawDetailedCollision) {
|
if (_enableDebugDrawDetailedCollision) {
|
||||||
AnimPose rigToWorldPose(glm::vec3(1.0f), Quaternions::Y_180 * getRotation(), getPosition());
|
AnimPose rigToWorldPose(glm::vec3(1.0f), getRotation() * Quaternions::Y_180, getPosition());
|
||||||
const int NUM_DEBUG_COLORS = 7;
|
const int NUM_DEBUG_COLORS = 7;
|
||||||
const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = {
|
const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = {
|
||||||
glm::vec4(1.0f, 1.0f, 1.0f, 1.0f),
|
glm::vec4(1.0f, 1.0f, 1.0f, 1.0f),
|
||||||
|
@ -1821,6 +1821,7 @@ void MyAvatar::postUpdate(float deltaTime) {
|
||||||
glm::vec4(1.0f, 1.0f, 0.0f, 1.0f),
|
glm::vec4(1.0f, 1.0f, 0.0f, 1.0f),
|
||||||
glm::vec4(0.25f, 1.0f, 1.0f, 1.0f),
|
glm::vec4(0.25f, 1.0f, 1.0f, 1.0f),
|
||||||
glm::vec4(1.0f, 0.25f, 1.0f, 1.0f),
|
glm::vec4(1.0f, 0.25f, 1.0f, 1.0f),
|
||||||
|
glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color?
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_skeletonModel && _skeletonModel->isLoaded()) {
|
if (_skeletonModel && _skeletonModel->isLoaded()) {
|
||||||
|
|
|
@ -1118,7 +1118,7 @@ const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
|
||||||
-glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
|
-glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
|
||||||
};
|
};
|
||||||
|
|
||||||
// returns true if the given point lies in side of the k-dop, specified by shapeInfo & shapePose.
|
// returns true if the given point lies inside of the k-dop, specified by shapeInfo & shapePose.
|
||||||
// if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward
|
// if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward
|
||||||
// such that it lies on the surface of the kdop.
|
// such that it lies on the surface of the kdop.
|
||||||
static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
|
static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
|
||||||
|
|
Loading…
Reference in a new issue