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

Fixing some merge issues

Browse source
This commit is contained in:
Brad Davis 2015-06-23 17:34:44 -07:00
parent 8f8bda327c
commit 5818805931
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -99,7 +99,6 @@
#include <UserActivityLogger.h> #include <UserActivityLogger.h>
#include <UUID.h> #include <UUID.h>
#include <VrMenu.h> #include <VrMenu.h>
#include <ui/ApplicationOverlayCompositor.h>
#include "Application.h" #include "Application.h"
#include "AudioClient.h" #include "AudioClient.h"
@ -2369,13 +2368,11 @@ void Application::cameraMenuChanged() {
} }
} }
#if 0
void Application::rotationModeChanged() { void Application::rotationModeChanged() {
if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) { if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
_myAvatar->setHeadPitch(0); _myAvatar->setHeadPitch(0);
} }
} }
#endif
void Application::updateCamera(float deltaTime) { void Application::updateCamera(float deltaTime) {
PerformanceTimer perfTimer("updateCamera"); PerformanceTimer perfTimer("updateCamera");
@ -3282,8 +3279,7 @@ namespace render {
} }
} }
void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool selfAvatarOnly, bool billboard) {
void Application::displaySide(RenderArgs* renderArgs, const Camera& theCamera, bool selfAvatarOnly, bool billboard) {
activeRenderingThread = QThread::currentThread(); activeRenderingThread = QThread::currentThread();
PROFILE_RANGE(__FUNCTION__); PROFILE_RANGE(__FUNCTION__);
PerformanceTimer perfTimer("display"); PerformanceTimer perfTimer("display");
@ -4747,7 +4743,7 @@ mat4 Application::getEyePose(int eye) const {
mat4 Application::getHeadPose() const { mat4 Application::getHeadPose() const {
if (isHMDMode()) { if (isHMDMode()) {
return OculusManager::getHeadPose(); return getActiveDisplayPlugin()->getHeadPose();
} }
return mat4(); return mat4();
} }

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

@ -771,6 +771,7 @@ void SkeletonModel::resetShapePositionsToDefaultPose() {
void SkeletonModel::renderBoundingCollisionShapes(float alpha) { void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
const int BALL_SUBDIVISIONS = 10; const int BALL_SUBDIVISIONS = 10;
#if 0
if (_shapes.isEmpty()) { if (_shapes.isEmpty()) {
// the bounding shape has not been propery computed // the bounding shape has not been propery computed
// so no need to render it // so no need to render it
@ -801,6 +802,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
Avatar::renderJointConnectingCone( origin, axis, _boundingShape.getRadius(), _boundingShape.getRadius(), glm::vec4(0.6f, 0.8f, 0.6f, alpha)); Avatar::renderJointConnectingCone( origin, axis, _boundingShape.getRadius(), _boundingShape.getRadius(), glm::vec4(0.6f, 0.8f, 0.6f, alpha));
glPopMatrix(); glPopMatrix();
#endif
} }
bool SkeletonModel::hasSkeleton() { bool SkeletonModel::hasSkeleton() {