Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-09 10:47:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed build errors from jenkins

Browse source
This commit is contained in:
amantley 2019-02-20 17:59:45 -08:00
parent 97da20781e
commit f8a74efdc2
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -236,6 +236,11 @@ if (BUILD_TESTS)
endif()
endif()
set(HIFI_USE_Q_OS_ANDROID=TRUE)
if (HIFI_USE_Q_OS_ANDROID)
add_definitions(-DHIFI_USE_Q_OS_ANDROID=TRUE)
endif()
if (BUILD_INSTALLER)
if (UNIX)
install(

2
interface/src/avatar/MySkeletonModel.cpp
View file

@ -15,8 +15,6 @@
#include "InterfaceLogging.h"
#include "AnimUtil.h"
#define USE_Q_OS_ANDROID
MySkeletonModel::MySkeletonModel(Avatar* owningAvatar, QObject* parent) : SkeletonModel(owningAvatar, parent) {
}

3
libraries/animation/src/AnimSplineIK.cpp
View file

@ -362,7 +362,6 @@ void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, c
AnimPose relPose = parentAbsPose.inverse() * flexedAbsPose;
bool constrained = false;
if (splineJointInfo.jointIndex != base) {
// constrain the amount the spine can stretch or compress
float length = glm::length(relPose.trans());
@ -374,10 +373,8 @@ void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, c
const float MIN_LENGTH = defaultLength * (1.0f - STRETCH_COMPRESS_PERCENTAGE);
if (length > MAX_LENGTH) {
relPose.trans() = (relPose.trans() / length) * MAX_LENGTH;
constrained = true;
} else if (length < MIN_LENGTH) {
relPose.trans() = (relPose.trans() / length) * MIN_LENGTH;
constrained = true;
}
} else {
relPose.trans() = glm::vec3(0.0f);

4
libraries/animation/src/Rig.cpp
View file

@ -1988,8 +1988,8 @@ bool Rig::calculateElbowPoleVectorOptimized(int handIndex, int elbowIndex, int s
}
// convert the final theta to a pole vector value
float poleVectorXValue = -1.0f * sin(thetaRadians);
float poleVectorYValue = -1.0f * cos(thetaRadians);
float poleVectorXValue = -1.0f * sinf(thetaRadians);
float poleVectorYValue = -1.0f * cosf(thetaRadians);
float poleVectorZValue = 0.0f;
glm::vec3 thetaVector(poleVectorXValue, poleVectorYValue, poleVectorZValue);