Add MyAvatar and resolve merge conflicts.

interface/src/avatar/MyAvatar.h

@@ -0,0 +1,91 @@
+//
+//  MyAvatar.h
+//  interface
+//
+//  Created by Mark Peng on 8/16/13.
+//  Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
+//
+
+#ifndef __interface__myavatar__
+#define __interface__myavatar__
+
+#include "Avatar.h"
+
+class MyAvatar : public Avatar {
+public:
+	MyAvatar(Node* owningNode = NULL);
+
+    void reset();
+    void simulate(float deltaTime, Transmitter* transmitter, float gyroCameraSensitivity);
+    void updateFromGyrosAndOrWebcam(bool gyroLook, float pitchFromTouch);
+    void render(bool lookingInMirror, bool renderAvatarBalls);
+    void renderScreenTint(ScreenTintLayer layer, Camera& whichCamera);
+
+    // setters
+    void setMousePressed           (bool      mousePressed           ) { _mousePressed    = mousePressed;}
+    void setNoise                  (float     mag                    ) { _head.noise      = mag;}
+    void setMovedHandOffset        (glm::vec3 movedHandOffset        ) { _movedHandOffset = movedHandOffset;}
+    void setThrust                 (glm::vec3 newThrust              ) { _thrust          = newThrust; };
+    void setVelocity               (const glm::vec3 velocity         ) { _velocity = velocity; };
+    void setLeanScale              (float     scale                  ) { _leanScale = scale;}
+    void setGravity                (glm::vec3 gravity);
+    void setOrientation            (const glm::quat& orientation);
+    void setNewScale               (const float scale);
+    void setWantCollisionsOn       (bool wantCollisionsOn            ) { _isCollisionsOn = wantCollisionsOn; }
+
+    // getters
+    float            getNewScale               ()                const { return _newScale;}
+    float            getSpeed                  ()                const { return _speed;}
+    AvatarMode       getMode                   ()                const { return _mode;}
+    float            getLeanScale              ()                const { return _leanScale;}
+    float            getElapsedTimeStopped     ()                const { return _elapsedTimeStopped;}
+    float            getElapsedTimeMoving      ()                const { return _elapsedTimeMoving;}
+    float            getAbsoluteHeadYaw        ()                const;
+    const glm::vec3& getMouseRayOrigin         ()                const { return _mouseRayOrigin;    }
+    const glm::vec3& getMouseRayDirection      ()                const { return _mouseRayDirection; }
+    Avatar*          getLeadingAvatar          ()                const { return _leadingAvatar; }
+    glm::vec3        getGravity                ()                const { return _gravity; }
+    glm::vec3 getUprightHeadPosition() const;
+    glm::vec3 getUprightEyeLevelPosition() const;
+
+    //  Set what driving keys are being pressed to control thrust levels
+    void setDriveKeys(int key, bool val) { _driveKeys[key] = val; };
+    bool getDriveKeys(int key) { return _driveKeys[key]; };
+    void jump() { _shouldJump = true; };
+
+    //  Set/Get update the thrust that will move the avatar around
+    void addThrust(glm::vec3 newThrust) { _thrust += newThrust; };
+    glm::vec3 getThrust() { return _thrust; };
+
+    private:
+    bool        _mousePressed;
+    float       _bodyPitchDelta;
+    float       _bodyRollDelta;
+    bool        _shouldJump;
+    int         _driveKeys[MAX_DRIVE_KEYS];
+    glm::vec3   _gravity;
+    float       _distanceToNearestAvatar;       //  How close is the nearest avatar?
+    Avatar*     _interactingOther;
+    float       _elapsedTimeMoving;             //  Timers to drive camera transitions when moving
+    float       _elapsedTimeStopped;
+    float       _elapsedTimeSinceCollision;
+    glm::vec3   _lastCollisionPosition;
+    bool        _speedBrakes;
+    bool        _isThrustOn;
+    float       _collisionRadius;
+
+	// private methods
+    float getBallRenderAlpha(int ball, bool lookingInMirror) const;
+    void renderBody(bool lookingInMirror, bool renderAvatarBalls);
+    void updateThrust(float deltaTime, Transmitter * transmitter);
+    void updateHandMovementAndTouching(float deltaTime, bool enableHandMovement);
+    void updateAvatarCollisions(float deltaTime);
+    void updateCollisionWithEnvironment(float deltaTime);
+    void updateCollisionWithVoxels(float deltaTime);
+    void applyHardCollision(const glm::vec3& penetration, float elasticity, float damping);
+    void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
+    void applyCollisionWithOtherAvatar( Avatar * other, float deltaTime );
+    void checkForMouseRayTouching();
+};
+
+#endif