diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp index 67f749516f..0d999b2ff1 100644 --- a/interface/src/AvatarBookmarks.cpp +++ b/interface/src/AvatarBookmarks.cpp @@ -190,7 +190,7 @@ void AvatarBookmarks::updateAvatarEntities(const QVariantList &avatarEntities) { * @property {number} version - The version of the bookmark data format. * @property {string} avatarUrl - The URL of the avatar model. * @property {number} avatarScale - The target scale of the avatar. - * @property {Array>} [avatarEntites] - The avatar entities included with the + * @property {Array>} [avatarEntites] - The avatar entities included with the * bookmark. * @property {AttachmentData[]} [attachments] - The attachments included with the bookmark. *

Deprecated: Use avatar entities instead. diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 1e7232016e..f9a9f07686 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1147,11 +1147,11 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } - + } glm::vec3 MyAvatar::getLeftHandPosition() const { @@ -1602,7 +1602,7 @@ bool MyAvatar::hasAvatarEntities() const { void MyAvatar::handleCanRezAvatarEntitiesChanged(bool canRezAvatarEntities) { if (canRezAvatarEntities) { // Start displaying avatar entities. - // Allow time for the avatar mixer to be updated with the user's permissions so that it doesn't discard the avatar + // Allow time for the avatar mixer to be updated with the user's permissions so that it doesn't discard the avatar // entities sent. In theory, typical worst case would be Interface running on same PC as server and the timings of // Interface and the avatar mixer sending DomainListRequest to the domain server being such that the avatar sends its // DomainListRequest and gets its DomainList response DOMAIN_SERVER_CHECK_IN_MSECS after Interface does. Allow extra @@ -1734,7 +1734,7 @@ void MyAvatar::handleChangedAvatarEntityData() { } }); } - + } // CHANGE real entities @@ -2593,7 +2593,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { } QObject::disconnect(*skeletonConnection); }); - + saveAvatarUrl(); emit skeletonChanged(); } @@ -2972,9 +2972,9 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName, bool allowDuplicates, bool useSaved) { if (QThread::currentThread() != thread()) { BLOCKING_INVOKE_METHOD(this, "attach", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName), - Q_ARG(const glm::vec3&, translation), + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName), + Q_ARG(const glm::vec3&, translation), Q_ARG(const glm::quat&, rotation), Q_ARG(float, scale), Q_ARG(bool, isSoft), @@ -3072,7 +3072,7 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; if (!DependencyManager::get()->getThisNodeCanRezAvatarEntities()) { @@ -3128,7 +3128,7 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { @@ -3519,7 +3519,7 @@ void MyAvatar::updateOrientation(float deltaTime) { // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; CameraMode mode = qApp->getCamera().getMode(); - bool computeLookAt = isReadyForPhysics() && !qApp->isHMDMode() && + bool computeLookAt = isReadyForPhysics() && !qApp->isHMDMode() && (mode == CAMERA_MODE_FIRST_PERSON_LOOK_AT || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE); bool smoothCameraYaw = computeLookAt && mode != CAMERA_MODE_FIRST_PERSON_LOOK_AT; if (smoothCameraYaw) { @@ -3819,16 +3819,16 @@ void MyAvatar::updateOrientation(float deltaTime) { if (_firstPersonSteadyHeadTimer < FIRST_PERSON_RECENTER_SECONDS) { if (_firstPersonSteadyHeadTimer > 0.0f) { _firstPersonSteadyHeadTimer += deltaTime; - } + } } else { _shouldTurnToFaceCamera = true; _firstPersonSteadyHeadTimer = 0.0f; - } + } } else { _firstPersonSteadyHeadTimer = deltaTime; } } - + } else { head->setBaseYaw(0.0f); head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime @@ -3906,7 +3906,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig zSpeed != 0.0f && xSpeed != 0.0f && !isFlying()){ direction = (zSpeed * forward); } - + auto length = glm::length(direction); if (length > EPSILON) { direction /= length; @@ -5457,7 +5457,7 @@ void MyAvatar::setIsInSittingState(bool isSitting) { // In updateSitStandState, we only change state if this timer is above a threshold (STANDING_TIMEOUT, SITTING_TIMEOUT). // This avoids changing state if the user sits and stands up quickly. _sitStandStateTimer = 0.0f; - + _isInSittingState.set(isSitting); setResetMode(true); setSitStandStateChange(true); @@ -5545,7 +5545,7 @@ void MyAvatar::setWalkBackwardSpeed(float value) { changed = false; break; } - + if (changed && prevVal != value) { emit walkBackwardSpeedChanged(value); } @@ -5867,7 +5867,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal_userStanding( } } } - + if (!stepDetected) { glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); @@ -6701,15 +6701,15 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys /*@jsdoc * Flow options currently used in flow simulation. * @typedef {object} MyAvatar.FlowData - * @property {boolean} initialized - true if flow has been initialized for the current avatar, false + * @property {boolean} initialized - true if flow has been initialized for the current avatar, false * if it hasn't. * @property {boolean} active - true if flow is enabled, false if it isn't. * @property {boolean} colliding - true if collisions are enabled, false if they aren't. - * @property {Object} physicsData - The physics configuration for each group of joints + * @property {Object} physicsData - The physics configuration for each group of joints * that has been configured. - * @property {Object} collisions - The collisions configuration for each joint that + * @property {Object} collisions - The collisions configuration for each joint that * has collisions configured. - * @property {Object} threads - The threads that have been configured, with the first joint's name as the + * @property {Object} threads - The threads that have been configured, with the first joint's name as the * ThreadName and value as an array of the indexes of all the joints in the thread. */ /*@jsdoc @@ -6760,7 +6760,7 @@ QVariantMap MyAvatar::getFlowData() { } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } + } for (auto &group : groups) { QVariantMap settingsObject; QString groupName = group.first; diff --git a/interface/src/scripting/GooglePolyScriptingInterface.cpp b/interface/src/scripting/GooglePolyScriptingInterface.cpp index e1b51d402a..7507208e27 100644 --- a/interface/src/scripting/GooglePolyScriptingInterface.cpp +++ b/interface/src/scripting/GooglePolyScriptingInterface.cpp @@ -29,7 +29,7 @@ const QString LIST_POLY_URL = "https://poly.googleapis.com/v1/assets?"; const QString GET_POLY_URL = "https://poly.googleapis.com/v1/assets/model?"; const QStringList VALID_FORMATS = QStringList() << "BLOCKS" << "FBX" << "GLTF" << "GLTF2" << "OBJ" << "TILT" << ""; -const QStringList VALID_CATEGORIES = QStringList() << "animals" << "architecture" << "art" << "food" << +const QStringList VALID_CATEGORIES = QStringList() << "animals" << "architecture" << "art" << "food" << "nature" << "objects" << "people" << "scenes" << "technology" << "transport" << ""; GooglePolyScriptingInterface::GooglePolyScriptingInterface() { @@ -75,7 +75,7 @@ QString GooglePolyScriptingInterface::getGLTF2(const QString& keyword, const QSt QUrl url = formatURLQuery(keyword, category, "GLTF2"); return getModelURL(url); } - + // This method will not be useful until we support Tilt models QString GooglePolyScriptingInterface::getTilt(const QString& keyword, const QString& category) { QUrl url = formatURLQuery(keyword, category, "TILT"); diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp index 761f5c85a3..3f7ac9f4cc 100644 --- a/interface/src/ui/HMDToolsDialog.cpp +++ b/interface/src/ui/HMDToolsDialog.cpp @@ -43,7 +43,7 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) : _defaultPluginName = displayPlugin->getName(); continue; } - + if (displayPlugin->isHmd()) { // Not all HMD's have corresponding screens if (displayPlugin->getHmdScreen() >= 0) { @@ -90,7 +90,7 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) : connect(_switchModeButton, &QPushButton::clicked, [this]{ toggleHMDMode(); }); - + // when the application is about to quit, leave HDM mode connect(qApp, &Application::beforeAboutToQuit, [this]{ // FIXME this is ineffective because it doesn't trigger the menu to @@ -211,7 +211,7 @@ void HMDToolsDialog::screenCountChanged(int newCount) { if (qApp->isHMDMode() && _hmdScreenNumber != hmdScreenNumber) { qDebug() << "HMD Display changed WHILE IN HMD MODE"; leaveHMDMode(); - + // if there is a new best HDM screen then go back into HDM mode after done leaving if (hmdScreenNumber >= 0) { qDebug() << "Trying to go back into HMD Mode"; @@ -254,7 +254,7 @@ void HMDWindowWatcher::windowGeometryChanged(int arg) { } void HMDWindowWatcher::windowScreenChanged(QScreen* screen) { - // if we have more than one screen, and a known hmdScreen then try to + // if we have more than one screen, and a known hmdScreen then try to // keep our dialog off of the hmdScreen if (QApplication::desktop()->screenCount() > 1) { int hmdScreenNumber = _hmdTools->_hmdScreenNumber; @@ -263,10 +263,10 @@ void HMDWindowWatcher::windowScreenChanged(QScreen* screen) { QScreen* hmdScreen = QGuiApplication::screens()[hmdScreenNumber]; if (screen == hmdScreen) { qDebug() << "HMD Tools: Whoa! What are you doing? You don't want to move me to the HMD Screen!"; - + // try to pick a better screen QScreen* betterScreen = NULL; - + QScreen* lastApplicationScreen = _hmdTools->getLastApplicationScreen(); QWindow* appWindow = qApp->getWindow()->windowHandle(); QScreen* appScreen = appWindow->screen(); diff --git a/interface/src/ui/overlays/TextOverlay.cpp b/interface/src/ui/overlays/TextOverlay.cpp index 6760c918d3..1632722398 100644 --- a/interface/src/ui/overlays/TextOverlay.cpp +++ b/interface/src/ui/overlays/TextOverlay.cpp @@ -20,7 +20,7 @@ QUrl const TextOverlay::URL(QString("hifi/overlays/TextOverlay.qml")); TextOverlay::TextOverlay() : QmlOverlay(URL) { } -TextOverlay::TextOverlay(const TextOverlay* textOverlay) +TextOverlay::TextOverlay(const TextOverlay* textOverlay) : QmlOverlay(URL, textOverlay) { } diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp index 095e8333ee..e25c84f20a 100644 --- a/libraries/animation/src/AnimInverseKinematics.cpp +++ b/libraries/animation/src/AnimInverseKinematics.cpp @@ -269,7 +269,7 @@ void AnimInverseKinematics::solve(const AnimContext& context, const std::vector< break; } } - + // on last iteration, interpolate jointChains, if necessary if (numLoops == MAX_IK_LOOPS) { for (size_t i = 0; i < _prevJointChainInfoVec.size(); i++) { @@ -357,7 +357,7 @@ void AnimInverseKinematics::solve(const AnimContext& context, const std::vector< bool needsInterpolation = _prevJointChainInfoVec[chainIndex].timer > 0.0f; float alpha = needsInterpolation ? getInterpolationAlpha(_prevJointChainInfoVec[chainIndex].timer) : 0.0f; // update rotationOnly targets that don't lie on the ik chain of other ik targets. - if (parentIndex != AnimSkeleton::INVALID_JOINT_INDEX && !_rotationAccumulators[tipIndex].isDirty() && + if (parentIndex != AnimSkeleton::INVALID_JOINT_INDEX && !_rotationAccumulators[tipIndex].isDirty() && (target.getType() == IKTarget::Type::RotationOnly || target.getType() == IKTarget::Type::Unknown)) { if (target.getType() == IKTarget::Type::RotationOnly) { const glm::quat& targetRotation = target.getRotation(); diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index ba042d31a8..21b4fbc2c4 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -90,7 +90,7 @@ static const QString MAIN_STATE_MACHINE_RIGHT_HAND_POSITION("mainStateMachineRig /*@jsdoc - *

An AnimStateDictionary object may have the following properties. It may also have other properties, set by + *

An AnimStateDictionary object may have the following properties. It may also have other properties, set by * scripts.

*

Warning: These properties are subject to change. * @@ -98,117 +98,117 @@ static const QString MAIN_STATE_MACHINE_RIGHT_HAND_POSITION("mainStateMachineRig * * * - * - * - * * * - * - * - * * - * - * - * - * - * - * * * - * - * * * * - * - * * - * - * * * - * - * * - * - * - * - * * - * - * - * - * - * - * * * - * - * - * - * - * * - * - * * - * * - * - * - * * - * - * * * @@ -216,60 +216,60 @@ static const QString MAIN_STATE_MACHINE_RIGHT_HAND_POSITION("mainStateMachineRig * * * - * * * - * - * - * - * - * - * * * * - * - * * - * * - * - * - * - * * - * - * - * * - * - * - * * * @@ -521,7 +521,7 @@ void Rig::triggerNetworkRole(const QString& role) { _networkVars.set("postTransitAnim", true); _networkAnimState.clipNodeEnum = NetworkAnimState::PostTransit; } - + } void Rig::restoreNetworkAnimation() { @@ -640,10 +640,10 @@ void Rig::initJointStates(const HFMModel& hfmModel, const glm::mat4& modelOffset _internalPoseSet._overrideFlags.clear(); _internalPoseSet._overrideFlags.resize(_animSkeleton->getNumJoints(), false); - + _networkPoseSet._overridePoses.clear(); _networkPoseSet._overridePoses = _animSkeleton->getRelativeDefaultPoses(); - + _networkPoseSet._overrideFlags.clear(); _networkPoseSet._overrideFlags.resize(_animSkeleton->getNumJoints(), false); @@ -1496,7 +1496,7 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos _animVars.set("isInputLeft", false); // directly reflects input - _animVars.set("isNotInput", true); + _animVars.set("isNotInput", true); // no input + speed drops to SLOW_SPEED_THRESHOLD // (don't transition run->idle - slow to walk first) @@ -1728,10 +1728,10 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons _networkVars = networkTriggersOut; _lastContext = context; } - + applyOverridePoses(); - buildAbsoluteRigPoses(_internalPoseSet._relativePoses, _internalPoseSet._absolutePoses); + buildAbsoluteRigPoses(_internalPoseSet._relativePoses, _internalPoseSet._absolutePoses); _internalFlow.update(deltaTime, _internalPoseSet._relativePoses, _internalPoseSet._absolutePoses, _internalPoseSet._overrideFlags); if (_sendNetworkNode) { @@ -1747,7 +1747,7 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons // copy internal poses to external poses { QWriteLocker writeLock(&_externalPoseSetLock); - + _externalPoseSet = _internalPoseSet; } } @@ -2503,7 +2503,7 @@ void Rig::initAnimGraph(const QUrl& url) { triggerNetworkRole("postTransitAnim"); } } - + }); connect(_networkLoader.get(), &AnimNodeLoader::error, [networkUrl](int error, QString str) { qCritical(animation) << "Error loading: code = " << error << "str =" << str; diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 3bce602035..2076a88d32 100755 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -471,7 +471,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent IF_AVATAR_SPACE(PACKET_HAS_AVATAR_GLOBAL_POSITION, sizeof _globalPosition) { auto startSection = destinationBuffer; AVATAR_MEMCPY(_globalPosition); - + int numBytes = destinationBuffer - startSection; if (outboundDataRateOut) { @@ -1200,7 +1200,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { auto newHasProceduralBlinkFaceMovement = oneAtBit16(bitItems, PROCEDURAL_BLINK_FACE_MOVEMENT); auto newCollideWithOtherAvatars = oneAtBit16(bitItems, COLLIDE_WITH_OTHER_AVATARS); - auto newHasPriority = oneAtBit16(bitItems, HAS_HERO_PRIORITY); + auto newHasPriority = oneAtBit16(bitItems, HAS_HERO_PRIORITY); bool keyStateChanged = (_keyState != newKeyState); bool handStateChanged = (_handState != newHandState); @@ -1212,7 +1212,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) { bool proceduralBlinkFaceMovementChanged = (_headData->getProceduralAnimationFlag(HeadData::BlinkProceduralBlendshapeAnimation) != newHasProceduralBlinkFaceMovement); bool collideWithOtherAvatarsChanged = (_collideWithOtherAvatars != newCollideWithOtherAvatars); bool hasPriorityChanged = (getHasPriority() != newHasPriority); - bool somethingChanged = keyStateChanged || handStateChanged || faceStateChanged || eyeStateChanged || audioEnableFaceMovementChanged || + bool somethingChanged = keyStateChanged || handStateChanged || faceStateChanged || eyeStateChanged || audioEnableFaceMovementChanged || proceduralEyeFaceMovementChanged || proceduralBlinkFaceMovementChanged || collideWithOtherAvatarsChanged || hasPriorityChanged; @@ -1785,7 +1785,7 @@ glm::vec3 AvatarData::getJointTranslation(int index) const { } glm::vec3 AvatarData::getJointTranslation(const QString& name) const { - // Can't do this, because the lock needs to cover the entire set of logic. In theory, the joints could change + // Can't do this, because the lock needs to cover the entire set of logic. In theory, the joints could change // on another thread in between the call to getJointIndex and getJointTranslation // return getJointTranslation(getJointIndex(name)); return readLockWithNamedJointIndex(name, [this](int index) { @@ -1865,7 +1865,7 @@ bool AvatarData::isJointDataValid(const QString& name) const { // return isJointDataValid(getJointIndex(name)); return readLockWithNamedJointIndex(name, false, [&](int index) { - // This is technically superfluous.... the lambda is only called if index is a valid + // This is technically superfluous.... the lambda is only called if index is a valid // offset for _jointData. Nevertheless, it would be confusing to leave the lamdba as // `return true` return index < _jointData.size(); @@ -2144,7 +2144,7 @@ void AvatarData::unpackSkeletonData(const QByteArray& data) { const unsigned char* startPosition = reinterpret_cast(data.data()); const unsigned char* sourceBuffer = startPosition; - + auto header = reinterpret_cast(sourceBuffer); sourceBuffer += sizeof(const AvatarSkeletonTrait::Header); @@ -2157,7 +2157,7 @@ void AvatarData::unpackSkeletonData(const QByteArray& data) { uJointData.jointIndex = (int)i; uJointData.stringLength = (int)jointData->stringLength; uJointData.stringStart = (int)jointData->stringStart; - uJointData.parentIndex = ((uJointData.boneType == AvatarSkeletonTrait::BoneType::SkeletonRoot) || + uJointData.parentIndex = ((uJointData.boneType == AvatarSkeletonTrait::BoneType::SkeletonRoot) || (uJointData.boneType == AvatarSkeletonTrait::BoneType::NonSkeletonRoot)) ? -1 : (int)jointData->parentIndex; unpackOrientationQuatFromSixBytes(reinterpret_cast(&jointData->defaultRotation), uJointData.defaultRotation); unpackFloatVec3FromSignedTwoByteFixed(reinterpret_cast(&jointData->defaultTranslation), uJointData.defaultTranslation, TRANSLATION_COMPRESSION_RADIX); @@ -2307,7 +2307,7 @@ void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) { if (expanded == _skeletonModelURL) { return; } - + _skeletonModelURL = expanded; if (_clientTraitsHandler) { _clientTraitsHandler->markTraitUpdated(AvatarTraits::SkeletonModelURL); @@ -2935,14 +2935,14 @@ glm::vec3 AvatarData::getAbsoluteJointTranslationInObjectFrame(int index) const /*@jsdoc * Information on an attachment worn by the avatar. * @typedef {object} AttachmentData - * @property {string} modelUrl - The URL of the glTF, FBX, or OBJ model file. glTF models may be in JSON or binary format + * @property {string} modelUrl - The URL of the glTF, FBX, or OBJ model file. glTF models may be in JSON or binary format * (".gltf" or ".glb" URLs respectively). * @property {string} jointName - The name of the joint that the attachment is parented to. * @property {Vec3} translation - The offset from the joint that the attachment is positioned at. * @property {Vec3} rotation - The rotation applied to the model relative to the joint orientation. * @property {number} scale - The scale applied to the attachment model. - * @property {boolean} soft - If true and the model has a skeleton, the bones of the attached model's skeleton are - * rotated to fit the avatar's current pose. If true, the translation, rotation, and + * @property {boolean} soft - If true and the model has a skeleton, the bones of the attached model's skeleton are + * rotated to fit the avatar's current pose. If true, the translation, rotation, and * scale parameters are ignored. */ QVariant AttachmentData::toVariant() const { @@ -3138,12 +3138,12 @@ glm::mat4 AvatarData::getControllerRightHandMatrix() const { * @property {boolean} intersects - true if an avatar is intersected, false if it isn't. * @property {string} avatarID - The ID of the avatar that is intersected. * @property {number} distance - The distance from the ray origin to the intersection. - * @property {string} face - The name of the box face that is intersected; "UNKNOWN_FACE" if mesh was picked + * @property {string} face - The name of the box face that is intersected; "UNKNOWN_FACE" if mesh was picked * against. * @property {Vec3} intersection - The ray intersection point in world coordinates. * @property {Vec3} surfaceNormal - The surface normal at the intersection point. * @property {number} jointIndex - The index of the joint intersected. - * @property {SubmeshIntersection} extraInfo - Extra information on the mesh intersected if mesh was picked against, + * @property {SubmeshIntersection} extraInfo - Extra information on the mesh intersected if mesh was picked against, * {} if it wasn't. */ QScriptValue RayToAvatarIntersectionResultToScriptValue(QScriptEngine* engine, const RayToAvatarIntersectionResult& value) { diff --git a/libraries/controllers/src/controllers/InputRecorder.cpp b/libraries/controllers/src/controllers/InputRecorder.cpp index 928dbf0521..49ac092086 100644 --- a/libraries/controllers/src/controllers/InputRecorder.cpp +++ b/libraries/controllers/src/controllers/InputRecorder.cpp @@ -98,7 +98,7 @@ namespace controller { if (!QDir(SAVE_DIRECTORY).exists()) { QDir().mkdir(SAVE_DIRECTORY); } - + QFile saveFile (fileName); if (!saveFile.open(QIODevice::WriteOnly)) { qWarning() << "could not open file: " << fileName; @@ -112,7 +112,7 @@ namespace controller { qCritical("unable to gzip while saving to json."); return; } - + saveFile.write(jsonDataForFile); saveFile.close(); } @@ -133,7 +133,7 @@ namespace controller { status = false; return object; } - + QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData); object = jsonDoc.object(); status = true; @@ -217,12 +217,12 @@ namespace controller { QString filePath = urlPath.toLocalFile(); QFileInfo info(filePath); QString extension = info.suffix(); - + if (extension != "gz") { qWarning() << "can not load file with exentsion of " << extension; return; } - + bool success = false; QJsonObject data = openFile(filePath, success); auto keyValue = data.find("version"); @@ -250,15 +250,15 @@ namespace controller { _poseStateList.push_back(_currentFramePoses); _currentFramePoses.clear(); } - } + } _loading = false; } - + void InputRecorder::stopRecording() { _recording = false; _framesRecorded = (int)_actionStateList.size(); } - + void InputRecorder::startPlayback() { _playback = true; _recording = false; diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index ee4ee13895..82f50b587a 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -811,8 +811,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * unnecessary entity server updates. Scripts should not change this property's value. * * @property {string} actionData="" - Base-64 encoded compressed dump of the actions associated with the entity. This property - * is typically not used in scripts directly; rather, functions that manipulate an entity's actions update it, e.g., - * {@link Entities.addAction}. The size of this property increases with the number of actions. Because this property value + * is typically not used in scripts directly; rather, functions that manipulate an entity's actions update it, e.g., + * {@link Entities.addAction}. The size of this property increases with the number of actions. Because this property value * has to fit within a Overte datagram packet, there is a limit to the number of actions that an entity can have; * edits which would result in overflow are rejected. Read-only. * @property {Entities.RenderInfo} renderInfo - Information on the cost of rendering the entity. Currently information is only @@ -1262,8 +1262,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * @property {string} voxelData="ABAAEAAQAAAAHgAAEAB42u3BAQ0AAADCoPdPbQ8HFAAAAPBuEAAAAQ==" - Base-64 encoded compressed dump of * the PolyVox data. This property is typically not used in scripts directly; rather, functions that manipulate a PolyVox * entity update it. - *

The size of this property increases with the size and complexity of the PolyVox entity, with the size depending on how - * the particular entity's voxels compress. Because this property value has to fit within a Overte datagram packet, + *

The size of this property increases with the size and complexity of the PolyVox entity, with the size depending on how + * the particular entity's voxels compress. Because this property value has to fit within a Overte datagram packet, * there is a limit to the size and complexity of a PolyVox entity; edits which would result in an overflow are rejected.

* @property {Entities.PolyVoxSurfaceStyle} voxelSurfaceStyle=2 - The style of rendering the voxels' surface and how * neighboring PolyVox entities are joined. @@ -1414,7 +1414,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * false if the web entity's background should be transparent. The webpage must have CSS properties for transparency set * on the background-color for this property to have an effect. * @property {string} userAgent - The user agent for the web entity to use when visiting web pages. - * Default value: Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) + * Default value: Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) * Chrome/69.0.3497.113 Mobile Safari/537.36 * @example * var METERS_TO_INCHES = 39.3701; diff --git a/libraries/graphics/src/graphics/Geometry.cpp b/libraries/graphics/src/graphics/Geometry.cpp index 2f9f0a51e9..5ac3fc0d5a 100755 --- a/libraries/graphics/src/graphics/Geometry.cpp +++ b/libraries/graphics/src/graphics/Geometry.cpp @@ -362,7 +362,7 @@ MeshPointer Mesh::createIndexedTriangles_P3F(uint32_t numVertices, uint32_t numI mesh->setIndexBuffer(gpu::BufferView(new gpu::Buffer(numIndices * sizeof(uint32_t), (gpu::Byte*) indices), gpu::Element::INDEX_INT32)); } - + std::vector parts; parts.push_back(graphics::Mesh::Part(0, numIndices, 0, graphics::Mesh::TRIANGLES)); mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part), (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL)); diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index c6cd966164..662d52438f 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -69,7 +69,7 @@ void DataServerAccountInfo::setAccessTokenFromJSON(const QJsonObject& jsonObject void DataServerAccountInfo::setUsername(const QString& username) { if (_username != username) { _username = username; - + qCDebug(networking) << "Username changed to" << username; } } diff --git a/libraries/networking/src/HMACAuth.cpp b/libraries/networking/src/HMACAuth.cpp index c6a21d4d79..c1f62fac2e 100644 --- a/libraries/networking/src/HMACAuth.cpp +++ b/libraries/networking/src/HMACAuth.cpp @@ -94,9 +94,9 @@ HMACAuth::HMACHash HMACAuth::result() { HMACHash hashValue(EVP_MAX_MD_SIZE); unsigned int hashLen; QMutexLocker lock(&_lock); - + auto hmacResult = HMAC_Final(_hmacContext, &hashValue[0], &hashLen); - + if (hmacResult) { hashValue.resize((size_t)hashLen); } else { diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index ce3215f11d..a7269b4b65 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -833,7 +833,7 @@ void NodeList::processDomainList(QSharedPointer message) { // FIXME: Remove this call to requestDomainSettings() and reinstate the one in DomainHandler::setIsConnected(), in version // 2021.2.0. (New protocol version implies a domain server upgrade.) - if (!_domainHandler.isConnected() + if (!_domainHandler.isConnected() && _domainHandler.getScheme() == URL_SCHEME_VIRCADIA && !_domainHandler.getHostname().isEmpty()) { // We're about to connect but we need the domain settings (in particular, the node permissions) in order to adjust the // canRezAvatarEntities permission above before using the permissions in determining whether or not to connect without diff --git a/libraries/networking/src/udt/NetworkSocket.cpp b/libraries/networking/src/udt/NetworkSocket.cpp index cc28cbfc73..7c7ab41ddb 100644 --- a/libraries/networking/src/udt/NetworkSocket.cpp +++ b/libraries/networking/src/udt/NetworkSocket.cpp @@ -157,7 +157,7 @@ qint64 NetworkSocket::bytesToWrite(SocketType socketType, const SockAddr& addres bool NetworkSocket::hasPendingDatagrams() const { - return + return #if defined(WEBRTC_DATA_CHANNELS) _webrtcSocket.hasPendingDatagrams() || #endif diff --git a/libraries/networking/src/webrtc/WebRTCDataChannels.cpp b/libraries/networking/src/webrtc/WebRTCDataChannels.cpp index 44c1c5e82c..610afc4668 100644 --- a/libraries/networking/src/webrtc/WebRTCDataChannels.cpp +++ b/libraries/networking/src/webrtc/WebRTCDataChannels.cpp @@ -394,8 +394,8 @@ qint64 WDCConnection::getBufferedAmount() const { #ifdef WEBRTC_DEBUG qCDebug(networking_webrtc) << "WDCConnection::getBufferedAmount()"; #endif - return _dataChannel && _dataChannel->state() != DataChannelInterface::kClosing - && _dataChannel->state() != DataChannelInterface::kClosed + return _dataChannel && _dataChannel->state() != DataChannelInterface::kClosing + && _dataChannel->state() != DataChannelInterface::kClosed ? _dataChannel->buffered_amount() : 0; } @@ -407,7 +407,7 @@ bool WDCConnection::sendDataMessage(const DataBuffer& buffer) { qCDebug(networking_webrtc) << "No data channel to send on"; } #endif - if (!_dataChannel || _dataChannel->state() == DataChannelInterface::kClosing + if (!_dataChannel || _dataChannel->state() == DataChannelInterface::kClosing || _dataChannel->state() == DataChannelInterface::kClosed) { // Data channel may have been closed while message to send was being prepared. return false; @@ -625,7 +625,7 @@ void WebRTCDataChannels::closePeerConnection(WDCConnection* connection) { #ifdef WEBRTC_DEBUG qCDebug(networking_webrtc) << "WebRTCDataChannels::closePeerConnection()"; #endif - // Use Qt's signals/slots mechanism to close the peer connection on its own call stack, separate from the DataChannel + // Use Qt's signals/slots mechanism to close the peer connection on its own call stack, separate from the DataChannel // callback that initiated the peer connection. // https://bugs.chromium.org/p/webrtc/issues/detail?id=3721 emit closePeerConnectionSoon(connection); diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp index 4afd075196..2abb82e489 100644 --- a/libraries/octree/src/OctreeQuery.cpp +++ b/libraries/octree/src/OctreeQuery.cpp @@ -50,7 +50,7 @@ int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) { destinationBuffer += view.serialize(destinationBuffer); } } - + // desired Max Octree PPS memcpy(destinationBuffer, &_maxQueryPPS, sizeof(_maxQueryPPS)); destinationBuffer += sizeof(_maxQueryPPS); @@ -95,7 +95,7 @@ int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) { // called on the other nodes - assigns it to my views of the others int OctreeQuery::parseData(ReceivedMessage& message) { - + const unsigned char* startPosition = reinterpret_cast(message.getRawMessage()); const unsigned char* sourceBuffer = startPosition; diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp index 2678cb5591..a5ac734897 100644 --- a/libraries/qml/src/qml/OffscreenSurface.cpp +++ b/libraries/qml/src/qml/OffscreenSurface.cpp @@ -35,7 +35,7 @@ using namespace hifi::qml; using namespace hifi::qml::impl; -QmlUrlValidator OffscreenSurface::validator = [](const QUrl& url) -> bool { +QmlUrlValidator OffscreenSurface::validator = [](const QUrl& url) -> bool { if (url.isRelative()) { return true; } diff --git a/libraries/script-engine/src/ArrayBufferClass.cpp b/libraries/script-engine/src/ArrayBufferClass.cpp index 6734114932..a1826bc087 100644 --- a/libraries/script-engine/src/ArrayBufferClass.cpp +++ b/libraries/script-engine/src/ArrayBufferClass.cpp @@ -33,11 +33,11 @@ QObject(scriptEngine), QScriptClass(scriptEngine) { qScriptRegisterMetaType(engine(), toScriptValue, fromScriptValue); QScriptValue global = engine()->globalObject(); - + // Save string handles for quick lookup _name = engine()->toStringHandle(CLASS_NAME.toLatin1()); _byteLength = engine()->toStringHandle(BYTE_LENGTH_PROPERTY_NAME.toLatin1()); - + // build prototype _proto = engine()->newQObject(new ArrayBufferPrototype(this), QScriptEngine::QtOwnership, @@ -45,13 +45,13 @@ QScriptClass(scriptEngine) { QScriptEngine::ExcludeSuperClassMethods | QScriptEngine::ExcludeSuperClassProperties); _proto.setPrototype(global.property("Object").property("prototype")); - + // Register constructor _ctor = engine()->newFunction(construct, _proto); _ctor.setData(engine()->toScriptValue(this)); - + engine()->globalObject().setProperty(name(), _ctor); - + // Registering other array types // The script engine is there parent so it'll delete them with itself new DataViewClass(scriptEngine); @@ -101,16 +101,16 @@ QScriptValue ArrayBufferClass::construct(QScriptContext* context, QScriptEngine* if (!arg.isValid() || !arg.isNumber()) { return QScriptValue(); } - + quint32 size = arg.toInt32(); QScriptValue newObject = cls->newInstance(size); - + if (context->isCalledAsConstructor()) { // if called with keyword new, replace this object. context->setThisObject(newObject); return engine->undefinedValue(); } - + return newObject; } diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index c1578265e3..3bbe72822d 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -139,7 +139,7 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) { QString fileName = contextInfo.fileName(); int lineNumber = contextInfo.lineNumber(); QString functionName = contextInfo.functionName(); - + location = functionName; if (!fileName.isEmpty()) { if (location.isEmpty()) { @@ -155,10 +155,10 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) { if (location.isEmpty()) { location = scriptEngine->getFilename(); } - + // give the script engine a chance to notify the system about this message scriptEngine->print(message); - + // send the message to debug log qCDebug(scriptengine_script, "[%s] %s", qUtf8Printable(location), qUtf8Printable(message)); } else { @@ -366,20 +366,20 @@ void ScriptEngine::executeOnScriptThread(std::function function, const Q void ScriptEngine::waitTillDoneRunning(bool shutdown) { // Engine should be stopped already, but be defensive stop(); - + auto workerThread = thread(); - + if (workerThread == QThread::currentThread()) { qCWarning(scriptengine) << "ScriptEngine::waitTillDoneRunning called, but the script is on the same thread:" << getFilename(); return; } - + if (_isThreaded && workerThread) { // We should never be waiting (blocking) on our own thread assert(workerThread != QThread::currentThread()); #if 0 - // 26 Feb 2021 - Disabled this OSX-specific code because it causes OSX to crash on shutdown; without this code, OSX + // 26 Feb 2021 - Disabled this OSX-specific code because it causes OSX to crash on shutdown; without this code, OSX // doesn't crash on shutdown. Qt 5.12.3 and Qt 5.15.2. // // On mac, don't call QCoreApplication::processEvents() here. This is to prevent @@ -1042,7 +1042,7 @@ void ScriptEngine::addEventHandler(const EntityItemID& entityID, const QString& }; /*@jsdoc - *

The name of an entity event. When the entity event occurs, any function that has been registered for that event + *

The name of an entity event. When the entity event occurs, any function that has been registered for that event * via {@link Script.addEventHandler} is called with parameters per the entity event.

*
NameTypeDescription
userAnimNonebooleantrue when no user overrideAnimation is + *
userAnimNonebooleantrue when no user overrideAnimation is * playing.
userAnimAbooleantrue when a user overrideAnimation is + *
userAnimAbooleantrue when a user overrideAnimation is * playing.
userAnimBbooleantrue when a user overrideAnimation is + *
userAnimBbooleantrue when a user overrideAnimation is * playing.
sinenumberOscillating sine wave.
moveForwardSpeednumberControls the blend between the various forward walking + *
moveForwardSpeednumberControls the blend between the various forward walking * & running animations.
moveBackwardSpeednumberControls the blend between the various backward walking + *
moveBackwardSpeednumberControls the blend between the various backward walking * & running animations.
moveLateralSpeednumberControls the blend between the various sidestep walking + *
moveLateralSpeednumberControls the blend between the various sidestep walking * & running animations.
isMovingForwardbooleantrue if the avatar is moving + *
isMovingForwardbooleantrue if the avatar is moving * forward.
isMovingBackwardbooleantrue if the avatar is moving + *
isMovingBackwardbooleantrue if the avatar is moving * backward.
isMovingRightbooleantrue if the avatar is moving to the + *
isMovingRightbooleantrue if the avatar is moving to the * right.
isMovingLeftbooleantrue if the avatar is moving to the + *
isMovingLeftbooleantrue if the avatar is moving to the * left.
isMovingRightHmdbooleantrue if the avatar is moving to the right + *
isMovingRightHmdbooleantrue if the avatar is moving to the right * while the user is in HMD mode.
isMovingLeftHmdbooleantrue if the avatar is moving to the left while + *
isMovingLeftHmdbooleantrue if the avatar is moving to the left while * the user is in HMD mode.
isNotMovingbooleantrue if the avatar is stationary.
isTurningRightbooleantrue if the avatar is turning + *
isTurningRightbooleantrue if the avatar is turning * clockwise.
isTurningLeftbooleantrue if the avatar is turning + *
isTurningLeftbooleantrue if the avatar is turning * counter-clockwise.
isNotTurningbooleantrue if the avatar is not turning.
isFlyingbooleantrue if the avatar is flying.
isNotFlyingbooleantrue if the avatar is not flying.
isTakeoffStandbooleantrue if the avatar is about to execute a + *
isTakeoffStandbooleantrue if the avatar is about to execute a * standing jump.
isTakeoffRunbooleantrue if the avatar is about to execute a running + *
isTakeoffRunbooleantrue if the avatar is about to execute a running * jump.
isNotTakeoffbooleantrue if the avatar is not jumping.
isInAirStandbooleantrue if the avatar is in the air after a standing + *
isInAirStandbooleantrue if the avatar is in the air after a standing * jump.
isInAirRunbooleantrue if the avatar is in the air after a running + *
isInAirRunbooleantrue if the avatar is in the air after a running * jump.
isNotInAirbooleantrue if the avatar on the ground.
inAirAlphanumberUsed to interpolate between the up, apex, and down in-air + *
inAirAlphanumberUsed to interpolate between the up, apex, and down in-air * animations.
ikOverlayAlphanumberThe blend between upper body and spline IK versus the + *
ikOverlayAlphanumberThe blend between upper body and spline IK versus the * underlying animation
headPosition{@link Vec3}The desired position of the Head joint in + *
headPosition{@link Vec3}The desired position of the Head joint in * rig coordinates.
headRotation{@link Quat}The desired orientation of the Head joint in + *
headRotation{@link Quat}The desired orientation of the Head joint in * rig coordinates.
headType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the + *
headType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the * head.
headWeightnumberHow strongly the head chain blends with the other IK + *
headWeightnumberHow strongly the head chain blends with the other IK * chains.
leftHandPosition{@link Vec3}The desired position of the LeftHand + *
leftHandPosition{@link Vec3}The desired position of the LeftHand * joint in rig coordinates.
leftHandRotation{@link Quat}The desired orientation of the LeftHand + *
leftHandRotation{@link Quat}The desired orientation of the LeftHand * joint in rig coordinates.
leftHandType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the + *
leftHandType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the * left arm.
leftHandPoleVectorEnabledbooleanWhen true, the elbow angle is - * controlled by the rightHandPoleVector property value. Otherwise the elbow direction comes from the + *
leftHandPoleVectorEnabledbooleanWhen true, the elbow angle is + * controlled by the rightHandPoleVector property value. Otherwise the elbow direction comes from the * underlying animation.
leftHandPoleReferenceVector{@link Vec3}The direction of the elbow in the local + *
leftHandPoleReferenceVector{@link Vec3}The direction of the elbow in the local * coordinate system of the elbow.
leftHandPoleVector{@link Vec3}The direction the elbow should point in rig + *
leftHandPoleVector{@link Vec3}The direction the elbow should point in rig * coordinates.
rightHandPosition{@link Vec3}The desired position of the RightHand * joint in rig coordinates.
rightHandRotation{@link Quat}The desired orientation of the + *
rightHandRotation{@link Quat}The desired orientation of the * RightHand joint in rig coordinates.
rightHandType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for + *
rightHandType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for * the right arm.
rightHandPoleVectorEnabledbooleanWhen true, the elbow angle is - * controlled by the rightHandPoleVector property value. Otherwise the elbow direction comes from the + *
rightHandPoleVectorEnabledbooleanWhen true, the elbow angle is + * controlled by the rightHandPoleVector property value. Otherwise the elbow direction comes from the * underlying animation.
rightHandPoleReferenceVector{@link Vec3}The direction of the elbow in the local + *
rightHandPoleReferenceVector{@link Vec3}The direction of the elbow in the local * coordinate system of the elbow.
rightHandPoleVector{@link Vec3}The direction the elbow should point in rig + *
rightHandPoleVector{@link Vec3}The direction the elbow should point in rig * coordinates.
leftFootIKEnabledbooleantrue if IK is enabled for the left + *
leftFootIKEnabledbooleantrue if IK is enabled for the left * foot.
rightFootIKEnabledbooleantrue if IK is enabled for the right + *
rightFootIKEnabledbooleantrue if IK is enabled for the right * foot.
leftFootIKPositionVarstringThe name of the source for the desired position + *
leftFootIKPositionVarstringThe name of the source for the desired position * of the LeftFoot joint. If not set, the foot rotation of the underlying animation will be used.
leftFootIKRotationVarstringThe name of the source for the desired rotation * of the LeftFoot joint. If not set, the foot rotation of the underlying animation will be used.
leftFootPoleVectorEnabledbooleanWhen true, the knee angle is - * controlled by the leftFootPoleVector property value. Otherwise the knee direction comes from the + *
leftFootPoleVectorEnabledbooleanWhen true, the knee angle is + * controlled by the leftFootPoleVector property value. Otherwise the knee direction comes from the * underlying animation.
leftFootPoleVector{@link Vec3}The direction the knee should face in rig + *
leftFootPoleVector{@link Vec3}The direction the knee should face in rig * coordinates.
rightFootIKPositionVarstringThe name of the source for the desired position + *
rightFootIKPositionVarstringThe name of the source for the desired position * of the RightFoot joint. If not set, the foot rotation of the underlying animation will be used.
rightFootIKRotationVarstringThe name of the source for the desired rotation * of the RightFoot joint. If not set, the foot rotation of the underlying animation will be used.
rightFootPoleVectorEnabledbooleanWhen true, the knee angle is - * controlled by the rightFootPoleVector property value. Otherwise the knee direction comes from the + *
rightFootPoleVectorEnabledbooleanWhen true, the knee angle is + * controlled by the rightFootPoleVector property value. Otherwise the knee direction comes from the * underlying animation.
rightFootPoleVector{@link Vec3}The direction the knee should face in rig + *
rightFootPoleVector{@link Vec3}The direction the knee should face in rig * coordinates.
isTalkingbooleantrue if the avatar is talking.
solutionSource{@link MyAvatar.AnimIKSolutionSource|AnimIKSolutionSource}Determines the initial conditions of the IK solver.
defaultPoseOverlayAlphanumberControls the blend between the main animation state - * machine and the default pose. Mostly used during full body tracking so that walking & jumping animations do not + *
defaultPoseOverlayAlphanumberControls the blend between the main animation state + * machine and the default pose. Mostly used during full body tracking so that walking & jumping animations do not * affect the IK of the figure.
defaultPoseOverlayBoneSet{@link MyAvatar.AnimOverlayBoneSet|AnimOverlayBoneSet}Specifies which bones will be replace by the source overlay.
hipsType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the + *
hipsType{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the * hips.
hipsPosition{@link Vec3}The desired position of Hips joint in rig + *
hipsPosition{@link Vec3}The desired position of Hips joint in rig * coordinates.
hipsRotation{@link Quat}the desired orientation of the Hips joint in + *
hipsRotation{@link Quat}the desired orientation of the Hips joint in * rig coordinates.
spine2Type{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the + *
spine2Type{@link MyAvatar.IKTargetType|IKTargetType}The type of IK used for the * Spine2 joint.
spine2Position{@link Vec3}The desired position of the Spine2 joint + *
spine2Position{@link Vec3}The desired position of the Spine2 joint * in rig coordinates.
spine2Rotation{@link Quat}The desired orientation of the Spine2 + *
spine2Rotation{@link Quat}The desired orientation of the Spine2 * joint in rig coordinates.
leftFootIKAlphanumberBlends between full IK for the leg and the underlying * animation.
rightFootIKAlphanumberBlends between full IK for the leg and the underlying * animation.
hipsWeightnumberHow strongly the hips target blends with the IK solution for + *
hipsWeightnumberHow strongly the hips target blends with the IK solution for * other IK chains.
leftHandWeightnumberHow strongly the left hand blends with IK solution of other + *
leftHandWeightnumberHow strongly the left hand blends with IK solution of other * IK chains.
rightHandWeightnumberHow strongly the right hand blends with IK solution of other * IK chains.
spine2WeightnumberHow strongly the spine2 chain blends with the rest of the IK + *
spine2WeightnumberHow strongly the spine2 chain blends with the rest of the IK * solution.
leftHandOverlayAlphanumberUsed to blend in the animated hand gesture poses, such + *
leftHandOverlayAlphanumberUsed to blend in the animated hand gesture poses, such * as point and thumbs up.
leftHandGraspAlphanumberUsed to blend between an open hand and a closed hand. + *
leftHandGraspAlphanumberUsed to blend between an open hand and a closed hand. * Usually changed as you squeeze the trigger of the hand controller.
rightHandOverlayAlphanumberUsed to blend in the animated hand gesture poses, + *
rightHandOverlayAlphanumberUsed to blend in the animated hand gesture poses, * such as point and thumbs up.
rightHandGraspAlphanumberUsed to blend between an open hand and a closed hand. + *
rightHandGraspAlphanumberUsed to blend between an open hand and a closed hand. * Usually changed as you squeeze the trigger of the hand controller.
isLeftIndexPointbooleantrue if the left hand should be * pointing.
isLeftThumbRaisebooleantrue if the left hand should be + *
isLeftThumbRaisebooleantrue if the left hand should be * thumbs-up.
isLeftIndexPointAndThumbRaisebooleantrue if the left hand should be + *
isLeftIndexPointAndThumbRaisebooleantrue if the left hand should be * pointing and thumbs-up.
isLeftHandGraspbooleantrue if the left hand should be at rest, + *
isLeftHandGraspbooleantrue if the left hand should be at rest, * grasping the controller.
isRightIndexPointbooleantrue if the right hand should be * pointing.
isRightThumbRaisebooleantrue if the right hand should be + *
isRightThumbRaisebooleantrue if the right hand should be * thumbs-up.
isRightIndexPointAndThumbRaisebooleantrue if the right hand should + *
isRightIndexPointAndThumbRaisebooleantrue if the right hand should * be pointing and thumbs-up.
isRightHandGraspbooleantrue if the right hand should be at rest, + *
isRightHandGraspbooleantrue if the right hand should be at rest, * grasping the controller.
Create a Web entity displaying at 1920 x 1080 resolution.
* @@ -1338,7 +1338,7 @@ void ScriptEngine::run() { emit finished(_fileNameString, qSharedPointerCast(sharedFromThis())); - // Don't leave our local-file-access flag laying around, reset it to false when the scriptengine + // Don't leave our local-file-access flag laying around, reset it to false when the scriptengine // thread is finished hifi::scripting::setLocalAccessSafeThread(false); _isRunning = false; @@ -1852,7 +1852,7 @@ QScriptValue ScriptEngine::require(const QString& moduleId) { // modules get cached in `Script.require.cache` and (similar to Node.js) users can access it // to inspect particular entries and invalidate them by deleting the key: // `delete Script.require.cache[Script.require.resolve(moduleId)];` - + // Check to see if we should invalidate the cache based on a user setting. Setting::Handle getCachebustSetting {"cachebustScriptRequire", false }; @@ -2390,25 +2390,25 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co // Entity Script Whitelist toggle check. Setting::Handle whitelistEnabled {"private/whitelistEnabled", false }; - + if (!whitelistEnabled.get()) { passList = true; } - + // Pull SAFEURLS from the Interface.JSON settings. QVariant raw = Setting::Handle("private/settingsSafeURLS").get(); QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), Qt::SkipEmptyParts); safeURLPrefixes += settingsSafeURLS; // END Pull SAFEURLS from the Interface.JSON settings. - + // Get current domain whitelist bypass, in case an entire domain is whitelisted. QString currentDomain = DependencyManager::get()->getDomainURL().host(); - + QString domainSafeIP = nodeList->getDomainHandler().getHostname(); QString domainSafeURL = URL_SCHEME_VIRCADIA + "://" + currentDomain; for (const auto& str : safeURLPrefixes) { if (domainSafeURL.startsWith(str) || domainSafeIP.startsWith(str)) { - qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: " + qCDebug(scriptengine) << whitelistPrefix << "Whitelist Bypassed, entire domain is whitelisted. Current Domain Host: " << nodeList->getDomainHandler().getHostname() << "Current Domain: " << currentDomain; passList = true; diff --git a/libraries/script-engine/src/WheelEvent.cpp b/libraries/script-engine/src/WheelEvent.cpp index 565c2ddb50..690d65847b 100644 --- a/libraries/script-engine/src/WheelEvent.cpp +++ b/libraries/script-engine/src/WheelEvent.cpp @@ -58,15 +58,15 @@ WheelEvent::WheelEvent(const QWheelEvent& event) { * @typedef {object} WheelEvent * @property {number} x - Integer x-coordinate of the event on the Interface window or HMD HUD. * @property {number} y - Integer y-coordinate of the event on the Interface window or HMD HUD. - * @property {number} delta - Integer number indicating the direction and speed to scroll: positive numbers to scroll up, and + * @property {number} delta - Integer number indicating the direction and speed to scroll: positive numbers to scroll up, and * negative numers to scroll down. - * @property {string} orientation - The orientation of the wheel: "VERTICAL" for a typical mouse; + * @property {string} orientation - The orientation of the wheel: "VERTICAL" for a typical mouse; * "HORIZONTAL" for a "horizontal" wheel. - * @property {boolean} isLeftButton - true if the left button was pressed when the event was generated, otherwise + * @property {boolean} isLeftButton - true if the left button was pressed when the event was generated, otherwise * false. - * @property {boolean} isMiddleButton - true if the middle button was pressed when the event was generated, + * @property {boolean} isMiddleButton - true if the middle button was pressed when the event was generated, * otherwise false. - * @property {boolean} isRightButton - true if the right button was pressed when the event was generated, + * @property {boolean} isRightButton - true if the right button was pressed when the event was generated, * otherwise false. * @property {boolean} isShifted - true if the Shift key was pressed when the event was generated, otherwise * false. diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index 098e5e9a80..000d2d5e3b 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -258,6 +258,6 @@ void LogHandler::printRepeatedMessage(int messageID, LogMsgType type, const QMes } else { _repeatedMessageRecords[messageID].repeatString = message; } - + ++_repeatedMessageRecords[messageID].repeatCount; } diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h index 71df2a4189..b3a7805848 100644 --- a/libraries/shared/src/LogHandler.h +++ b/libraries/shared/src/LogHandler.h @@ -95,7 +95,7 @@ private: } while (false) #define HIFI_FDEBUG(message) HIFI_FCDEBUG((*QLoggingCategory::defaultCategory()), message) - + #define HIFI_FCDEBUG_ID(category, messageID, message) \ do { \ if (category.isDebugEnabled()) { \ diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index f14be72a71..e96165576c 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -738,7 +738,7 @@ QString formatSecTime(qint64 secs) { QString formatSecondsElapsed(float seconds) { QString result; - const float SECONDS_IN_DAY = 60.0f * 60.0f * 24.0f; + const float SECONDS_IN_DAY = 60.0f * 60.0f * 24.0f; if (seconds > SECONDS_IN_DAY) { float days = floor(seconds / SECONDS_IN_DAY); float rest = seconds - (days * SECONDS_IN_DAY); @@ -978,7 +978,7 @@ bool getProcessorInfo(ProcessorInfo& info) { break; case RelationCache: - // Cache data is in ptr->Cache, one CACHE_DESCRIPTOR structure for each cache. + // Cache data is in ptr->Cache, one CACHE_DESCRIPTOR structure for each cache. Cache = &ptr->Cache; if (Cache->Level == 1) { processorL1CacheCount++;