Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:28:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
ZappoMan 2013-12-28 12:08:24 -08:00
parent a43844447c
commit 32b2fb8f21
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -510,18 +510,13 @@ void Application::paintGL() {
_myAvatar.getSkeletonModel().setTranslation(_myAvatar.getHead().getFaceModel().getTranslation() - _myAvatar.getSkeletonModel().setTranslation(_myAvatar.getHead().getFaceModel().getTranslation() -
neckPosition); neckPosition);
//displaySide(_mirrorCamera, true); displaySide(_mirrorCamera, true);
displaySide(whichCamera);
// restore absolute translations // restore absolute translations
_myAvatar.getSkeletonModel().setTranslation(absoluteSkeletonTranslation); _myAvatar.getSkeletonModel().setTranslation(absoluteSkeletonTranslation);
_myAvatar.getHead().getFaceModel().setTranslation(absoluteFaceTranslation); _myAvatar.getHead().getFaceModel().setTranslation(absoluteFaceTranslation);
} else { } else {
//displaySide(_mirrorCamera, true); displaySide(_mirrorCamera, true);
displaySide(whichCamera);
} }
glPopMatrix(); glPopMatrix();

7
interface/src/Application.h
View file

@ -254,13 +254,10 @@ private slots:
void shrinkMirrorView(); void shrinkMirrorView();
void resetSensors(); void resetSensors();
public:
void updateProjectionMatrix();
void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true);
private: private:
void resetCamerasOnResizeGL(Camera& camera, int width, int height); void resetCamerasOnResizeGL(Camera& camera, int width, int height);
void updateProjectionMatrix();
void updateProjectionMatrix(Camera& camera, bool updateViewFrustum = true);
static bool sendVoxelsOperation(OctreeElement* node, void* extraData); static bool sendVoxelsOperation(OctreeElement* node, void* extraData);
static void processAvatarURLsMessage(unsigned char* packetData, size_t dataBytes); static void processAvatarURLsMessage(unsigned char* packetData, size_t dataBytes);