diff --git a/examples/utilities/tools/developerMenuItems.js b/examples/utilities/tools/developerMenuItems.js index 2e6c5a1141..549bed0bc4 100644 --- a/examples/utilities/tools/developerMenuItems.js +++ b/examples/utilities/tools/developerMenuItems.js @@ -36,11 +36,11 @@ var AUDIO_LISTENER_MODE_CUSTOM = "Audio from custom position"; // be sure that the audio listener options are in the right order (same as the enumerator) var AUDIO_LISTENER_OPTIONS = [ - // MyAvatar.FROM_HEAD (0) + // MyAvatar.audioListenerModeHead (0) AUDIO_LISTENER_MODE_FROM_HEAD, - // MyAvatar.FROM_CAMERA (1) + // MyAvatar.audioListenerModeCamera (1) AUDIO_LISTENER_MODE_FROM_CAMERA, - // MyAvatar.CUSTOM (2) + // MyAvatar.audioListenerCustom (2) AUDIO_LISTENER_MODE_CUSTOM ]; var AUDIO_STEREO_INPUT = "Stereo Input"; diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index ca242a2ca2..2a94ed30e2 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -972,7 +972,6 @@ void Avatar::renderJointConnectingCone(gpu::Batch& batch, glm::vec3 position1, g glm::vec3 perpCos = glm::normalize(glm::cross(axis, perpSin)); perpSin = glm::cross(perpCos, axis); - float anglea = 0.0f; float angleb = 0.0f; QVector points; @@ -980,7 +979,7 @@ void Avatar::renderJointConnectingCone(gpu::Batch& batch, glm::vec3 position1, g // the rectangles that comprise the sides of the cone section are // referenced by "a" and "b" in one dimension, and "1", and "2" in the other dimension. - anglea = angleb; + int anglea = angleb; angleb = ((float)(i+1) / (float)NUM_BODY_CONE_SIDES) * TWO_PI; float sa = sinf(anglea); diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 7020de377f..01548c9066 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -57,7 +57,7 @@ class Avatar : public AvatarData { Q_PROPERTY(glm::vec3 skeletonOffset READ getSkeletonOffset WRITE setSkeletonOffset) public: - Avatar(RigPointer rig = nullptr); + explicit Avatar(RigPointer rig = nullptr); ~Avatar(); typedef render::Payload Payload; diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index 5087f7955d..629b3aac12 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -308,7 +308,6 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) { hand = _hand; } - ok = true; auto myAvatar = DependencyManager::get()->getMyAvatar(); holderID = myAvatar->getSessionUUID(); diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 8e48237b8e..bcb54d6c52 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -63,11 +63,11 @@ void AvatarManager::registerMetaTypes(QScriptEngine* engine) { } AvatarManager::AvatarManager(QObject* parent) : - _avatarFades() + _avatarFades(), + _myAvatar(std::make_shared(std::make_shared())) { // register a meta type for the weak pointer we'll use for the owning avatar mixer for each avatar qRegisterMetaType >("NodeWeakPointer"); - _myAvatar = std::make_shared(std::make_shared()); auto& packetReceiver = DependencyManager::get()->getPacketReceiver(); packetReceiver.registerListener(PacketType::BulkAvatarData, this, "processAvatarDataPacket"); diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index 2aff98a1d2..57fc1022ea 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -71,8 +71,8 @@ public slots: void updateAvatarRenderStatus(bool shouldRenderAvatars); private: - AvatarManager(QObject* parent = 0); - AvatarManager(const AvatarManager& other); + explicit AvatarManager(QObject* parent = 0); + explicit AvatarManager(const AvatarManager& other); void simulateAvatarFades(float deltaTime); diff --git a/interface/src/avatar/AvatarUpdate.cpp b/interface/src/avatar/AvatarUpdate.cpp index 4881e3eaec..a52b584527 100644 --- a/interface/src/avatar/AvatarUpdate.cpp +++ b/interface/src/avatar/AvatarUpdate.cpp @@ -16,7 +16,7 @@ #include #include "InterfaceLogging.h" -AvatarUpdate::AvatarUpdate() : GenericThread(), _lastAvatarUpdate(0) { +AvatarUpdate::AvatarUpdate() : GenericThread(), _lastAvatarUpdate(0), _isHMDMode(false) { setObjectName("Avatar Update"); // GenericThread::initialize uses this to set the thread name. Settings settings; const int DEFAULT_TARGET_AVATAR_SIMRATE = 60; diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h index ec88b295f7..614e286329 100644 --- a/interface/src/avatar/Head.h +++ b/interface/src/avatar/Head.h @@ -28,7 +28,7 @@ class Avatar; class Head : public HeadData { public: - Head(Avatar* owningAvatar); + explicit Head(Avatar* owningAvatar); void init(); void reset(); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 9302c3b47d..d0be9c0be0 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1522,9 +1522,9 @@ glm::vec3 MyAvatar::applyKeyboardMotor(float deltaTime, const glm::vec3& localVe // (1) braking --> short timescale (aggressive motor assertion) // (2) pushing --> medium timescale (mild motor assertion) // (3) inactive --> long timescale (gentle friction for low speeds) - float MIN_KEYBOARD_MOTOR_TIMESCALE = 0.125f; - float MAX_KEYBOARD_MOTOR_TIMESCALE = 0.4f; - float MIN_KEYBOARD_BRAKE_SPEED = 0.3f; + const float MIN_KEYBOARD_MOTOR_TIMESCALE = 0.125f; + const float MAX_KEYBOARD_MOTOR_TIMESCALE = 0.4f; + const float MIN_KEYBOARD_BRAKE_SPEED = 0.3f; float timescale = MAX_KEYBOARD_MOTOR_TIMESCALE; bool isThrust = (glm::length2(_thrust) > EPSILON); if (_isPushing || isThrust || diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index f834a627b2..37a2e752e6 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -63,9 +63,9 @@ class MyAvatar : public Avatar { Q_PROPERTY(AudioListenerMode audioListenerMode READ getAudioListenerMode WRITE setAudioListenerMode) Q_PROPERTY(glm::vec3 customListenPosition READ getCustomListenPosition WRITE setCustomListenPosition) Q_PROPERTY(glm::quat customListenOrientation READ getCustomListenOrientation WRITE setCustomListenOrientation) - Q_PROPERTY(AudioListenerMode FROM_HEAD READ getAudioListenerModeHead) - Q_PROPERTY(AudioListenerMode FROM_CAMERA READ getAudioListenerModeCamera) - Q_PROPERTY(AudioListenerMode CUSTOM READ getAudioListenerModeCustom) + Q_PROPERTY(AudioListenerMode audioListenerModeHead READ getAudioListenerModeHead) + Q_PROPERTY(AudioListenerMode audioListenerModeCamera READ getAudioListenerModeCamera) + Q_PROPERTY(AudioListenerMode audioListenerModeCustom READ getAudioListenerModeCustom) //TODO: make gravity feature work Q_PROPERTY(glm::vec3 gravity READ getGravity WRITE setGravity) @@ -84,7 +84,7 @@ class MyAvatar : public Avatar { Q_PROPERTY(float energy READ getEnergy WRITE setEnergy) public: - MyAvatar(RigPointer rig); + explicit MyAvatar(RigPointer rig); ~MyAvatar(); virtual void simulateAttachments(float deltaTime) override; diff --git a/interface/src/avatar/MyCharacterController.cpp b/interface/src/avatar/MyCharacterController.cpp index ee77859337..6e52f4a949 100644 --- a/interface/src/avatar/MyCharacterController.cpp +++ b/interface/src/avatar/MyCharacterController.cpp @@ -46,14 +46,15 @@ void MyCharacterController::updateShapeIfNecessary() { // NOTE: _shapeLocalOffset is already computed if (_radius > 0.0f) { - // HACK: use some simple mass property defaults for now - float mass = 100.0f; - btVector3 inertia(30.0f, 8.0f, 30.0f); - // create RigidBody if it doesn't exist if (!_rigidBody) { + + // HACK: use some simple mass property defaults for now + const float DEFAULT_AVATAR_MASS = 100.0f; + const btVector3 DEFAULT_AVATAR_INERTIA_TENSOR(30.0f, 8.0f, 30.0f); + btCollisionShape* shape = new btCapsuleShape(_radius, 2.0f * _halfHeight); - _rigidBody = new btRigidBody(mass, nullptr, shape, inertia); + _rigidBody = new btRigidBody(DEFAULT_AVATAR_MASS, nullptr, shape, DEFAULT_AVATAR_INERTIA_TENSOR); } else { btCollisionShape* shape = _rigidBody->getCollisionShape(); if (shape) { diff --git a/interface/src/avatar/MyCharacterController.h b/interface/src/avatar/MyCharacterController.h index 39f0f99917..265406bc6f 100644 --- a/interface/src/avatar/MyCharacterController.h +++ b/interface/src/avatar/MyCharacterController.h @@ -21,7 +21,7 @@ class MyAvatar; class MyCharacterController : public CharacterController { public: - MyCharacterController(MyAvatar* avatar); + explicit MyCharacterController(MyAvatar* avatar); ~MyCharacterController (); virtual void updateShapeIfNecessary() override;