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

repair bad merge during rebase

Browse source
This commit is contained in:
Andrew Meadows 2017-04-18 16:35:32 -07:00
parent 2441536de3
commit caf6a77baf
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/FancyCamera.h
View file

@ -13,6 +13,8 @@
#include "Camera.h"
#include <EntityTypes.h>
class FancyCamera : public Camera {
Q_OBJECT

3
interface/src/avatar/Avatar.h
View file

@ -336,7 +336,6 @@ protected:
RateCounter<> _skeletonModelSimulationRate;
RateCounter<> _jointDataSimulationRate;
<<<<<<< 4318cce04a59543d80a9364c86aab79408dcb50e
// Smoothing data for blending from one position/orientation to another on remote agents.
float _smoothPositionTime;
float _smoothPositionTimer;
@ -347,8 +346,6 @@ protected:
glm::quat _smoothOrientationInitial;
glm::quat _smoothOrientationTarget;
=======
>>>>>>> remove Menu dependency from Avatar class
private:
class AvatarEntityDataHash {
public: