mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 12:38:27 +02:00
repair bad merge during rebase
This commit is contained in:
parent
2441536de3
commit
caf6a77baf
2 changed files with 2 additions and 3 deletions
|
@ -13,6 +13,8 @@
|
||||||
|
|
||||||
#include "Camera.h"
|
#include "Camera.h"
|
||||||
|
|
||||||
|
#include <EntityTypes.h>
|
||||||
|
|
||||||
class FancyCamera : public Camera {
|
class FancyCamera : public Camera {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|
|
@ -336,7 +336,6 @@ protected:
|
||||||
RateCounter<> _skeletonModelSimulationRate;
|
RateCounter<> _skeletonModelSimulationRate;
|
||||||
RateCounter<> _jointDataSimulationRate;
|
RateCounter<> _jointDataSimulationRate;
|
||||||
|
|
||||||
<<<<<<< 4318cce04a59543d80a9364c86aab79408dcb50e
|
|
||||||
// Smoothing data for blending from one position/orientation to another on remote agents.
|
// Smoothing data for blending from one position/orientation to another on remote agents.
|
||||||
float _smoothPositionTime;
|
float _smoothPositionTime;
|
||||||
float _smoothPositionTimer;
|
float _smoothPositionTimer;
|
||||||
|
@ -347,8 +346,6 @@ protected:
|
||||||
glm::quat _smoothOrientationInitial;
|
glm::quat _smoothOrientationInitial;
|
||||||
glm::quat _smoothOrientationTarget;
|
glm::quat _smoothOrientationTarget;
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> remove Menu dependency from Avatar class
|
|
||||||
private:
|
private:
|
||||||
class AvatarEntityDataHash {
|
class AvatarEntityDataHash {
|
||||||
public:
|
public:
|
||||||
|
|
Loading…
Reference in a new issue