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

Temporarily disable enum streamers, which are crashing on Windows startup.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-05 17:05:57 -07:00
parent 02452819c3
commit 83c2938c2e
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/devices/PrioVR.cpp
View file

@ -84,12 +84,12 @@ static void setPalm(float deltaTime, int index) {
glm::quat inverseRotation = glm::inverse(Application::getInstance()->getAvatar()->getOrientation()); glm::quat inverseRotation = glm::inverse(Application::getInstance()->getAvatar()->getOrientation());
if (index == LEFT_HAND_INDEX) { if (index == LEFT_HAND_INDEX) {
jointIndex = skeletonModel->getLeftHandJointIndex(); jointIndex = skeletonModel->getLeftHandJointIndex();
skeletonModel->getJointRotation(jointIndex, rotation, true); skeletonModel->getJointRotationInWorldFrame(jointIndex, rotation);
rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, PI_OVER_TWO, 0.0f)); rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, PI_OVER_TWO, 0.0f));
} else { } else {
jointIndex = skeletonModel->getRightHandJointIndex(); jointIndex = skeletonModel->getRightHandJointIndex();
skeletonModel->getJointRotation(jointIndex, rotation, true); skeletonModel->getJointRotationInWorldFrame(jointIndex, rotation);
rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, -PI_OVER_TWO, 0.0f)); rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, -PI_OVER_TWO, 0.0f));
} }
skeletonModel->getJointPositionInWorldFrame(jointIndex, position); skeletonModel->getJointPositionInWorldFrame(jointIndex, position);

15
libraries/metavoxels/src/Bitstream.cpp
View file

@ -92,13 +92,14 @@ int Bitstream::registerMetaObject(const char* className, const QMetaObject* meta
} }
// register the streamers for all enumerators // register the streamers for all enumerators
for (int i = 0; i < metaObject->enumeratorCount(); i++) { // temporarily disabled: crashes on Windows
QMetaEnum metaEnum = metaObject->enumerator(i); //for (int i = 0; i < metaObject->enumeratorCount(); i++) {
const TypeStreamer*& streamer = getEnumStreamers()[QPair<QByteArray, QByteArray>(metaEnum.scope(), metaEnum.name())]; // QMetaEnum metaEnum = metaObject->enumerator(i);
if (!streamer) { // const TypeStreamer*& streamer = getEnumStreamers()[QPair<QByteArray, QByteArray>(metaEnum.scope(), metaEnum.name())];
getEnumStreamersByName().insert(getEnumName(metaEnum), streamer = new EnumTypeStreamer(metaEnum)); // if (!streamer) {
} // getEnumStreamersByName().insert(getEnumName(metaEnum), streamer = new EnumTypeStreamer(metaEnum));
} // }
//}
return 0; return 0;
} }