From b85f36c1ef403329fcd22edcfa915a11d882f8a5 Mon Sep 17 00:00:00 2001 From: raveenajain Date: Mon, 13 May 2019 17:25:12 -0700 Subject: [PATCH 001/100] fixes avatar collision, shape info and model bounding --- libraries/fbx/src/GLTFSerializer.cpp | 70 ++++++++++++++++------------ 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index 9952072668..bb8c2dd9c8 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -794,7 +794,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& parents[child] = nodecount; } sortedNodes.push_back(nodecount); - nodecount++; + ++nodecount; } @@ -810,7 +810,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& _file.nodes[nodecount].transforms.push_back(getModelTransform(parentNode)); parentIndex = parents[parentIndex]; } - nodecount++; + ++nodecount; } @@ -824,7 +824,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& int parentIndex = parents[currentNode]; if (parentIndex == -1 || hasBeenSorted[parentIndex]) { hasBeenSorted[currentNode] = true; - i++; + ++i; } else { int j = i + 1; // index of node to be sorted while (j < numNodes) { @@ -835,19 +835,19 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hasBeenSorted[nextNode] = true; sortedNodes[i] = nextNode; sortedNodes[j] = currentNode; - i++; + ++i; currentNode = sortedNodes[i]; } - j++; + ++j; } } } - + // Build map from original to new indices QVector originalToNewNodeIndexMap; originalToNewNodeIndexMap.fill(-1, numNodes); - for (int i = 0; i < numNodes; i++) { + for (int i = 0; i < numNodes; ++i) { originalToNewNodeIndexMap[sortedNodes[i]] = i; } @@ -856,20 +856,26 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& HFMJoint joint; joint.distanceToParent = 0; hfmModel.jointIndices["x"] = numNodes; + QVector globalTransforms; + globalTransforms.resize(numNodes + 1); for (int nodeIndex : sortedNodes) { auto& node = _file.nodes[nodeIndex]; - joint.parentIndex = parents[nodeIndex]; - if (joint.parentIndex != -1) { - joint.parentIndex = originalToNewNodeIndexMap[joint.parentIndex]; - } joint.transform = node.transforms.first(); joint.translation = extractTranslation(joint.transform); joint.rotation = glmExtractRotation(joint.transform); glm::vec3 scale = extractScale(joint.transform); joint.postTransform = glm::scale(glm::mat4(), scale); + joint.parentIndex = parents[nodeIndex]; + globalTransforms[numNodes] = joint.transform * globalTransforms[numNodes]; // accumulate for all nodes + globalTransforms[nodeIndex] = joint.transform; + if (joint.parentIndex != -1) { + globalTransforms[nodeIndex] = globalTransforms[joint.parentIndex] * globalTransforms[nodeIndex]; + joint.parentIndex = originalToNewNodeIndexMap[joint.parentIndex]; + } + joint.name = node.name; joint.isSkeletonJoint = false; hfmModel.joints.push_back(joint); @@ -886,11 +892,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& std::vector> inverseBindValues; getSkinInverseBindMatrices(inverseBindValues); - for (int jointIndex = 0; jointIndex < numNodes; jointIndex++) { + for (int jointIndex = 0; jointIndex < numNodes; ++jointIndex) { int nodeIndex = sortedNodes[jointIndex]; auto joint = hfmModel.joints[jointIndex]; - for (int s = 0; s < _file.skins.size(); s++) { + for (int s = 0; s < _file.skins.size(); ++s) { const auto& skin = _file.skins[s]; int matrixIndex = skin.joints.indexOf(nodeIndex); joint.isSkeletonJoint = skin.joints.contains(nodeIndex); @@ -924,7 +930,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& materialIDs.push_back(mid); } - for (int i = 0; i < materialIDs.size(); i++) { + for (int i = 0; i < materialIDs.size(); ++i) { QString& matid = materialIDs[i]; hfmModel.materials[matid] = HFMMaterial(); HFMMaterial& hfmMaterial = hfmModel.materials[matid]; @@ -935,6 +941,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // Build meshes nodecount = 0; + hfmModel.meshExtents.reset(); for (int nodeIndex : sortedNodes) { auto& node = _file.nodes[nodeIndex]; @@ -949,7 +956,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& cluster.inverseBindTransform = Transform(cluster.inverseBindMatrix); mesh.clusters.append(cluster); } else { // skinned model - for (int j = 0; j < numNodes; j++) { + for (int j = 0; j < numNodes; ++j) { HFMCluster cluster; cluster.jointIndex = j; cluster.inverseBindMatrix = jointInverseBindTransforms[j]; @@ -1106,7 +1113,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& qWarning(modelformat) << "There was a problem reading glTF JOINTS_0 data for model " << _url; continue; } - for (int n = 0; n < joints.size(); n++) { + for (int n = 0; n < joints.size(); ++n) { clusterJoints.push_back(joints[n]); } } else if (key == "WEIGHTS_0") { @@ -1121,7 +1128,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& qWarning(modelformat) << "There was a problem reading glTF WEIGHTS_0 data for model " << _url; continue; } - for (int n = 0; n < weights.size(); n++) { + for (int n = 0; n < weights.size(); ++n) { clusterWeights.push_back(weights[n]); } } @@ -1136,7 +1143,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& mesh.clusterIndices.fill(mesh.clusters.size() - 1, numClusterIndices); mesh.clusterWeights.fill(0, numClusterIndices); - for (int c = 0; c < clusterJoints.size(); c++) { + for (int c = 0; c < clusterJoints.size(); ++c) { mesh.clusterIndices[c] = originalToNewNodeIndexMap[_file.skins[node.skin].joints[clusterJoints[c]]]; } @@ -1166,7 +1173,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // populate the texture coordinates if they don't exist if (mesh.texCoords.size() == 0 && !hfmModel.hasSkeletonJoints) { - for (int i = 0; i < part.triangleIndices.size(); i++) { mesh.texCoords.push_back(glm::vec2(0.0, 1.0)); } + for (int i = 0; i < part.triangleIndices.size(); ++i) { mesh.texCoords.push_back(glm::vec2(0.0, 1.0)); } } // Build morph targets (blend shapes) @@ -1177,7 +1184,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hifi::VariantHash blendshapeMappings = mapping.value("bs").toHash(); QMultiHash blendshapeIndices; - for (int i = 0;; i++) { + for (int i = 0;; ++i) { hifi::ByteArray blendshapeName = FACESHIFT_BLENDSHAPES[i]; if (blendshapeName.isEmpty()) { break; @@ -1197,7 +1204,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& auto names = _file.meshes[node.mesh].extras.targetNames; QVector weights = _file.meshes[node.mesh].weights; - for (int weightedIndex = 0; weightedIndex < values.size(); weightedIndex++) { + for (int weightedIndex = 0; weightedIndex < values.size(); ++weightedIndex) { float weight = 0.1f; int indexFromMapping = weightedIndex; int targetIndex = weightedIndex; @@ -1238,29 +1245,32 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } else { blendshape.vertices[count] = blendshape.vertices[count] + vertices[i]; blendshape.normals[count] = blendshape.normals[count] + normals[i]; - count++; + ++count; } } } } - for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; clusterIndex++) { + for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; ++clusterIndex) { + auto joint = hfmModel.joints[clusterIndex]; ShapeVertices& points = hfmModel.shapeVertices.at(clusterIndex); + glm::mat4 modelTransform = glm::mat4(0.1f) * globalTransforms[numNodes] * joint.transform; for (glm::vec3 vertex : mesh.vertices) { - points.push_back(vertex); + glm::vec3 transformedVertex = glm::vec3(modelTransform * glm::vec4(vertex, 1.0f)); + points.push_back(transformedVertex); } } - mesh.meshExtents.reset(); foreach(const glm::vec3& vertex, mesh.vertices) { - mesh.meshExtents.addPoint(vertex); - hfmModel.meshExtents.addPoint(vertex); + glm::vec3 transformedVertex = glm::vec3(globalTransforms[nodeIndex] * glm::vec4(vertex, 1.0f)); + mesh.meshExtents.addPoint(transformedVertex); + hfmModel.meshExtents.addPoint(transformedVertex); } mesh.meshIndex = hfmModel.meshes.size(); } } - nodecount++; + ++nodecount; } return true; @@ -1511,8 +1521,8 @@ bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int c blobstream.unsetDevice(); return false; } - for (int i = 0; i < count; i++) { - for (int j = 0; j < bufferCount; j++) { + for (int i = 0; i < count; ++i) { + for (int j = 0; j < bufferCount; ++j) { if (!blobstream.atEnd()) { T value; blobstream >> value; From 6befbdafe96ee823e24085c4c2d2cedd116a824b Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Fri, 17 May 2019 15:31:21 -0700 Subject: [PATCH 002/100] Logging for DomainList reception & timebox overruns --- libraries/networking/src/NodeList.cpp | 7 +++++++ libraries/networking/src/udt/Socket.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 3a80745115..7d5a60c52b 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -622,6 +622,13 @@ void NodeList::processDomainServerList(QSharedPointer message) // refuse to process this packet if we aren't currently connected to the DS return; } +#ifdef DEBUG_EVENT_QUEUE + { + int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); + qCDebug(networking) << "DomainList received, pending count =" << _domainHandler.getCheckInPacketsSinceLastReply() + << "NodeList thread event queue size =" << nodeListQueueSize; + } +#endif // this is a packet from the domain server, reset the count of un-replied check-ins _domainHandler.clearPendingCheckins(); diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 7829e3727c..2130d5bc6f 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -334,6 +334,11 @@ void Socket::readPendingDatagrams() { if (system_clock::now() > abortTime) { // We've been running for too long, stop processing packets for now // Once we've processed the event queue, we'll come back to packet processing +#ifdef DEBUG_EVENT_QUEUE + int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); + qCDebug(networking) << "Overran timebox by" << duration_cast(system_clock::now() - abortTime).count() + << "ms; NodeList thread event queue size =" << nodeListQueueSize; +#endif break; } From 9693f586a2154f5b69552a3de7ef0501ab832f67 Mon Sep 17 00:00:00 2001 From: raveenajain Date: Wed, 22 May 2019 14:24:09 -0700 Subject: [PATCH 003/100] bounding boxes, avatar walking, temp collision --- libraries/fbx/src/GLTFSerializer.cpp | 103 +++++++++++++++------------ 1 file changed, 58 insertions(+), 45 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index d6fcfaba36..dc5f52f938 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -841,7 +841,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& parents[child] = nodecount; } sortedNodes.push_back(nodecount); - nodecount++; + ++nodecount; } @@ -857,7 +857,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& _file.nodes[nodecount].transforms.push_back(getModelTransform(parentNode)); parentIndex = parents[parentIndex]; } - nodecount++; + ++nodecount; } @@ -871,7 +871,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& int parentIndex = parents[currentNode]; if (parentIndex == -1 || hasBeenSorted[parentIndex]) { hasBeenSorted[currentNode] = true; - i++; + ++i; } else { int j = i + 1; // index of node to be sorted while (j < numNodes) { @@ -882,10 +882,10 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hasBeenSorted[nextNode] = true; sortedNodes[i] = nextNode; sortedNodes[j] = currentNode; - i++; + ++i; currentNode = sortedNodes[i]; } - j++; + ++j; } } } @@ -894,7 +894,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // Build map from original to new indices QVector originalToNewNodeIndexMap; originalToNewNodeIndexMap.fill(-1, numNodes); - for (int i = 0; i < numNodes; i++) { + for (int i = 0; i < numNodes; ++i) { originalToNewNodeIndexMap[sortedNodes[i]] = i; } @@ -903,6 +903,8 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& HFMJoint joint; joint.distanceToParent = 0; hfmModel.jointIndices["x"] = numNodes; + QVector globalTransforms; + globalTransforms.resize(numNodes); for (int nodeIndex : sortedNodes) { auto& node = _file.nodes[nodeIndex]; @@ -917,6 +919,13 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& glm::vec3 scale = extractScale(joint.transform); joint.postTransform = glm::scale(glm::mat4(), scale); + joint.parentIndex = parents[nodeIndex]; + globalTransforms[nodeIndex] = joint.transform; + if (joint.parentIndex != -1) { + globalTransforms[nodeIndex] = globalTransforms[joint.parentIndex] * globalTransforms[nodeIndex]; + joint.parentIndex = originalToNewNodeIndexMap[joint.parentIndex]; + } + joint.name = node.name; joint.isSkeletonJoint = false; hfmModel.joints.push_back(joint); @@ -926,18 +935,19 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // Build skeleton std::vector jointInverseBindTransforms; + std::vector globalBindTransforms; jointInverseBindTransforms.resize(numNodes); + globalBindTransforms.resize(numNodes); hfmModel.hasSkeletonJoints = !_file.skins.isEmpty(); if (hfmModel.hasSkeletonJoints) { - hfmModel.hasSkeletonJoints = true; std::vector> inverseBindValues; getSkinInverseBindMatrices(inverseBindValues); - for (int jointIndex = 0; jointIndex < numNodes; jointIndex++) { + for (int jointIndex = 0; jointIndex < numNodes; ++jointIndex) { int nodeIndex = sortedNodes[jointIndex]; auto joint = hfmModel.joints[jointIndex]; - for (int s = 0; s < _file.skins.size(); s++) { + for (int s = 0; s < _file.skins.size(); ++s) { const auto& skin = _file.skins[s]; int matrixIndex = skin.joints.indexOf(nodeIndex); joint.isSkeletonJoint = skin.joints.contains(nodeIndex); @@ -954,6 +964,10 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } else { jointInverseBindTransforms[jointIndex] = glm::mat4(); } + globalBindTransforms[jointIndex] = jointInverseBindTransforms[jointIndex]; + if (joint.parentIndex != -1) { + globalBindTransforms[jointIndex] = globalBindTransforms[joint.parentIndex] * globalBindTransforms[jointIndex]; + } glm::vec3 bindTranslation = extractTranslation(hfmModel.offset * glm::inverse(jointInverseBindTransforms[jointIndex])); hfmModel.bindExtents.addPoint(bindTranslation); } @@ -962,13 +976,13 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } - //Build materials + // Build materials QVector materialIDs; QString unknown = "Default"; int ukcount = 0; foreach(auto material, _file.materials) { if (!material.defined["name"]) { - QString name = unknown + QString::number(ukcount++); + QString name = unknown + QString::number(++ukcount); material.name = name; material.defined.insert("name", true); } @@ -977,7 +991,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& materialIDs.push_back(mid); } - for (int i = 0; i < materialIDs.size(); i++) { + for (int i = 0; i < materialIDs.size(); ++i) { QString& matid = materialIDs[i]; hfmModel.materials[matid] = HFMMaterial(); HFMMaterial& hfmMaterial = hfmModel.materials[matid]; @@ -989,6 +1003,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // Build meshes nodecount = 0; + hfmModel.meshExtents.reset(); for (int nodeIndex : sortedNodes) { auto& node = _file.nodes[nodeIndex]; @@ -1003,7 +1018,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& cluster.inverseBindTransform = Transform(cluster.inverseBindMatrix); mesh.clusters.append(cluster); } else { // skinned model - for (int j = 0; j < numNodes; j++) { + for (int j = 0; j < numNodes; ++j) { HFMCluster cluster; cluster.jointIndex = j; cluster.inverseBindMatrix = jointInverseBindTransforms[j]; @@ -1300,7 +1315,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } QVector validatedIndices; - for (int n = 0; n < indices.count(); n++) { + for (int n = 0; n < indices.count(); ++n) { if (indices[n] < partVerticesCount) { validatedIndices.push_back(indices[n] + prevMeshVerticesCount); } else { @@ -1332,7 +1347,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("TANGENT")) { - for (int i = 0; i < partVerticesCount; i++) { + for (int i = 0; i < partVerticesCount; ++i) { mesh.tangents.push_back(glm::vec3(0.0f, 0.0f, 0.0f)); } } @@ -1344,7 +1359,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("TEXCOORD_0")) { - for (int i = 0; i < partVerticesCount; i++) { + for (int i = 0; i < partVerticesCount; ++i) { mesh.texCoords.push_back(glm::vec2(0.0f, 0.0f)); } } @@ -1356,7 +1371,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("TEXCOORD_1")) { - for (int i = 0; i < partVerticesCount; i++) { + for (int i = 0; i < partVerticesCount; ++i) { mesh.texCoords1.push_back(glm::vec2(0.0f, 0.0f)); } } @@ -1368,7 +1383,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("COLOR_0")) { - for (int i = 0; i < partVerticesCount; i++) { + for (int i = 0; i < partVerticesCount; ++i) { mesh.colors.push_back(glm::vec3(1.0f, 1.0f, 1.0f)); } } @@ -1398,8 +1413,8 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("JOINTS_0")) { - for (int i = 0; i < partVerticesCount; i++) { - for (int j = 0; j < 4; j++) { + for (int i = 0; i < partVerticesCount; ++i) { + for (int j = 0; j < 4; ++j) { clusterJoints.push_back(0); } } @@ -1430,9 +1445,9 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } else { if (meshAttributes.contains("WEIGHTS_0")) { - for (int i = 0; i < partVerticesCount; i++) { + for (int i = 0; i < partVerticesCount; ++i) { clusterWeights.push_back(1.0f); - for (int j = 1; j < 4; j++) { + for (int j = 1; j < 4; ++j) { clusterWeights.push_back(0.0f); } } @@ -1448,12 +1463,12 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& int numVertices = mesh.vertices.size() - prevMeshVerticesCount; // Append new cluster indices and weights for this mesh part - for (int i = 0; i < numVertices * WEIGHTS_PER_VERTEX; i++) { + for (int i = 0; i < numVertices * WEIGHTS_PER_VERTEX; ++i) { mesh.clusterIndices.push_back(mesh.clusters.size() - 1); mesh.clusterWeights.push_back(0); } - for (int c = 0; c < clusterJoints.size(); c++) { + for (int c = 0; c < clusterJoints.size(); ++c) { mesh.clusterIndices[prevMeshClusterIndexCount + c] = originalToNewNodeIndexMap[_file.skins[node.skin].joints[clusterJoints[c]]]; } @@ -1484,7 +1499,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // populate the texture coordinates if they don't exist if (mesh.texCoords.size() == 0 && !hfmModel.hasSkeletonJoints) { - for (int i = 0; i < part.triangleIndices.size(); i++) { mesh.texCoords.push_back(glm::vec2(0.0, 1.0)); } + for (int i = 0; i < part.triangleIndices.size(); ++i) { mesh.texCoords.push_back(glm::vec2(0.0, 1.0)); } } // Build morph targets (blend shapes) @@ -1495,7 +1510,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hifi::VariantHash blendshapeMappings = mapping.value("bs").toHash(); QMultiHash blendshapeIndices; - for (int i = 0;; i++) { + for (int i = 0;; ++i) { hifi::ByteArray blendshapeName = FACESHIFT_BLENDSHAPES[i]; if (blendshapeName.isEmpty()) { break; @@ -1515,7 +1530,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& auto names = _file.meshes[node.mesh].extras.targetNames; QVector weights = _file.meshes[node.mesh].weights; - for (int weightedIndex = 0; weightedIndex < values.size(); weightedIndex++) { + for (int weightedIndex = 0; weightedIndex < values.size(); ++weightedIndex) { float weight = 0.1f; int indexFromMapping = weightedIndex; int targetIndex = weightedIndex; @@ -1556,34 +1571,32 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } else { blendshape.vertices[count] = blendshape.vertices[count] + vertices[i]; blendshape.normals[count] = blendshape.normals[count] + normals[i]; - count++; + ++count; } } } } - for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; clusterIndex++) { + for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; ++clusterIndex) { ShapeVertices& points = hfmModel.shapeVertices.at(clusterIndex); + // TODO: fix modelTransform value + const glm::mat4 modelTransform = glm::inverse(globalBindTransforms[originalToNewNodeIndexMap[nodeIndex]]) * + globalTransforms[originalToNewNodeIndexMap[clusterIndex]] * glm::mat4(0.1f); for (glm::vec3 vertex : mesh.vertices) { - points.push_back(vertex); + glm::vec3 transformedVertex = glm::vec3(modelTransform * glm::vec4(vertex, 1.0f)); + points.push_back(transformedVertex); } } - mesh.meshExtents.reset(); foreach(const glm::vec3& vertex, mesh.vertices) { - mesh.meshExtents.addPoint(vertex); - hfmModel.meshExtents.addPoint(vertex); + glm::vec3 transformedVertex = glm::vec3(globalTransforms[nodeIndex] * glm::vec4(vertex, 1.0f)); + mesh.meshExtents.addPoint(transformedVertex); + hfmModel.meshExtents.addPoint(transformedVertex); } mesh.meshIndex = hfmModel.meshes.size(); } - mesh.meshExtents.reset(); - foreach(const glm::vec3& vertex, mesh.vertices) { - mesh.meshExtents.addPoint(vertex); - hfmModel.meshExtents.addPoint(vertex); - } - // Add epsilon to mesh extents to compensate for planar meshes mesh.meshExtents.minimum -= glm::vec3(EPSILON, EPSILON, EPSILON); mesh.meshExtents.maximum += glm::vec3(EPSILON, EPSILON, EPSILON); @@ -1592,7 +1605,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& mesh.meshIndex = hfmModel.meshes.size(); } - nodecount++; + ++nodecount; } return true; @@ -1839,8 +1852,8 @@ bool GLTFSerializer::readArray(const hifi::ByteArray& bin, int byteOffset, int c blobstream.unsetDevice(); return false; } - for (int i = 0; i < count; i++) { - for (int j = 0; j < bufferCount; j++) { + for (int i = 0; i < count; ++i) { + for (int j = 0; j < bufferCount; ++j) { if (!blobstream.atEnd()) { T value; blobstream >> value; @@ -1893,7 +1906,7 @@ bool GLTFSerializer::addArrayFromAccessor(GLTFAccessor& accessor, QVector& ou success = addArrayOfType(buffer.blob, bufferview.byteOffset + accBoffset, accessor.count, outarray, accessor.type, accessor.componentType); } else { - for (int i = 0; i < accessor.count; i++) { + for (int i = 0; i < accessor.count; ++i) { T value; memset(&value, 0, sizeof(T)); // Make sure the dummy array is initalised to zero. outarray.push_back(value); @@ -1924,10 +1937,10 @@ bool GLTFSerializer::addArrayFromAccessor(GLTFAccessor& accessor, QVector& ou accessor.sparse.count, out_sparse_values_array, accessor.type, accessor.componentType); if (success) { - for (int i = 0; i < accessor.sparse.count; i++) { + for (int i = 0; i < accessor.sparse.count; ++i) { if ((i * 3) + 2 < out_sparse_values_array.size()) { if ((out_sparse_indices_array[i] * 3) + 2 < outarray.length()) { - for (int j = 0; j < 3; j++) { + for (int j = 0; j < 3; ++j) { outarray[(out_sparse_indices_array[i] * 3) + j] = out_sparse_values_array[(i * 3) + j]; } } else { From 916ff31cf6bbe79ba39937a02ad4bf9d884e0449 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 30 May 2019 17:51:21 -0700 Subject: [PATCH 004/100] adjust the preset options --- interface/src/PerformanceManager.cpp | 2 ++ interface/src/PerformanceManager.h | 3 ++- interface/src/scripting/PerformanceScriptingInterface.cpp | 2 +- interface/src/scripting/PerformanceScriptingInterface.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/src/PerformanceManager.cpp b/interface/src/PerformanceManager.cpp index 9e96763ff6..fc601fdf8a 100644 --- a/interface/src/PerformanceManager.cpp +++ b/interface/src/PerformanceManager.cpp @@ -57,7 +57,9 @@ void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformanceP qApp->getRefreshRateManager().setRefreshRateProfile(RefreshRateManager::RefreshRateProfile::ECO); break; + case PerformancePreset::UNKNOWN: default: + // Do nothing anymore break; } } diff --git a/interface/src/PerformanceManager.h b/interface/src/PerformanceManager.h index 14742626c3..adbc5804b1 100644 --- a/interface/src/PerformanceManager.h +++ b/interface/src/PerformanceManager.h @@ -20,7 +20,8 @@ class PerformanceManager { public: enum PerformancePreset { - LOW = 0, + UNKNOWN = 0, // Matching the platform Tier profiles enumeration for coherence + LOW, MID, HIGH, PROFILE_COUNT diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp index 4f7c2b0fda..a571e305d9 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.cpp +++ b/interface/src/scripting/PerformanceScriptingInterface.cpp @@ -28,7 +28,7 @@ PerformanceScriptingInterface::PerformancePreset PerformanceScriptingInterface:: } QStringList PerformanceScriptingInterface::getPerformancePresetNames() const { - static const QStringList performancePresetNames = { "Low", "Mid", "High" }; + static const QStringList performancePresetNames = { "Unknown", "Low", "Mid", "High" }; return performancePresetNames; } diff --git a/interface/src/scripting/PerformanceScriptingInterface.h b/interface/src/scripting/PerformanceScriptingInterface.h index 3dbcd620fa..c416b23b56 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.h +++ b/interface/src/scripting/PerformanceScriptingInterface.h @@ -27,6 +27,7 @@ public: LOW = PerformanceManager::PerformancePreset::LOW, MID = PerformanceManager::PerformancePreset::MID, HIGH = PerformanceManager::PerformancePreset::HIGH, + UNKNOWN = PerformanceManager::PerformancePreset::UNKNOWN, }; Q_ENUM(PerformancePreset) From 4e2480d032321f905f84908f3b36e8dfa0392871 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 31 May 2019 00:00:44 -0700 Subject: [PATCH 005/100] cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier --- .../src/scripting/PerformanceScriptingInterface.cpp | 4 ++-- .../src/scripting/PerformanceScriptingInterface.h | 2 +- .../src/scripting/PlatformInfoScriptingInterface.h | 8 ++++---- interface/src/scripting/RenderScriptingInterface.cpp | 9 ++++++--- interface/src/scripting/RenderScriptingInterface.h | 11 +++++++---- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp index a571e305d9..81f1fcd3ad 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.cpp +++ b/interface/src/scripting/PerformanceScriptingInterface.cpp @@ -28,7 +28,7 @@ PerformanceScriptingInterface::PerformancePreset PerformanceScriptingInterface:: } QStringList PerformanceScriptingInterface::getPerformancePresetNames() const { - static const QStringList performancePresetNames = { "Unknown", "Low", "Mid", "High" }; + static const QStringList performancePresetNames = { "UNKNOWN", "LOW", "MID", "HIGH" }; return performancePresetNames; } @@ -41,7 +41,7 @@ PerformanceScriptingInterface::RefreshRateProfile PerformanceScriptingInterface: } QStringList PerformanceScriptingInterface::getRefreshRateProfileNames() const { - static const QStringList refreshRateProfileNames = { "Eco", "Interactive", "Realtime" }; + static const QStringList refreshRateProfileNames = { "ECO", "INTERACTIVE", "REALTIME" }; return refreshRateProfileNames; } diff --git a/interface/src/scripting/PerformanceScriptingInterface.h b/interface/src/scripting/PerformanceScriptingInterface.h index c416b23b56..bf76261691 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.h +++ b/interface/src/scripting/PerformanceScriptingInterface.h @@ -24,10 +24,10 @@ public: // PerformanceManager PerformancePreset tri state level enums enum PerformancePreset { + UNKNOWN = PerformanceManager::PerformancePreset::UNKNOWN, LOW = PerformanceManager::PerformancePreset::LOW, MID = PerformanceManager::PerformancePreset::MID, HIGH = PerformanceManager::PerformancePreset::HIGH, - UNKNOWN = PerformanceManager::PerformancePreset::UNKNOWN, }; Q_ENUM(PerformancePreset) diff --git a/interface/src/scripting/PlatformInfoScriptingInterface.h b/interface/src/scripting/PlatformInfoScriptingInterface.h index 0ca9dbff1a..476c5c5788 100644 --- a/interface/src/scripting/PlatformInfoScriptingInterface.h +++ b/interface/src/scripting/PlatformInfoScriptingInterface.h @@ -186,8 +186,8 @@ public slots: /**jsdoc * Get the Platform TIer profiled on startup of the Computer - * Platform Tier is an ineger/enum value: - * LOW = 0, MID = 1, HIGH = 2 + * Platform Tier is an integer/enum value: + * UNKNOWN = 0, LOW = 1, MID = 2, HIGH = 3 * @function PlatformInfo.getTierProfiled * @returns {number} The Platform Tier profiled on startup. */ @@ -195,8 +195,8 @@ public slots: /**jsdoc * Get the Platform Tier possible Names as an array of strings - * Platform Tier is an ineger/enum value: - * LOW = 0, MID = 1, HIGH = 2 + * Platform Tier names are: + * [ "UNKNOWN", "LOW", "MID", "HIGH" ] * @function PlatformInfo.getPlatformTierNames * @returns {string} The array of names matching the number returned from PlatformInfo.getTierProfiled */ diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 085606179d..3d761a2bb7 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -10,8 +10,6 @@ #include "LightingModel.h" #include "AntialiasingEffect.h" -const QString DEFERRED = "deferred"; -const QString FORWARD = "forward"; RenderScriptingInterface* RenderScriptingInterface::getInstance() { static RenderScriptingInterface sharedInstance; @@ -45,11 +43,12 @@ void RenderScriptingInterface::setRenderMethod(RenderScriptingInterface::RenderM _renderMethodSetting.set(newMethod); config->setBranch(newMethod); emit config->dirtyEnabled(); + emit settingsChanged(); } } QStringList RenderScriptingInterface::getRenderMethodNames() const { - static const QStringList refrenderMethodNames = { "Deferred", "Forward" }; + static const QStringList refrenderMethodNames = { "DEFERRED", "FORWARD" }; return refrenderMethodNames; } @@ -72,6 +71,7 @@ void RenderScriptingInterface::setShadowsEnabled(bool enabled) { Menu::getInstance()->setIsOptionChecked(MenuOption::Shadows, enabled); _shadowsEnabledSetting.set(enabled); lightingModelConfig->setShadow(enabled); + emit settingsChanged(); } } @@ -94,6 +94,7 @@ void RenderScriptingInterface::setAmbientOcclusionEnabled(bool enabled) { Menu::getInstance()->setIsOptionChecked(MenuOption::AmbientOcclusion, enabled); _ambientOcclusionEnabledSetting.set(enabled); lightingModelConfig->setAmbientOcclusion(enabled); + emit settingsChanged(); } } @@ -123,5 +124,7 @@ void RenderScriptingInterface::setAntialiasingEnabled(bool enabled) { mainViewJitterCamConfig->none(); mainViewAntialiasingConfig->setDebugFXAA(true); } + + emit settingsChanged(); } } diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index 16608a7cb4..e2ae8bbff5 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -25,10 +25,10 @@ */ class RenderScriptingInterface : public QObject { Q_OBJECT - Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod) - Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled) - Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled) - Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled) + Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod NOTIFY settingsChanged) + Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled NOTIFY settingsChanged) + Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled NOTIFY settingsChanged) + Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled NOTIFY settingsChanged) public: RenderScriptingInterface(); @@ -132,6 +132,9 @@ public slots: */ // void setViewportResolutionScale(float resolutionScale); +signals: + void settingsChanged(); + private: Setting::Handle _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; Setting::Handle _shadowsEnabledSetting { "shadowsEnabled", true }; From de6e1d0217dedd6c9eb58a68d7ce624cf48210ab Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Fri, 31 May 2019 13:05:33 -0700 Subject: [PATCH 006/100] additional debug logging for microdisconnects --- .../networking/src/SequenceNumberStats.cpp | 4 ++-- libraries/networking/src/udt/Socket.cpp | 21 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/libraries/networking/src/SequenceNumberStats.cpp b/libraries/networking/src/SequenceNumberStats.cpp index a451701502..fed6942974 100644 --- a/libraries/networking/src/SequenceNumberStats.cpp +++ b/libraries/networking/src/SequenceNumberStats.cpp @@ -89,7 +89,7 @@ SequenceNumberStats::ArrivalInfo SequenceNumberStats::sequenceNumberReceived(qui } else if (absGap > MAX_REASONABLE_SEQUENCE_GAP) { arrivalInfo._status = Unreasonable; - HIFI_FCDEBUG(networking(), "unreasonable sequence number:" << incoming << "previous:" << _lastReceivedSequence); + qCDebug(networking) << "unreasonable sequence number:" << incoming << "previous:" << _lastReceivedSequence; _stats._unreasonable++; @@ -153,7 +153,7 @@ SequenceNumberStats::ArrivalInfo SequenceNumberStats::sequenceNumberReceived(qui arrivalInfo._status = Unreasonable; - HIFI_FCDEBUG(networking(), "unreasonable sequence number:" << incoming << "(possible duplicate)"); + qCDebug(networking) << "unreasonable sequence number:" << incoming << "(possible duplicate)"; _stats._unreasonable++; diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 6f93281b2a..b9bc0bc5f5 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -162,16 +162,16 @@ qint64 Socket::writePacket(std::unique_ptr packet, const HifiSockAddr& s } qint64 Socket::writePacketList(std::unique_ptr packetList, const HifiSockAddr& sockAddr) { + + if (packetList->getNumPackets() == 0) { + qCWarning(networking) << "Trying to send packet list with 0 packets, bailing."; + return 0; + } + if (packetList->isReliable()) { // hand this packetList off to writeReliablePacketList // because Qt can't invoke with the unique_ptr we have to release it here and re-construct in writeReliablePacketList - if (packetList->getNumPackets() == 0) { - qCWarning(networking) << "Trying to send packet list with 0 packets, bailing."; - return 0; - } - - if (QThread::currentThread() != thread()) { auto ptr = packetList.release(); QMetaObject::invokeMethod(this, "writeReliablePacketList", Qt::AutoConnection, @@ -189,7 +189,6 @@ qint64 Socket::writePacketList(std::unique_ptr packetList, const Hif while (!packetList->_packets.empty()) { totalBytesSent += writePacket(packetList->takeFront(), sockAddr); } - return totalBytesSent; } @@ -228,7 +227,7 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc if (bytesWritten < 0) { // when saturating a link this isn't an uncommon message - suppress it so it doesn't bomb the debug - HIFI_FCDEBUG(networking(), "Socket::writeDatagram" << _udpSocket.error()); + qCDebug(networking) << "Socket::writeDatagram : " << sockAddr << " " << _udpSocket.error(); } return bytesWritten; @@ -242,10 +241,8 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi if (filterCreate && _connectionCreationFilterOperator && !_connectionCreationFilterOperator(sockAddr)) { // the connection creation filter did not allow us to create a new connection -#ifdef UDT_CONNECTION_DEBUG qCDebug(networking) << "Socket::findOrCreateConnection refusing to create connection for" << sockAddr << "due to connection creation filter"; -#endif return nullptr; } else { auto congestionControl = _ccFactory->create(); @@ -259,9 +256,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi QObject::connect(connection.get(), &Connection::receiverHandshakeRequestComplete, this, &Socket::clientHandshakeRequestComplete); -#ifdef UDT_CONNECTION_DEBUG qCDebug(networking) << "Creating new connection to" << sockAddr; -#endif it = _connectionsHash.insert(it, std::make_pair(sockAddr, std::move(connection))); } @@ -489,7 +484,7 @@ std::vector Socket::getConnectionSockAddrs() { } void Socket::handleSocketError(QAbstractSocket::SocketError socketError) { - HIFI_FCDEBUG(networking(), "udt::Socket error - " << socketError); + qCDebug(networking) << "udt::Socket error - " << socketError; } void Socket::handleStateChanged(QAbstractSocket::SocketState socketState) { From c568e7c6da35df3c1e4f94b253928cfb57f5d602 Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Fri, 31 May 2019 13:57:25 -0700 Subject: [PATCH 007/100] remove spammy logging --- libraries/networking/src/udt/Socket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index b9bc0bc5f5..524f7edf72 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -241,8 +241,10 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool fi if (filterCreate && _connectionCreationFilterOperator && !_connectionCreationFilterOperator(sockAddr)) { // the connection creation filter did not allow us to create a new connection +#ifdef UDT_CONNECTION_DEBUG qCDebug(networking) << "Socket::findOrCreateConnection refusing to create connection for" << sockAddr << "due to connection creation filter"; +#endif // UDT_CONNECTION_DEBUG return nullptr; } else { auto congestionControl = _ccFactory->create(); From 54d1705f06a3b95b93ebe0470e021d92faab05ca Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 31 May 2019 18:42:26 -0700 Subject: [PATCH 008/100] Testing a different approach --- interface/src/Application.cpp | 22 ++--------- interface/src/PerformanceManager.cpp | 26 ++++++++++++- interface/src/PerformanceManager.h | 6 ++- .../scripting/RenderScriptingInterface.cpp | 37 ++++++++++--------- .../src/scripting/RenderScriptingInterface.h | 17 ++++++--- 5 files changed, 64 insertions(+), 44 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ae226598d1..b8a9df72d6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5361,25 +5361,9 @@ void Application::loadSettings() { } } - if (_firstRun.get()) { - // If this is our first run, evalute the Platform Tier and assign the matching Performance profile by default. - // A bunch of Performance, Simulation and Render settings will be set to a matching default value from this - - // Here is the mapping between pelatformTIer and performance profile - const std::array platformToPerformancePresetMap = {{ - PerformanceManager::PerformancePreset::MID, // platform::Profiler::UNKNOWN - PerformanceManager::PerformancePreset::LOW, // platform::Profiler::LOW - PerformanceManager::PerformancePreset::MID, // platform::Profiler::MID - PerformanceManager::PerformancePreset::HIGH // platform::Profiler::HIGH - }}; - - // What is our profile? - auto platformTier = platform::Profiler::profilePlatform(); - - // Then let's assign the performance preset setting from it - getPerformanceManager().setPerformancePreset(platformToPerformancePresetMap[platformTier]); - - } + // Setup the PerformanceManager which will enforce the several settings to match the Preset + // On the first run, the Preset is evaluated from the + getPerformanceManager().setupPerformancePresetSettings(_firstRun.get()); // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings // dictated that we should be in first person diff --git a/interface/src/PerformanceManager.cpp b/interface/src/PerformanceManager.cpp index fc601fdf8a..19bfcd41c7 100644 --- a/interface/src/PerformanceManager.cpp +++ b/interface/src/PerformanceManager.cpp @@ -10,10 +10,34 @@ // #include "PerformanceManager.h" +#include + #include "scripting/RenderScriptingInterface.h" PerformanceManager::PerformanceManager() { + setPerformancePreset((PerformancePreset) _performancePresetSetting.get()); +} + +void PerformanceManager::setupPerformancePresetSettings(bool evaluatePlatformTier) { + if (evaluatePlatformTier || (getPerformancePreset() == UNKNOWN)) { + // If evaluatePlatformTier, evalute the Platform Tier and assign the matching Performance profile by default. + // A bunch of Performance, Simulation and Render settings will be set to a matching default value from this + + // Here is the mapping between pelatformTIer and performance profile + const std::array platformToPerformancePresetMap = { { + PerformanceManager::PerformancePreset::MID, // platform::Profiler::UNKNOWN + PerformanceManager::PerformancePreset::LOW, // platform::Profiler::LOW + PerformanceManager::PerformancePreset::MID, // platform::Profiler::MID + PerformanceManager::PerformancePreset::HIGH // platform::Profiler::HIGH + } }; + + // What is our profile? + auto platformTier = platform::Profiler::profilePlatform(); + + // Then let's assign the performance preset setting from it + setPerformancePreset(platformToPerformancePresetMap[platformTier]); + } } void PerformanceManager::setPerformancePreset(PerformanceManager::PerformancePreset preset) { @@ -27,7 +51,7 @@ void PerformanceManager::setPerformancePreset(PerformanceManager::PerformancePre } PerformanceManager::PerformancePreset PerformanceManager::getPerformancePreset() const { - PerformancePreset preset = PerformancePreset::MID; + PerformancePreset preset = PerformancePreset::UNKNOWN; preset = (PerformancePreset) _performancePresetSettingLock.resultWithReadLock([&] { return _performancePresetSetting.get(); diff --git a/interface/src/PerformanceManager.h b/interface/src/PerformanceManager.h index adbc5804b1..2931d1f17b 100644 --- a/interface/src/PerformanceManager.h +++ b/interface/src/PerformanceManager.h @@ -30,12 +30,16 @@ public: PerformanceManager(); ~PerformanceManager() = default; + // Setup the PerformanceManager which will enforce the several settings to match the Preset + // If evaluatePlatformTier is true, the Preset is evaluated from the Platform::Profiler::profilePlatform() + void setupPerformancePresetSettings(bool evaluatePlatformTier); + void setPerformancePreset(PerformancePreset performancePreset); PerformancePreset getPerformancePreset() const; private: mutable ReadWriteLockable _performancePresetSettingLock; - Setting::Handle _performancePresetSetting { "performancePreset", PerformanceManager::PerformancePreset::MID }; + Setting::Handle _performancePresetSetting { "performancePreset", PerformanceManager::PerformancePreset::UNKNOWN }; // The concrete performance preset changes void applyPerformancePreset(PerformanceManager::PerformancePreset performancePreset); diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 3d761a2bb7..af8af131a0 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -10,6 +10,7 @@ #include "LightingModel.h" #include "AntialiasingEffect.h" +std::once_flag RenderScriptingInterface::registry_flag; RenderScriptingInterface* RenderScriptingInterface::getInstance() { static RenderScriptingInterface sharedInstance; @@ -17,32 +18,34 @@ RenderScriptingInterface* RenderScriptingInterface::getInstance() { } RenderScriptingInterface::RenderScriptingInterface() { - setRenderMethod((RenderMethod)_renderMethodSetting.get() == RenderMethod::DEFERRED ? RenderMethod::DEFERRED : RenderMethod::FORWARD); + std::call_once(registry_flag, [] { + qmlRegisterType("RenderEnums", 1, 0, "RenderEnums"); + }); + + setRenderMethod((RenderMethod)_renderMethodSettingLock.resultWithReadLock([&] { + return _renderMethodSetting.get(); + })); setShadowsEnabled(_shadowsEnabledSetting.get()); setAmbientOcclusionEnabled(_ambientOcclusionEnabledSetting.get()); setAntialiasingEnabled(_antialiasingEnabledSetting.get()); } RenderScriptingInterface::RenderMethod RenderScriptingInterface::getRenderMethod() { - return (RenderMethod)_renderMethodSetting.get() == RenderMethod::DEFERRED ? RenderMethod::DEFERRED : RenderMethod::FORWARD; + return (RenderMethod) _renderMethod; } -void RenderScriptingInterface::setRenderMethod(RenderScriptingInterface::RenderMethod renderMethod) { - RenderMethod newMethod = renderMethod == RenderMethod::FORWARD ? RenderMethod::FORWARD : RenderMethod::DEFERRED; - if (_renderMethodSetting.get() == newMethod) { - return; - } +void RenderScriptingInterface::setRenderMethod(RenderMethod renderMethod) { + if (_renderMethod != (int) renderMethod) { + _renderMethodSettingLock.withWriteLock([&] { + _renderMethod = (int)renderMethod; + _renderMethodSetting.set((int)renderMethod); - if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setRenderMethod", Q_ARG(RenderScriptingInterface::RenderMethod, renderMethod)); - return; - } - - auto config = dynamic_cast(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch")); - if (config) { - _renderMethodSetting.set(newMethod); - config->setBranch(newMethod); - emit config->dirtyEnabled(); + auto config = dynamic_cast(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch")); + if (config) { + _renderMethodSetting.set((int)renderMethod); + config->setBranch((int)renderMethod); + } + }); emit settingsChanged(); } } diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index e2ae8bbff5..3a7d2169b4 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -25,10 +25,10 @@ */ class RenderScriptingInterface : public QObject { Q_OBJECT - Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod NOTIFY settingsChanged) - Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled NOTIFY settingsChanged) - Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled NOTIFY settingsChanged) - Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled NOTIFY settingsChanged) + // Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod NOTIFY settingsChanged) + // Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled NOTIFY settingsChanged) + // Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled NOTIFY settingsChanged) + // Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled NOTIFY settingsChanged) public: RenderScriptingInterface(); @@ -36,11 +36,11 @@ public: static RenderScriptingInterface* getInstance(); // RenderMethod enum type - enum RenderMethod { + enum class RenderMethod { DEFERRED = render::Args::RenderMethod::DEFERRED, FORWARD = render::Args::RenderMethod::FORWARD, }; - Q_ENUM(RenderMethod); + Q_ENUM(RenderMethod) public slots: /**jsdoc @@ -136,11 +136,16 @@ signals: void settingsChanged(); private: + int _renderMethod { -1 }; + mutable ReadWriteLockable _renderMethodSettingLock; Setting::Handle _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; + Setting::Handle _shadowsEnabledSetting { "shadowsEnabled", true }; Setting::Handle _ambientOcclusionEnabledSetting { "ambientOcclusionEnabled", false }; Setting::Handle _antialiasingEnabledSetting { "antialiasingEnabled", true }; Setting::Handle _viewportResolutionScaleSetting{ "viewportResolutionScale", 1.0f }; + + static std::once_flag registry_flag; }; #endif // hifi_RenderScriptingInterface_h From 4ea67ad2120ea2dc5df1e14463fd81ef90556e6c Mon Sep 17 00:00:00 2001 From: Ken Cooke Date: Sun, 2 Jun 2019 13:52:49 -0700 Subject: [PATCH 009/100] Updated build of WASAPI audio plugin using Qt 5.12.3, includes Debug/Release symbols --- cmake/externals/wasapi/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/externals/wasapi/CMakeLists.txt b/cmake/externals/wasapi/CMakeLists.txt index 8b3408e3fa..9e22e28f58 100644 --- a/cmake/externals/wasapi/CMakeLists.txt +++ b/cmake/externals/wasapi/CMakeLists.txt @@ -6,8 +6,8 @@ if (WIN32) include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} - URL https://public.highfidelity.com/dependencies/qtaudio_wasapi10.zip - URL_MD5 4f40e49715a420fb67b45b9cee19052c + URL https://public.highfidelity.com/dependencies/qtaudio_wasapi11.zip + URL_MD5 d0eb8489455e7f79d59155535a2c8861 CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" From 3019a132406d1802173d41c066babe67b265ec05 Mon Sep 17 00:00:00 2001 From: raveenajain Date: Mon, 3 Jun 2019 11:35:23 -0700 Subject: [PATCH 010/100] stable point for collision capsules --- libraries/fbx/src/GLTFSerializer.cpp | 38 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index dc5f52f938..dca9e9fefa 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -933,11 +933,20 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& hfmModel.shapeVertices.resize(hfmModel.joints.size()); + // get offset transform from mapping + float unitScaleFactor = 1.0f; + float offsetScale = mapping.value("scale", 1.0f).toFloat() * unitScaleFactor; + glm::quat offsetRotation = glm::quat(glm::radians(glm::vec3(mapping.value("rx").toFloat(), mapping.value("ry").toFloat(), mapping.value("rz").toFloat()))); + hfmModel.offset = glm::translate(glm::mat4(), glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(), mapping.value("tz").toFloat())) * + glm::mat4_cast(offsetRotation) * glm::scale(glm::mat4(), glm::vec3(offsetScale, offsetScale, offsetScale)); + + // Build skeleton std::vector jointInverseBindTransforms; std::vector globalBindTransforms; jointInverseBindTransforms.resize(numNodes); globalBindTransforms.resize(numNodes); + hfmModel.hasSkeletonJoints = !_file.skins.isEmpty(); if (hfmModel.hasSkeletonJoints) { std::vector> inverseBindValues; @@ -1489,6 +1498,20 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } else { mesh.clusterWeights[prevMeshClusterWeightCount + j] = (uint16_t)((float)(UINT16_MAX) + ALMOST_HALF); } + for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; ++clusterIndex) { + ShapeVertices& points = hfmModel.shapeVertices.at(clusterIndex); + glm::vec3 globalMeshScale = extractScale(globalTransforms[nodeIndex]); + const glm::mat4 meshToJoint = glm::scale(glm::mat4(), globalMeshScale) * jointInverseBindTransforms[clusterIndex]; + + const float EXPANSION_WEIGHT_THRESHOLD = 0.25f; + if (mesh.clusterWeights[j] >= EXPANSION_WEIGHT_THRESHOLD) { + // TODO: fix transformed vertices being pushed back + auto& vertex = mesh.vertices[i]; + const glm::mat4 vertexTransform = meshToJoint * (glm::translate(glm::mat4(), vertex)); + glm::vec3 transformedVertex = hfmModel.joints[clusterIndex].translation * (extractTranslation(vertexTransform)); + points.push_back(transformedVertex); + } + } } } @@ -1577,24 +1600,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& } } - for (int clusterIndex = 0; clusterIndex < mesh.clusters.size() - 1; ++clusterIndex) { - ShapeVertices& points = hfmModel.shapeVertices.at(clusterIndex); - // TODO: fix modelTransform value - const glm::mat4 modelTransform = glm::inverse(globalBindTransforms[originalToNewNodeIndexMap[nodeIndex]]) * - globalTransforms[originalToNewNodeIndexMap[clusterIndex]] * glm::mat4(0.1f); - for (glm::vec3 vertex : mesh.vertices) { - glm::vec3 transformedVertex = glm::vec3(modelTransform * glm::vec4(vertex, 1.0f)); - points.push_back(transformedVertex); - } - } - foreach(const glm::vec3& vertex, mesh.vertices) { glm::vec3 transformedVertex = glm::vec3(globalTransforms[nodeIndex] * glm::vec4(vertex, 1.0f)); mesh.meshExtents.addPoint(transformedVertex); hfmModel.meshExtents.addPoint(transformedVertex); - } - - mesh.meshIndex = hfmModel.meshes.size(); + } } // Add epsilon to mesh extents to compensate for planar meshes From a84692281474a72ab92894fc4f90200c6091f624 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Mon, 3 Jun 2019 15:16:27 -0700 Subject: [PATCH 011/100] Updated build guide to include a VCPKG environment variable step and fixed step numbering issues --- BUILD_WIN.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/BUILD_WIN.md b/BUILD_WIN.md index 8f8a64a428..eaeb5aba49 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -34,7 +34,16 @@ If you do not wish to use the Python installation bundled with Visual Studio, yo Download and install the latest version of CMake 3.9. Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.9 Version page](https://cmake.org/files/v3.9/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted. -### Step 5. Running CMake to Generate Build Files + +### Step 3. Create VCPKG environment variable + +* Naviagte to 'Edit the System Environment Variables' Through the start menu. +* Click on 'Environment Variables' +* Select 'New' +* Set "Variable name" to HIFI_VCPKG_BASE +* Set "Variable value" to the same directory you created your build directory in. + +### Step 4. Running CMake to Generate Build Files Run Command Prompt from Start and run the following commands: `cd "%HIFI_DIR%"` @@ -49,21 +58,21 @@ Run `cmake .. -G "Visual Studio 16 2019" -A x64`. Where `%HIFI_DIR%` is the directory for the highfidelity repository. -### Step 6. Making a Build +### Step 5. Making a Build Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio. Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance. -Create another environment variable (see Step #4) +Create another environment variable (see Step #3) * Set "Variable name": `PreferredToolArchitecture` * Set "Variable value": `x64` Run from the menu bar `Build > Build Solution`. -### Step 7. Testing Interface +### Step 6. Testing Interface -Create another environment variable (see Step #4) +Create another environment variable (see Step #3) * Set "Variable name": `_NO_DEBUG_HEAP` * Set "Variable value": `1` @@ -75,11 +84,11 @@ Note: You can also run Interface by launching it from command line or File Explo ## Troubleshooting -For any problems after Step #7, first try this: +For any problems after Step #6, first try this: * Delete your locally cloned copy of the highfidelity repository * Restart your computer * Redownload the [repository](https://github.com/highfidelity/hifi) -* Restart directions from Step #7 +* Restart directions from Step #6 #### CMake gives you the same error message repeatedly after the build fails From 154fd393bac6d3880be9e777ec62304429dc29a3 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 3 Jun 2019 16:08:16 -0700 Subject: [PATCH 012/100] Bug fix for crash in QScriptEngine::reportAdditionalMemoryCost() This fix requires a patch to qt. This build includs a new pre-built Qt 5.12.3 with the patch applied. See tools/qt5-builder/qtscript-crash-fix.patch to see actual patch applied. * Touched bullet3 portfile to create new vckpg hash * New urls for qt assets which include qscript patch hifi_vcpkg.py * Updated tools/qt5-builder/ with qscript patch and README.md directions. https://highfidelity.atlassian.net/browse/BUGZ-46 A qt bug was filed to hopefully get this bug fixed upstream. https://bugreports.qt.io/browse/QTBUG-76176 --- cmake/ports/bullet3/portfile.cmake | 4 +++- hifi_vcpkg.py | 4 ++-- tools/qt-builder/README.md | 16 ++++++++++------ .../qt-builder/patches/qtscript-crash-fix.patch | 16 ++++++++++++++++ .../prepare-windows-symbols-for-backtrace.py | 2 +- 5 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 tools/qt-builder/patches/qtscript-crash-fix.patch diff --git a/cmake/ports/bullet3/portfile.cmake b/cmake/ports/bullet3/portfile.cmake index 1faf7d983b..32713f5a46 100644 --- a/cmake/ports/bullet3/portfile.cmake +++ b/cmake/ports/bullet3/portfile.cmake @@ -1,4 +1,7 @@ +# Updated June 6th, 2019, to force new vckpg hash +# # Common Ambient Variables: +# # CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} @@ -9,7 +12,6 @@ # VCPKG_ROOT_DIR = # VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) # -# include(vcpkg_common_functions) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 3ae3a926b5..686ccfcfc7 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -254,9 +254,9 @@ endif() url = 'NOT DEFINED' if platform.system() == 'Windows': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows2.tar.gz' + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz' elif platform.system() == 'Darwin': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos2.tar.gz' + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos3.tar.gz' elif platform.system() == 'Linux': if platform.linux_distribution()[1][:3] == '16.': url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04.tar.gz' diff --git a/tools/qt-builder/README.md b/tools/qt-builder/README.md index 5b4084e61e..956dda4534 100644 --- a/tools/qt-builder/README.md +++ b/tools/qt-builder/README.md @@ -1,7 +1,8 @@ # General This document describes the process to build Qt 5.12.3. -Note that there are two patches. The first (to qfloat16.h) is needed to compile QT 5.12.3 on Visual Studio 2017 due to a bug in Visual Studio (*bitset* will not compile. Note that there is a change in CMakeLists.txt to support this. +Note that there are three patches. The first (to qfloat16.h) is needed to compile QT 5.12.3 on Visual Studio 2017 due to a bug in Visual Studio (*bitset* will not compile. Note that there is a change in CMakeLists.txt to support this. The second patch is to OpenSL ES audio. +The third is a patch to QScriptEngine to prevent crashes in QScriptEnginePrivate::reportAdditionalMemoryCost, during garbage collection. See https://bugreports.qt.io/browse/QTBUG-76176 ## Requirements ### Windows 1. Visual Studio 2017 @@ -125,11 +126,12 @@ Also, make sure the directory that you are using to build qt is not deeply neste * Copy the **patches** folder to qt5 * Copy the **qt5vars.bat** file to qt5 -* Apply the two patches to Qt +* Apply the patches to Qt `cd qt5` `git apply --ignore-space-change --ignore-whitespace patches/qfloat16.patch` `git apply --ignore-space-change --ignore-whitespace patches/aec.patch` +`git apply --ignore-space-change --ignore-whitespace patches/qtscript-crash-fix.patch` `cd ..` #### Configuring `mkdir qt5-install` @@ -151,8 +153,8 @@ The *.prl* files have an absolute path that needs to be removed (see http://www. `find . -name \*.prl -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;` 1. Copy *qt.conf* to *qt5-install\bin* #### Uploading -Create a tar file called qt5-install-5.12.3-windows.tar.gz from the qt5-install folder -Upload qt5-install-5.12.3-windows.tar.gz to our Amazon S3 hifi-public bucket, under the dependencies/vckpg directory +Create a tar file called qt5-install-5.12.3-windows.tar.gz from the qt5-install folder. +Upload qt5-install-5.12.3-windows.tar.gz to our Amazon S3 hifi-public bucket, under the dependencies/vckpg directory. Update hifi_vcpkg.py to use this new URL. Additionally, you should make a small change to any file in the hifi/cmake/ports directory to force the re-download of the qt-install.tar.gz during the build process for hifi. #### Preparing Symbols Run `python3 prepare-windows-symbols-for-backtrace.py qt5-install` to scan the qt5-install directory for any dlls and pdbs. After running this command the backtrace directory will be created. Zip this directory up, but make sure that all dlls and pdbs are in the root of the zip file, not under a sub-directory. This file can then be uploaded to backtrace here: https://highfidelity.sp.backtrace.io/p/Interface/settings/symbol/upload @@ -161,9 +163,10 @@ Run `python3 prepare-windows-symbols-for-backtrace.py qt5-install` to scan the q `git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch` * Copy the **patches** folder to qt5 -* Apply one patch to Qt +* Apply patches to Qt `cd qt5` `git apply --ignore-space-change --ignore-whitespace patches/aec.patch` +`git apply --ignore-space-change --ignore-whitespace patches/qtscript-crash-fix.patch` `cd ..` #### Configuring `mkdir qt5-install` @@ -215,9 +218,10 @@ Run `python3 prepare-windows-symbols-for-backtrace.py qt5-install` to scan the q git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch * Copy the **patches** folder to qt5 -* Apply one patch to Qt +* Apply the patches to Qt `cd qt5` `git apply --ignore-space-change --ignore-whitespace patches/aec.patch` +`git apply --ignore-space-change --ignore-whitespace patches/qtscript-crash-fix.patch` `cd ..` #### Configuring `mkdir qt5-install` diff --git a/tools/qt-builder/patches/qtscript-crash-fix.patch b/tools/qt-builder/patches/qtscript-crash-fix.patch new file mode 100644 index 0000000000..0a659fe9e3 --- /dev/null +++ b/tools/qt-builder/patches/qtscript-crash-fix.patch @@ -0,0 +1,16 @@ +diff --git a/qtscript/src/script/api/qscriptengine.cpp b/qtscript/src/script/api/qscriptengine.cpp +index c5f437b..942833e 100644 +--- a/qtscript/src/script/api/qscriptengine.cpp ++++ b/qtscript/src/script/api/qscriptengine.cpp +@@ -1332,8 +1332,10 @@ void QScriptEnginePrivate::collectGarbage() + + void QScriptEnginePrivate::reportAdditionalMemoryCost(int size) + { +- if (size > 0) ++ if (size > 0) { ++ QScript::APIShim shim(this); + globalData->heap.reportExtraMemoryCost(size); ++ } + } + + QScript::TimeoutCheckerProxy *QScriptEnginePrivate::timeoutChecker() const diff --git a/tools/qt-builder/prepare-windows-symbols-for-backtrace.py b/tools/qt-builder/prepare-windows-symbols-for-backtrace.py index 5738907a2d..9028c50e4f 100644 --- a/tools/qt-builder/prepare-windows-symbols-for-backtrace.py +++ b/tools/qt-builder/prepare-windows-symbols-for-backtrace.py @@ -4,7 +4,7 @@ # usage # python prepare-windows-symbols-for-backrace.py QT_INSTALL_DIR # -# QT_BUILD_DIR should be the directory where qt is installed after running `jom install` or `nmake install` +# QT_INSTALL_DIR should be the directory where qt is installed after running `jom install` or `nmake install` # see hifi/tools/qt-builder/README.md for more info # From 2a4d0cfaece3aeaf0e1a27a0bb1c9502bc7bee91 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Mon, 3 Jun 2019 18:06:28 -0700 Subject: [PATCH 013/100] Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset --- interface/src/Application.cpp | 4 + interface/src/PerformanceManager.cpp | 2 +- .../PerformanceScriptingInterface.cpp | 2 + .../scripting/PerformanceScriptingInterface.h | 6 + .../scripting/RenderScriptingInterface.cpp | 154 ++++++++++-------- .../src/scripting/RenderScriptingInterface.h | 34 +++- .../utilities/lib/jet/qml/TaskPropView.qml | 7 +- .../developer/utilities/lib/prop/PropEnum.qml | 2 +- .../utilities/lib/prop/style/Global.qml | 1 + .../utilities/lib/prop/style/PiCanvasIcon.qml | 22 ++- .../utilities/lib/prop/style/PiCheckBox.qml | 46 +++++- .../utilities/lib/prop/style/PiComboBox.qml | 15 +- .../lib/prop/style/PiFolderPanel.qml | 7 +- .../render/luci/PerformanceSettings.qml | 11 +- .../utilities/render/luci/Platform.qml | 3 +- .../utilities/render/performanceSetup.qml | 53 +++--- 16 files changed, 232 insertions(+), 137 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d1b3d46dfc..34af465485 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5375,6 +5375,10 @@ void Application::loadSettings() { } } + // Load settings of the RenderScritpingInterface + // Do that explicitely before being used + RenderScriptingInterface::getInstance()->loadSettings(); + // Setup the PerformanceManager which will enforce the several settings to match the Preset // On the first run, the Preset is evaluated from the getPerformanceManager().setupPerformancePresetSettings(_firstRun.get()); diff --git a/interface/src/PerformanceManager.cpp b/interface/src/PerformanceManager.cpp index 19bfcd41c7..e7591e8b57 100644 --- a/interface/src/PerformanceManager.cpp +++ b/interface/src/PerformanceManager.cpp @@ -66,7 +66,7 @@ void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformanceP case PerformancePreset::HIGH: RenderScriptingInterface::getInstance()->setRenderMethod(RenderScriptingInterface::RenderMethod::DEFERRED); RenderScriptingInterface::getInstance()->setShadowsEnabled(true); - qApp->getRefreshRateManager().setRefreshRateProfile(RefreshRateManager::RefreshRateProfile::INTERACTIVE); + qApp->getRefreshRateManager().setRefreshRateProfile(RefreshRateManager::RefreshRateProfile::REALTIME); break; case PerformancePreset::MID: diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp index bdd0dd2451..33ad9a3f95 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.cpp +++ b/interface/src/scripting/PerformanceScriptingInterface.cpp @@ -21,6 +21,7 @@ PerformanceScriptingInterface::PerformanceScriptingInterface() { void PerformanceScriptingInterface::setPerformancePreset(PerformancePreset performancePreset) { qApp->getPerformanceManager().setPerformancePreset((PerformanceManager::PerformancePreset)performancePreset); + emit settingsChanged(); } PerformanceScriptingInterface::PerformancePreset PerformanceScriptingInterface::getPerformancePreset() const { @@ -34,6 +35,7 @@ QStringList PerformanceScriptingInterface::getPerformancePresetNames() const { void PerformanceScriptingInterface::setRefreshRateProfile(RefreshRateProfile refreshRateProfile) { qApp->getRefreshRateManager().setRefreshRateProfile((RefreshRateManager::RefreshRateProfile)refreshRateProfile); + emit settingsChanged(); } PerformanceScriptingInterface::RefreshRateProfile PerformanceScriptingInterface::getRefreshRateProfile() const { diff --git a/interface/src/scripting/PerformanceScriptingInterface.h b/interface/src/scripting/PerformanceScriptingInterface.h index bf76261691..92d4273dfb 100644 --- a/interface/src/scripting/PerformanceScriptingInterface.h +++ b/interface/src/scripting/PerformanceScriptingInterface.h @@ -20,6 +20,9 @@ class PerformanceScriptingInterface : public QObject { Q_OBJECT + Q_PROPERTY(PerformancePreset performancePreset READ getPerformancePreset WRITE setPerformancePreset NOTIFY settingsChanged) + Q_PROPERTY(RefreshRateProfile refreshRateProfile READ getRefreshRateProfile WRITE setRefreshRateProfile NOTIFY settingsChanged) + public: // PerformanceManager PerformancePreset tri state level enums @@ -56,6 +59,9 @@ public slots: RefreshRateManager::UXMode getUXMode() const; RefreshRateManager::RefreshRateRegime getRefreshRateRegime() const; +signals: + void settingsChanged(); + private: static std::once_flag registry_flag; }; diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index af8af131a0..4418ff6e46 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -21,34 +21,43 @@ RenderScriptingInterface::RenderScriptingInterface() { std::call_once(registry_flag, [] { qmlRegisterType("RenderEnums", 1, 0, "RenderEnums"); }); +} - setRenderMethod((RenderMethod)_renderMethodSettingLock.resultWithReadLock([&] { - return _renderMethodSetting.get(); - })); - setShadowsEnabled(_shadowsEnabledSetting.get()); - setAmbientOcclusionEnabled(_ambientOcclusionEnabledSetting.get()); - setAntialiasingEnabled(_antialiasingEnabledSetting.get()); +void RenderScriptingInterface::loadSettings() { + _renderSettingLock.withReadLock([&] { + _renderMethod.store(_renderMethodSetting.get()); + _shadowsEnabled.store(_shadowsEnabledSetting.get()); + _ambientOcclusionEnabled.store(_ambientOcclusionEnabledSetting.get()); + _antialiasingEnabled.store(_antialiasingEnabledSetting.get()); + }); + forceRenderMethod((RenderMethod)_renderMethod.load()); + forceShadowsEnabled(_shadowsEnabled.load()); + forceAmbientOcclusionEnabled(_ambientOcclusionEnabled.load()); + forceAntialiasingEnabled(_antialiasingEnabled.load()); } RenderScriptingInterface::RenderMethod RenderScriptingInterface::getRenderMethod() { - return (RenderMethod) _renderMethod; + return (RenderMethod) _renderMethod.load(); } void RenderScriptingInterface::setRenderMethod(RenderMethod renderMethod) { if (_renderMethod != (int) renderMethod) { - _renderMethodSettingLock.withWriteLock([&] { - _renderMethod = (int)renderMethod; - _renderMethodSetting.set((int)renderMethod); - - auto config = dynamic_cast(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch")); - if (config) { - _renderMethodSetting.set((int)renderMethod); - config->setBranch((int)renderMethod); - } - }); + forceRenderMethod(renderMethod); emit settingsChanged(); } } +void RenderScriptingInterface::forceRenderMethod(RenderMethod renderMethod) { + _renderSettingLock.withWriteLock([&] { + _renderMethod = (int)renderMethod; + _renderMethodSetting.set((int)renderMethod); + + auto config = dynamic_cast(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch")); + if (config) { + _renderMethodSetting.set((int)renderMethod); + config->setBranch((int)renderMethod); + } + }); +} QStringList RenderScriptingInterface::getRenderMethodNames() const { static const QStringList refrenderMethodNames = { "DEFERRED", "FORWARD" }; @@ -56,78 +65,83 @@ QStringList RenderScriptingInterface::getRenderMethodNames() const { } bool RenderScriptingInterface::getShadowsEnabled() { - return _shadowsEnabledSetting.get(); + return _shadowsEnabled.load(); } void RenderScriptingInterface::setShadowsEnabled(bool enabled) { - if (_shadowsEnabledSetting.get() == enabled) { - return; - } - - if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setShadowsEnabled", Q_ARG(bool, enabled)); - return; - } - - auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); - if (lightingModelConfig) { - Menu::getInstance()->setIsOptionChecked(MenuOption::Shadows, enabled); - _shadowsEnabledSetting.set(enabled); - lightingModelConfig->setShadow(enabled); + if (_shadowsEnabled != enabled) { + forceShadowsEnabled(enabled); emit settingsChanged(); } } +void RenderScriptingInterface::forceShadowsEnabled(bool enabled) { + _renderSettingLock.withWriteLock([&] { + _shadowsEnabled.store(enabled); + _shadowsEnabledSetting.set(enabled); + + auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); + if (lightingModelConfig) { + Menu::getInstance()->setIsOptionChecked(MenuOption::Shadows, enabled); + lightingModelConfig->setShadow(enabled); + } + }); +} + bool RenderScriptingInterface::getAmbientOcclusionEnabled() { - return _ambientOcclusionEnabledSetting.get(); + return _ambientOcclusionEnabled.load(); } void RenderScriptingInterface::setAmbientOcclusionEnabled(bool enabled) { - if (_ambientOcclusionEnabledSetting.get() == enabled) { - return; - } - - if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setAmbientOcclusionEnabled", Q_ARG(bool, enabled)); - return; - } - - auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); - if (lightingModelConfig) { - Menu::getInstance()->setIsOptionChecked(MenuOption::AmbientOcclusion, enabled); - _ambientOcclusionEnabledSetting.set(enabled); - lightingModelConfig->setAmbientOcclusion(enabled); + if (_ambientOcclusionEnabled.load() != enabled) { + forceAmbientOcclusionEnabled(enabled); emit settingsChanged(); } } +void RenderScriptingInterface::forceAmbientOcclusionEnabled(bool enabled) { + _renderSettingLock.withWriteLock([&] { + _ambientOcclusionEnabled.store(enabled); + _ambientOcclusionEnabledSetting.set(enabled); + + auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); + if (lightingModelConfig) { + Menu::getInstance()->setIsOptionChecked(MenuOption::AmbientOcclusion, enabled); + lightingModelConfig->setAmbientOcclusion(enabled); + } + }); +} + bool RenderScriptingInterface::getAntialiasingEnabled() { - return _antialiasingEnabledSetting.get(); + return _antialiasingEnabled.load(); } void RenderScriptingInterface::setAntialiasingEnabled(bool enabled) { - if (_antialiasingEnabledSetting.get() == enabled) { - return; - } - - if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setAntialiasingEnabled", Q_ARG(bool, enabled)); - return; - } - - auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.JitterCam"); - auto mainViewAntialiasingConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.Antialiasing"); - if (mainViewJitterCamConfig && mainViewAntialiasingConfig) { - Menu::getInstance()->setIsOptionChecked(MenuOption::AntiAliasing, enabled); - _antialiasingEnabledSetting.set(enabled); - if (enabled) { - mainViewJitterCamConfig->play(); - mainViewAntialiasingConfig->setDebugFXAA(false); - } else { - mainViewJitterCamConfig->none(); - mainViewAntialiasingConfig->setDebugFXAA(true); - } - + if (_antialiasingEnabled.load() != enabled) { + forceAntialiasingEnabled(enabled); emit settingsChanged(); } } + +void RenderScriptingInterface::forceAntialiasingEnabled(bool enabled) { + _renderSettingLock.withWriteLock([&] { + _antialiasingEnabled.store(enabled); + _antialiasingEnabledSetting.set(enabled); + + auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.JitterCam"); + auto mainViewAntialiasingConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.Antialiasing"); + if (mainViewJitterCamConfig && mainViewAntialiasingConfig) { + Menu::getInstance()->setIsOptionChecked(MenuOption::AntiAliasing, enabled); + if (enabled) { + mainViewJitterCamConfig->play(); + mainViewAntialiasingConfig->setDebugFXAA(false); + } + else { + mainViewJitterCamConfig->none(); + mainViewAntialiasingConfig->setDebugFXAA(true); + } + } + }); +} + + diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index 3a7d2169b4..abfff67f20 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -25,10 +25,10 @@ */ class RenderScriptingInterface : public QObject { Q_OBJECT - // Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod NOTIFY settingsChanged) - // Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled NOTIFY settingsChanged) - // Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled NOTIFY settingsChanged) - // Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled NOTIFY settingsChanged) + Q_PROPERTY(RenderMethod renderMethod READ getRenderMethod WRITE setRenderMethod NOTIFY settingsChanged) + Q_PROPERTY(bool shadowsEnabled READ getShadowsEnabled WRITE setShadowsEnabled NOTIFY settingsChanged) + Q_PROPERTY(bool ambientOcclusionEnabled READ getAmbientOcclusionEnabled WRITE setAmbientOcclusionEnabled NOTIFY settingsChanged) + Q_PROPERTY(bool antialiasingEnabled READ getAntialiasingEnabled WRITE setAntialiasingEnabled NOTIFY settingsChanged) public: RenderScriptingInterface(); @@ -42,6 +42,12 @@ public: }; Q_ENUM(RenderMethod) + + // Load Settings + // Synchronize the runtime value to the actual setting + // Need to be called on start up to re-initialize the runtime to the saved setting states + void loadSettings(); + public slots: /**jsdoc * Get a config for a job by name @@ -136,14 +142,26 @@ signals: void settingsChanged(); private: - int _renderMethod { -1 }; - mutable ReadWriteLockable _renderMethodSettingLock; - Setting::Handle _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; + // One lock to serialize and access safely all the settings + mutable ReadWriteLockable _renderSettingLock; + // Runtime atomic value of each settings + std::atomic_int _renderMethod{ render::Args::RenderMethod::DEFERRED }; + std::atomic_bool _shadowsEnabled{ true }; + std::atomic_bool _ambientOcclusionEnabled{ false }; + std::atomic_bool _antialiasingEnabled { true }; + + // Actual settings saved on disk + Setting::Handle _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; Setting::Handle _shadowsEnabledSetting { "shadowsEnabled", true }; Setting::Handle _ambientOcclusionEnabledSetting { "ambientOcclusionEnabled", false }; Setting::Handle _antialiasingEnabledSetting { "antialiasingEnabled", true }; - Setting::Handle _viewportResolutionScaleSetting{ "viewportResolutionScale", 1.0f }; + + // Force assign both setting AND runtime value to the parameter value + void forceRenderMethod(RenderMethod renderMethod); + void forceShadowsEnabled(bool enabled); + void forceAmbientOcclusionEnabled(bool enabled); + void forceAntialiasingEnabled(bool enabled); static std::once_flag registry_flag; }; diff --git a/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml b/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml index 165edcf2e1..0dd978be63 100644 --- a/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml +++ b/scripts/developer/utilities/lib/jet/qml/TaskPropView.qml @@ -75,7 +75,12 @@ Prop.PropGroup { filled: root.jobEnabled fillColor: (root.jobEnabled ? global.colorGreenHighlight : global.colorOrangeAccent) icon: 5 - iconMouseArea.onClicked: { toggleJobActivation() } + + MouseArea{ + id: mousearea + anchors.fill: parent + onClicked: { root.toggleJobActivation() } + } } } diff --git a/scripts/developer/utilities/lib/prop/PropEnum.qml b/scripts/developer/utilities/lib/prop/PropEnum.qml index 87c2845c90..c7869050ba 100644 --- a/scripts/developer/utilities/lib/prop/PropEnum.qml +++ b/scripts/developer/utilities/lib/prop/PropEnum.qml @@ -19,7 +19,7 @@ PropItem { property alias enums : valueCombo.model Component.onCompleted: { - // valueVar = root.valueVarGetter(); + valueVar = root.valueVarGetter(); } PropComboBox { diff --git a/scripts/developer/utilities/lib/prop/style/Global.qml b/scripts/developer/utilities/lib/prop/style/Global.qml index bbc8acfa0b..2330d9876c 100644 --- a/scripts/developer/utilities/lib/prop/style/Global.qml +++ b/scripts/developer/utilities/lib/prop/style/Global.qml @@ -29,6 +29,7 @@ Item { readonly property color colorBackHighlight: hifi.colors.baseGrayHighlight readonly property color colorBorderLight: hifi.colors.lightGray readonly property color colorBorderHighight: hifi.colors.blueHighlight + readonly property color colorBorderLighter: hifi.colors.faintGray readonly property color colorOrangeAccent: "#FF6309" readonly property color colorRedAccent: "#C62147" diff --git a/scripts/developer/utilities/lib/prop/style/PiCanvasIcon.qml b/scripts/developer/utilities/lib/prop/style/PiCanvasIcon.qml index 2fc3ed10ec..985ecfdac6 100644 --- a/scripts/developer/utilities/lib/prop/style/PiCanvasIcon.qml +++ b/scripts/developer/utilities/lib/prop/style/PiCanvasIcon.qml @@ -29,11 +29,19 @@ Canvas { } property var fillColor: global.colorBorderHighight - onFillColorChanged: function () { //console.log("fillColor changed to: " + filled ); + onFillColorChanged: function () { //console.log("fillColor changed to: " + fillColor ); requestPaint() } - property alias iconMouseArea: mousearea + property var stroked: true + onStrokedChanged: function () { //console.log("Stroked changed to: " + stroked ); + requestPaint() + } + + property var strokeColor: global.colorBorderLight + onStrokeColorChanged: function () { //console.log("strokeColor changed to: " + strokeColor ); + requestPaint() + } contextType: "2d" onPaint: { @@ -86,14 +94,10 @@ Canvas { if (filled) { context.fillStyle = fillColor; context.fill(); - } else { - context.strokeStyle = fillColor; + } + if (stroked) { + context.strokeStyle = strokeColor; context.stroke(); } } - - MouseArea{ - id: mousearea - anchors.fill: parent - } } \ No newline at end of file diff --git a/scripts/developer/utilities/lib/prop/style/PiCheckBox.qml b/scripts/developer/utilities/lib/prop/style/PiCheckBox.qml index 1e1f03669b..83d9ebd591 100644 --- a/scripts/developer/utilities/lib/prop/style/PiCheckBox.qml +++ b/scripts/developer/utilities/lib/prop/style/PiCheckBox.qml @@ -9,15 +9,47 @@ // import QtQuick 2.7 -import controlsUit 1.0 as HifiControls +import QtQuick.Controls 2.2 -HifiControls.CheckBox { +CheckBox { Global { id: global } - - color: global.fontColor + id: control + text: "" + checked: true + spacing: 0 - //anchors.left: root.splitter.right - //anchors.verticalCenter: root.verticalCenter - //width: root.width * global.valueAreaWidthScale + indicator: Rectangle { + color: global.colorBack + border.color: control.down ? global.colorBorderLighter : global.colorBorderLight + border.width: global.valueBorderWidth + radius: global.valueBorderRadius / 2 + + anchors.left: parent.left + anchors.verticalCenter: parent.verticalCenter + implicitWidth: global.iconWidth + implicitHeight: global.iconWidth + + Rectangle { + visible: control.checked + + color: global.colorBorderHighight + radius: global.valueBorderRadius / 4 + + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + + implicitWidth: global.iconWidth - 2 + implicitHeight: global.iconHeight - 2 + } + } + + contentItem: PiText { + text: control.text + anchors.verticalCenter: parent.verticalCenter + horizontalAlignment: Text.AlignHLeft + anchors.left: control.indicator.right + leftPadding: global.horizontalMargin + } + height: global.slimHeight } \ No newline at end of file diff --git a/scripts/developer/utilities/lib/prop/style/PiComboBox.qml b/scripts/developer/utilities/lib/prop/style/PiComboBox.qml index d9e029b702..92164fefc5 100644 --- a/scripts/developer/utilities/lib/prop/style/PiComboBox.qml +++ b/scripts/developer/utilities/lib/prop/style/PiComboBox.qml @@ -28,7 +28,7 @@ ComboBox { horizontalAlignment: global.valueTextAlign } background: Rectangle { - color:highlighted?global.colorBackHighlight:global.color; + color:highlighted ? global.colorBackHighlight : global.colorBack; } highlighted: valueCombo.highlightedIndex === index } @@ -38,11 +38,8 @@ ComboBox { x: valueCombo.width - width - valueCombo.rightPadding y: valueCombo.topPadding + (valueCombo.availableHeight - height) / 2 - icon: 1 - /*Connections { - target: valueCombo - onPressedChanged: { canvas.icon = control.down + 1 } - }*/ + strokeColor: (valueCombo.down ? global.colorBorderLighter : global.colorBorderLight ) + icon: 1 + valueCombo.down } contentItem: PiText { @@ -56,8 +53,8 @@ ComboBox { background: Rectangle { implicitWidth: 120 implicitHeight: 40 - color: global.color - border.color: valueCombo.popup.visible ? global.colorBorderHighight : global.colorBorderLight + color: global.colorBack + border.color: valueCombo.popup.visible ? global.colorBorderLighter : global.colorBorderLight border.width: global.valueBorderWidth radius: global.valueBorderRadius } @@ -78,7 +75,7 @@ ComboBox { } background: Rectangle { - color: global.color + color: global.colorBack border.color: global.colorBorderHighight radius: global.valueBorderRadius } diff --git a/scripts/developer/utilities/lib/prop/style/PiFolderPanel.qml b/scripts/developer/utilities/lib/prop/style/PiFolderPanel.qml index d66c0708d3..1f476cab75 100644 --- a/scripts/developer/utilities/lib/prop/style/PiFolderPanel.qml +++ b/scripts/developer/utilities/lib/prop/style/PiFolderPanel.qml @@ -72,7 +72,12 @@ Item { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter fillColor: global.colorOrangeAccent - iconMouseArea.onClicked: { root.isUnfold = !root.isUnfold } + + MouseArea{ + id: mousearea + anchors.fill: parent + onClicked: { root.isUnfold = !root.isUnfold } + } } } diff --git a/scripts/developer/utilities/render/luci/PerformanceSettings.qml b/scripts/developer/utilities/render/luci/PerformanceSettings.qml index 7bb923a25e..ba3ecada9d 100644 --- a/scripts/developer/utilities/render/luci/PerformanceSettings.qml +++ b/scripts/developer/utilities/render/luci/PerformanceSettings.qml @@ -19,7 +19,6 @@ Column { Prop.PropString { label: "Platform Tier" - //object: Performance valueVarSetter: function (v) {} valueVarGetter: function () { return PlatformInfo.getPlatformTierNames()[PlatformInfo.getTierProfiled()]; } @@ -27,17 +26,15 @@ Column { Prop.PropEnum { label: "Performance Preset" - //object: Performance - valueVarSetter: Performance.setPerformancePreset - valueVarGetter: Performance.getPerformancePreset + object: Performance + property: "performancePreset" enums: Performance.getPerformancePresetNames() } Prop.PropEnum { label: "Refresh Rate Profile" - //object: Performance - valueVarSetter: Performance.setRefreshRateProfile - valueVarGetter: Performance.getRefreshRateProfile + object: Performance + property: "refreshRateProfile" enums: Performance.getRefreshRateProfileNames() } } diff --git a/scripts/developer/utilities/render/luci/Platform.qml b/scripts/developer/utilities/render/luci/Platform.qml index 78a32b1749..9c5ffda070 100644 --- a/scripts/developer/utilities/render/luci/Platform.qml +++ b/scripts/developer/utilities/render/luci/Platform.qml @@ -16,7 +16,8 @@ import controlsUit 1.0 as HifiControls import "../../lib/prop" as Prop Column { - width: parent.width + anchors.left: parent.left + anchors.right: parent.right Prop.PropGroup { id: computer diff --git a/scripts/developer/utilities/render/performanceSetup.qml b/scripts/developer/utilities/render/performanceSetup.qml index db7c5619a3..416c074e0f 100644 --- a/scripts/developer/utilities/render/performanceSetup.qml +++ b/scripts/developer/utilities/render/performanceSetup.qml @@ -24,33 +24,42 @@ Rectangle { color: global.colorBack ScrollView { - anchors.fill: parent + anchors.fill: parent clip: true - Column { - anchors.left: parent.left - anchors.right: parent.right + Column { + anchors.left: parent.left + anchors.right: parent.right - Prop.PropFolderPanel { - label: "Performance Settings" - isUnfold: true - panelFrameData: Component { - PerformanceSettings {} + Prop.PropFolderPanel { + label: "Performance Settings" + isUnfold: true + panelFrameData: Component { + PerformanceSettings { + anchors.left: parent.left + anchors.right: parent.right + } + } } - } - Prop.PropFolderPanel { - label: "Render Settings" - isUnfold: true - panelFrameData: Component { - RenderSettings {} + Prop.PropFolderPanel { + label: "Render Settings" + isUnfold: true + panelFrameData: Component { + RenderSettings { + anchors.left: parent.left + anchors.right: parent.right + } + } } + /* Prop.PropFolderPanel { + label: "Platform" + panelFrameData: Component { + Platform { + anchors.left: parent.left + anchors.right: parent.right + } + } + }*/ } - Prop.PropFolderPanel { - label: "Platform" - panelFrameData: Component { - Platform {} - } - } - } } } From c92a68813050df81dd6ccc7db1b4f557336b625d Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Mon, 3 Jun 2019 18:14:49 -0700 Subject: [PATCH 014/100] Don't send AvatarIdentity from mixer if socket not yet active --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 2b0df4a9d6..2174d7ff05 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -365,7 +365,7 @@ void AvatarMixer::manageIdentityData(const SharedNodePointer& node) { // there is no need to manage identity data we haven't received yet // so bail early if we've never received an identity packet for this avatar - if (!nodeData || !nodeData->getAvatar().hasProcessedFirstIdentity()) { + if (!nodeData || !nodeData->getAvatar().hasProcessedFirstIdentity() || !node->getActiveSocket()) { return; } From e1534b34b4baffe3954fcce6814d20dbeeb48578 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 4 Jun 2019 08:56:07 -0700 Subject: [PATCH 015/100] Workaround crash in reportAdditionalMemoryCost other platforms --- libraries/script-engine/src/ArrayBufferClass.cpp | 4 +++- libraries/script-engine/src/ScriptEngine.cpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ArrayBufferClass.cpp b/libraries/script-engine/src/ArrayBufferClass.cpp index f64dbeffd6..6734114932 100644 --- a/libraries/script-engine/src/ArrayBufferClass.cpp +++ b/libraries/script-engine/src/ArrayBufferClass.cpp @@ -76,8 +76,10 @@ QScriptValue ArrayBufferClass::newInstance(qint32 size) { engine()->evaluate("throw \"ArgumentError: absurd length\""); return QScriptValue(); } - + // We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only. +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) engine()->reportAdditionalMemoryCost(size); +#endif QScriptEngine* eng = engine(); QVariant variant = QVariant::fromValue(QByteArray(size, 0)); QScriptValue data = eng->newVariant(variant); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 309161206c..9d29f32931 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1346,7 +1346,10 @@ void ScriptEngine::callAnimationStateHandler(QScriptValue callback, AnimVariantM void ScriptEngine::updateMemoryCost(const qint64& deltaSize) { if (deltaSize > 0) { + // We've patched qt to fix https://highfidelity.atlassian.net/browse/BUGZ-46 on mac and windows only. +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) reportAdditionalMemoryCost(deltaSize); +#endif } } From c09ffd23b40841209a21ef0c0f098d60001c2a12 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Tue, 4 Jun 2019 09:19:47 -0700 Subject: [PATCH 016/100] made more edits to the build guide to better explain the reasons for certain steps and corrected a couple of errors in previous edits --- BUILD_WIN.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/BUILD_WIN.md b/BUILD_WIN.md index eaeb5aba49..04ae6346f7 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -36,12 +36,14 @@ Download and install the latest version of CMake 3.9. Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.9 Version page](https://cmake.org/files/v3.9/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted. ### Step 3. Create VCPKG environment variable +In the next step you will be using CMake to build hifi, but first it is recommended that you create an environment variable linked to a directory somewhere on your machine you have control over. The directory will hold all temporary files and, in the event of a failed build, will ensure that any dependencies that generated prior to the failure will not need to be generated again. +To create this variable: * Naviagte to 'Edit the System Environment Variables' Through the start menu. * Click on 'Environment Variables' * Select 'New' * Set "Variable name" to HIFI_VCPKG_BASE -* Set "Variable value" to the same directory you created your build directory in. +* Set "Variable value" to any directory that you have control over. ### Step 4. Running CMake to Generate Build Files @@ -68,6 +70,8 @@ Create another environment variable (see Step #3) * Set "Variable name": `PreferredToolArchitecture` * Set "Variable value": `x64` +Restart Visual Studio for the new variable to take affect. + Run from the menu bar `Build > Build Solution`. ### Step 6. Testing Interface @@ -76,6 +80,8 @@ Create another environment variable (see Step #3) * Set "Variable name": `_NO_DEBUG_HEAP` * Set "Variable value": `1` +Restart Visual Studio again. + In Visual Studio, right+click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run from the menu bar `Debug > Start Debugging`. Now, you should have a full build of High Fidelity and be able to run the Interface using Visual Studio. Please check our [Docs](https://wiki.highfidelity.com/wiki/Main_Page) for more information regarding the programming workflow. From f51e491d853c806ef052c123df10ca125e7e3e93 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 4 Jun 2019 10:11:12 -0700 Subject: [PATCH 017/100] Removing the atomics and fixing mistakes pointed out inreview --- .../scripting/RenderScriptingInterface.cpp | 38 +++++++++---------- .../src/scripting/RenderScriptingInterface.h | 10 ++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 4418ff6e46..730fef3966 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -10,13 +10,14 @@ #include "LightingModel.h" #include "AntialiasingEffect.h" -std::once_flag RenderScriptingInterface::registry_flag; RenderScriptingInterface* RenderScriptingInterface::getInstance() { static RenderScriptingInterface sharedInstance; return &sharedInstance; } +std::once_flag RenderScriptingInterface::registry_flag; + RenderScriptingInterface::RenderScriptingInterface() { std::call_once(registry_flag, [] { qmlRegisterType("RenderEnums", 1, 0, "RenderEnums"); @@ -25,19 +26,19 @@ RenderScriptingInterface::RenderScriptingInterface() { void RenderScriptingInterface::loadSettings() { _renderSettingLock.withReadLock([&] { - _renderMethod.store(_renderMethodSetting.get()); - _shadowsEnabled.store(_shadowsEnabledSetting.get()); - _ambientOcclusionEnabled.store(_ambientOcclusionEnabledSetting.get()); - _antialiasingEnabled.store(_antialiasingEnabledSetting.get()); + _renderMethod = (_renderMethodSetting.get()); + _shadowsEnabled = (_shadowsEnabledSetting.get()); + _ambientOcclusionEnabled = (_ambientOcclusionEnabledSetting.get()); + _antialiasingEnabled = (_antialiasingEnabledSetting.get()); }); - forceRenderMethod((RenderMethod)_renderMethod.load()); - forceShadowsEnabled(_shadowsEnabled.load()); - forceAmbientOcclusionEnabled(_ambientOcclusionEnabled.load()); - forceAntialiasingEnabled(_antialiasingEnabled.load()); + forceRenderMethod((RenderMethod)_renderMethod); + forceShadowsEnabled(_shadowsEnabled); + forceAmbientOcclusionEnabled(_ambientOcclusionEnabled); + forceAntialiasingEnabled(_antialiasingEnabled); } RenderScriptingInterface::RenderMethod RenderScriptingInterface::getRenderMethod() { - return (RenderMethod) _renderMethod.load(); + return (RenderMethod) _renderMethod; } void RenderScriptingInterface::setRenderMethod(RenderMethod renderMethod) { @@ -53,7 +54,6 @@ void RenderScriptingInterface::forceRenderMethod(RenderMethod renderMethod) { auto config = dynamic_cast(qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.DeferredForwardSwitch")); if (config) { - _renderMethodSetting.set((int)renderMethod); config->setBranch((int)renderMethod); } }); @@ -65,7 +65,7 @@ QStringList RenderScriptingInterface::getRenderMethodNames() const { } bool RenderScriptingInterface::getShadowsEnabled() { - return _shadowsEnabled.load(); + return _shadowsEnabled; } void RenderScriptingInterface::setShadowsEnabled(bool enabled) { @@ -77,7 +77,7 @@ void RenderScriptingInterface::setShadowsEnabled(bool enabled) { void RenderScriptingInterface::forceShadowsEnabled(bool enabled) { _renderSettingLock.withWriteLock([&] { - _shadowsEnabled.store(enabled); + _shadowsEnabled = (enabled); _shadowsEnabledSetting.set(enabled); auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); @@ -89,11 +89,11 @@ void RenderScriptingInterface::forceShadowsEnabled(bool enabled) { } bool RenderScriptingInterface::getAmbientOcclusionEnabled() { - return _ambientOcclusionEnabled.load(); + return _ambientOcclusionEnabled; } void RenderScriptingInterface::setAmbientOcclusionEnabled(bool enabled) { - if (_ambientOcclusionEnabled.load() != enabled) { + if (_ambientOcclusionEnabled != enabled) { forceAmbientOcclusionEnabled(enabled); emit settingsChanged(); } @@ -101,7 +101,7 @@ void RenderScriptingInterface::setAmbientOcclusionEnabled(bool enabled) { void RenderScriptingInterface::forceAmbientOcclusionEnabled(bool enabled) { _renderSettingLock.withWriteLock([&] { - _ambientOcclusionEnabled.store(enabled); + _ambientOcclusionEnabled = (enabled); _ambientOcclusionEnabledSetting.set(enabled); auto lightingModelConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.LightingModel"); @@ -113,11 +113,11 @@ void RenderScriptingInterface::forceAmbientOcclusionEnabled(bool enabled) { } bool RenderScriptingInterface::getAntialiasingEnabled() { - return _antialiasingEnabled.load(); + return _antialiasingEnabled; } void RenderScriptingInterface::setAntialiasingEnabled(bool enabled) { - if (_antialiasingEnabled.load() != enabled) { + if (_antialiasingEnabled != enabled) { forceAntialiasingEnabled(enabled); emit settingsChanged(); } @@ -125,7 +125,7 @@ void RenderScriptingInterface::setAntialiasingEnabled(bool enabled) { void RenderScriptingInterface::forceAntialiasingEnabled(bool enabled) { _renderSettingLock.withWriteLock([&] { - _antialiasingEnabled.store(enabled); + _antialiasingEnabled = (enabled); _antialiasingEnabledSetting.set(enabled); auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig("RenderMainView.JitterCam"); diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index abfff67f20..df2e138b08 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -145,11 +145,11 @@ private: // One lock to serialize and access safely all the settings mutable ReadWriteLockable _renderSettingLock; - // Runtime atomic value of each settings - std::atomic_int _renderMethod{ render::Args::RenderMethod::DEFERRED }; - std::atomic_bool _shadowsEnabled{ true }; - std::atomic_bool _ambientOcclusionEnabled{ false }; - std::atomic_bool _antialiasingEnabled { true }; + // Runtime value of each settings + int _renderMethod{ RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; + bool _shadowsEnabled{ true }; + bool _ambientOcclusionEnabled{ false }; + bool _antialiasingEnabled { true }; // Actual settings saved on disk Setting::Handle _renderMethodSetting { "renderMethod", RENDER_FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED }; From 1c5740e5e83d81e15ef64c8861c56d2d51e70e7e Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Tue, 4 Jun 2019 11:02:09 -0700 Subject: [PATCH 018/100] increased clarity of description for step 3 and fixed typo --- BUILD_WIN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD_WIN.md b/BUILD_WIN.md index 04ae6346f7..965cb70ec6 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -36,7 +36,7 @@ Download and install the latest version of CMake 3.9. Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.9 Version page](https://cmake.org/files/v3.9/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted. ### Step 3. Create VCPKG environment variable -In the next step you will be using CMake to build hifi, but first it is recommended that you create an environment variable linked to a directory somewhere on your machine you have control over. The directory will hold all temporary files and, in the event of a failed build, will ensure that any dependencies that generated prior to the failure will not need to be generated again. +In the next step, you will use CMake to build High Fidelity. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them. To create this variable: * Naviagte to 'Edit the System Environment Variables' Through the start menu. @@ -70,7 +70,7 @@ Create another environment variable (see Step #3) * Set "Variable name": `PreferredToolArchitecture` * Set "Variable value": `x64` -Restart Visual Studio for the new variable to take affect. +Restart Visual Studio for the new variable to take effect. Run from the menu bar `Build > Build Solution`. From 73e3ad7e4ce03c74bbd671feae70f55b86b2fd2e Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Tue, 4 Jun 2019 11:16:36 -0700 Subject: [PATCH 019/100] Monitor traffic from nodes and report if not heard from in over 2 sec Also, remove spammy backup logging. --- domain-server/src/AssetsBackupHandler.cpp | 1 - .../src/DomainContentBackupManager.cpp | 25 ++----------------- domain-server/src/DomainServer.cpp | 17 +++++++++++++ domain-server/src/DomainServer.h | 2 ++ 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp index 6c879aca70..0f63817d80 100644 --- a/domain-server/src/AssetsBackupHandler.cpp +++ b/domain-server/src/AssetsBackupHandler.cpp @@ -276,7 +276,6 @@ void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) { return; } _backups.emplace_back(backupName, mappings, false); - qDebug() << "Created asset backup:" << backupName; } void AssetsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip) { diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp index d81de8b212..52bc7d679f 100644 --- a/domain-server/src/DomainContentBackupManager.cpp +++ b/domain-server/src/DomainContentBackupManager.cpp @@ -466,31 +466,20 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule) { QDir backupDir { _backupDirectory }; if (backupDir.exists() && rule.maxBackupVersions > 0) { - qCDebug(domain_server) << "Rolling old backup versions for rule" << rule.name; auto matchingFiles = backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name); int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions; - if (backupsToDelete <= 0) { - qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, no backups need to be deleted"; - } else { - qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)"; + if (backupsToDelete > 0) { for (int i = 0; i < backupsToDelete; ++i) { auto fileInfo = matchingFiles[i].absoluteFilePath(); QFile backupFile(fileInfo); - if (backupFile.remove()) { - qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName(); - } else { + if (!backupFile.remove()) { qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName(); } } - qCDebug(domain_server) << "Done removing old backup versions"; } - } else { - qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "." - << " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]." - << " No need to roll backups"; } } @@ -501,13 +490,7 @@ void DomainContentBackupManager::backup() { for (BackupRule& rule : _backupRules) { auto secondsSinceLastBackup = nowSeconds - rule.lastBackupSeconds; - qCDebug(domain_server) << "Checking [" << rule.name << "] - Time since last backup [" << secondsSinceLastBackup - << "] " - << "compared to backup interval [" << rule.intervalSeconds << "]..."; - if (secondsSinceLastBackup > rule.intervalSeconds) { - qCDebug(domain_server) << "Time since last backup [" << secondsSinceLastBackup << "] for rule [" << rule.name - << "] exceeds backup interval [" << rule.intervalSeconds << "] doing backup now..."; bool success; QString path; @@ -517,13 +500,9 @@ void DomainContentBackupManager::backup() { continue; } - qDebug() << "Created backup: " << path; - rule.lastBackupSeconds = nowSeconds; removeOldBackupVersions(rule); - } else { - qCDebug(domain_server) << "Backup not needed for this rule [" << rule.name << "]..."; } } } diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 1941ef19b6..e71ea0971c 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -322,6 +322,11 @@ DomainServer::DomainServer(int argc, char* argv[]) : _contentManager->initialize(true); connect(_contentManager.get(), &DomainContentBackupManager::recoveryCompleted, this, &DomainServer::restart); + +static const int NODE_PING_MONITOR_INTERVAL_MSECS = 1 * MSECS_PER_SECOND; + _nodePingMonitorTimer = new QTimer{ this }; + connect(_nodePingMonitorTimer, &QTimer::timeout, this, &DomainServer::nodePingMonitor); + _nodePingMonitorTimer->start(NODE_PING_MONITOR_INTERVAL_MSECS); } void DomainServer::parseCommandLine(int argc, char* argv[]) { @@ -1722,6 +1727,18 @@ void DomainServer::sendHeartbeatToIceServer() { } } +void DomainServer::nodePingMonitor() { + auto nodeList = DependencyManager::get(); + quint64 now = usecTimestampNow(); + + nodeList->eachNode([now](const SharedNodePointer& node) { + quint64 lastHeard = now - node->getLastHeardMicrostamp(); + if (lastHeard > 2 * USECS_PER_SECOND) { + qCDebug(domain_server) << "Haven't heard from " << node->getPublicSocket() << " in " << lastHeard / USECS_PER_MSEC << " msec"; + } + }); +} + void DomainServer::processOctreeDataPersistMessage(QSharedPointer message) { qDebug() << "Received octree data persist message"; auto data = message->readAll(); diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h index 704650e594..36ebe5a234 100644 --- a/domain-server/src/DomainServer.h +++ b/domain-server/src/DomainServer.h @@ -110,6 +110,7 @@ private slots: void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr); void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString()); } void sendHeartbeatToIceServer(); + void nodePingMonitor(); void handleConnectedNode(SharedNodePointer newNode, quint64 requestReceiveTime); void handleTempDomainSuccess(QNetworkReply* requestReply); @@ -257,6 +258,7 @@ private: QTimer* _iceHeartbeatTimer { nullptr }; QTimer* _metaverseHeartbeatTimer { nullptr }; QTimer* _metaverseGroupCacheTimer { nullptr }; + QTimer* _nodePingMonitorTimer { nullptr }; QList _iceServerAddresses; QSet _failedIceServerAddresses; From 06436e6a7d97bca388aeb2f444f73abe127a1276 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:09 -0700 Subject: [PATCH 020/100] quiet build warning --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 34af465485..4a0bce5103 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1311,12 +1311,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL()); // use our MyAvatar position and quat for address manager path - addressManager->setPositionGetter([this] { + addressManager->setPositionGetter([] { auto avatarManager = DependencyManager::get(); auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr; return myAvatar ? myAvatar->getWorldFeetPosition() : Vectors::ZERO; }); - addressManager->setOrientationGetter([this] { + addressManager->setOrientationGetter([] { auto avatarManager = DependencyManager::get(); auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr; return myAvatar ? myAvatar->getWorldOrientation() : glm::quat(); From c5eb9c03d5a4c37eabfbf5ba47491ec26b9dbfb8 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:28 -0700 Subject: [PATCH 021/100] fix uninitialized read --- interface/src/avatar/MyAvatar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 interface/src/avatar/MyAvatar.h diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h old mode 100755 new mode 100644 index 058603f320..9fb6c85a78 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -2603,7 +2603,7 @@ private: bool _enableDebugDrawIKChains { false }; bool _enableDebugDrawDetailedCollision { false }; - mutable bool _cauterizationNeedsUpdate; // do we need to scan children and update their "cauterized" state? + mutable bool _cauterizationNeedsUpdate { false }; // do we need to scan children and update their "cauterized" state? AudioListenerMode _audioListenerMode; glm::vec3 _customListenPosition; From d1824c4d6db983f6c1aed77ba0081bf57b7b3125 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:56 -0700 Subject: [PATCH 022/100] remove spammy log --- libraries/animation/src/AnimationCache.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp index 237fd3da02..e4afbd06e4 100644 --- a/libraries/animation/src/AnimationCache.cpp +++ b/libraries/animation/src/AnimationCache.cpp @@ -136,7 +136,6 @@ void Animation::downloadFinished(const QByteArray& data) { } void Animation::animationParseSuccess(HFMModel::Pointer hfmModel) { - qCDebug(animation) << "Animation parse success"; _hfmModel = hfmModel; finishedLoading(true); } From 426f97fb35bcb5eda693c816613ebd34374e9843 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:53:12 -0700 Subject: [PATCH 023/100] avoid div by zero --- libraries/avatars-renderer/src/avatars-renderer/Head.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp index 9cf034863e..2e8bedbb36 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp @@ -230,7 +230,11 @@ void Head::applyEyelidOffset(glm::quat headOrientation) { const float OPEN_DOWN_MULTIPLIER = 0.3f; const float BROW_UP_MULTIPLIER = 0.5f; - glm::vec3 lookAt = glm::normalize(getLookAtPosition() - _eyePosition); + glm::vec3 lookAtVector = getLookAtPosition() - _eyePosition; + if (glm::length2(lookAtVector) == 0.0f) { + return; + } + glm::vec3 lookAt = glm::normalize(lookAtVector); glm::vec3 headUp = headOrientation * Vectors::UNIT_Y; float eyePitch = (PI / 2.0f) - acos(glm::dot(lookAt, headUp)); float eyelidOffset = glm::clamp(abs(eyePitch * EYE_PITCH_TO_COEFFICIENT), 0.0f, MAX_EYELID_OFFSET); From 50e99cc1fdcec772d6f9687b29ba6cfd231ce898 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:55:04 -0700 Subject: [PATCH 024/100] fix uninitialized read --- libraries/entities-renderer/src/RenderableGizmoEntityItem.h | 2 +- libraries/shared/src/GizmoType.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h index 2061bb0bca..ba59fdc728 100644 --- a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h +++ b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h @@ -33,7 +33,7 @@ private: virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override; virtual void doRender(RenderArgs* args) override; - GizmoType _gizmoType; + GizmoType _gizmoType { UNSET_GIZMO_TYPE }; RingGizmoPropertyGroup _ringProperties; PrimitiveMode _prevPrimitiveMode; diff --git a/libraries/shared/src/GizmoType.h b/libraries/shared/src/GizmoType.h index ce57fe97c2..464fef087d 100644 --- a/libraries/shared/src/GizmoType.h +++ b/libraries/shared/src/GizmoType.h @@ -26,6 +26,7 @@ enum GizmoType { RING = 0, + UNSET_GIZMO_TYPE }; class GizmoTypeHelpers { From 8a9f3b9508dc6c748bd831944d7d070f9253c508 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:56:08 -0700 Subject: [PATCH 025/100] fix uninitialized read --- .../entities-renderer/src/RenderableMaterialEntityItem.h | 4 ++-- libraries/shared/src/MaterialMappingMode.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h index d714727c7a..0c347155e0 100644 --- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h +++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h @@ -41,8 +41,8 @@ private: quint16 _priority; QUuid _parentID; - MaterialMappingMode _materialMappingMode; - bool _materialRepeat; + MaterialMappingMode _materialMappingMode { UNSET_MATERIAL_MAPPING_MODE }; + bool _materialRepeat { false }; glm::vec2 _materialMappingPos; glm::vec2 _materialMappingScale; float _materialMappingRot; diff --git a/libraries/shared/src/MaterialMappingMode.h b/libraries/shared/src/MaterialMappingMode.h index 848c2aa28c..190c0603b2 100644 --- a/libraries/shared/src/MaterialMappingMode.h +++ b/libraries/shared/src/MaterialMappingMode.h @@ -13,7 +13,8 @@ enum MaterialMappingMode { UV = 0, - PROJECTED + PROJECTED, + UNSET_MATERIAL_MAPPING_MODE }; class MaterialMappingModeHelpers { From 766a5c7f81ba6fb8a594aa152d8398e114817f53 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:56:29 -0700 Subject: [PATCH 026/100] avoid div by zero --- .../entities-renderer/src/RenderablePolyLineEntityItem.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index d7246f9ba5..6cdc25d7b3 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -177,6 +177,9 @@ void PolyLineEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& void PolyLineEntityRenderer::updateGeometry() { int maxNumVertices = std::min(_points.length(), _normals.length()); + if (maxNumVertices < 1) { + return; + } bool doesStrokeWidthVary = false; if (_widths.size() > 0) { float prevWidth = _widths[0]; From 7ee64258ec0430745e1139f82a6b110ab578372d Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:20 -0700 Subject: [PATCH 027/100] fix uninitialized read --- .../entities-renderer/src/RenderablePolyLineEntityItem.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h index adb30362da..fa6fff98d7 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h @@ -51,9 +51,9 @@ protected: float _textureAspectRatio { 1.0f }; bool _textureLoaded { false }; - bool _isUVModeStretch; - bool _faceCamera; - bool _glow; + bool _isUVModeStretch { false }; + bool _faceCamera { false }; + bool _glow { false }; size_t _numVertices; gpu::BufferPointer _polylineDataBuffer; From 8a32d230a880c930f010d7f498ce1003d9d26eba Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:36 -0700 Subject: [PATCH 028/100] avoid div by zero --- libraries/entities/src/EntityTree.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 652266bd48..dbc347631d 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -827,7 +827,12 @@ EntityItemID EntityTree::evalRayIntersection(const glm::vec3& origin, const glm: PickFilter searchFilter, OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo, Octree::lockType lockType, bool* accurateResult) { - RayArgs args = { origin, direction, 1.0f / direction, entityIdsToInclude, entityIdsToDiscard, + + // calculate dirReciprocal like this rather than with glm's scalar / vec3 template to avoid NaNs. + vec3 dirReciprocal = glm::vec3(direction.x == 0.0f ? 0.0f : 1.0f / direction.x, + direction.y == 0.0f ? 0.0f : 1.0f / direction.y, + direction.z == 0.0f ? 0.0f : 1.0f / direction.z); + RayArgs args = { origin, direction, dirReciprocal, entityIdsToInclude, entityIdsToDiscard, searchFilter, element, distance, face, surfaceNormal, extraInfo, EntityItemID() }; distance = FLT_MAX; From 32de196a2ce43cc579a528ce4ac7ae83d60fd109 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:55 -0700 Subject: [PATCH 029/100] remove some spammy logging --- libraries/fbx/src/FBXSerializer_Node.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/fbx/src/FBXSerializer_Node.cpp b/libraries/fbx/src/FBXSerializer_Node.cpp index 717bc113dd..a2772d02d7 100644 --- a/libraries/fbx/src/FBXSerializer_Node.cpp +++ b/libraries/fbx/src/FBXSerializer_Node.cpp @@ -385,7 +385,6 @@ FBXNode FBXSerializer::parseFBX(QIODevice* device) { quint32 fileVersion; in >> fileVersion; position += sizeof(fileVersion); - qCDebug(modelformat) << "fileVersion:" << fileVersion; bool has64BitPositions = (fileVersion >= FBX_VERSION_2016); // parse the top-level node From 16d259f54fdbc44d88b899532a3c2b69972496aa Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:15 -0700 Subject: [PATCH 030/100] fix uninitialized read --- libraries/image/src/image/Image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h index 129061900f..dd39383dfb 100644 --- a/libraries/image/src/image/Image.h +++ b/libraries/image/src/image/Image.h @@ -128,7 +128,7 @@ namespace image { QImage _packedData; FloatPixels _floatData; glm::ivec2 _dims; - Format _format; + Format _format { Format_Invalid }; }; } // namespace image From 0d2bc23a63cf649cb74ab67344ad66fc07daeb49 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:33 -0700 Subject: [PATCH 031/100] avoid crash on shutdown --- libraries/networking/src/LimitedNodeList.cpp | 9 --------- libraries/networking/src/LimitedNodeList.h | 11 +++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 0eda2ee2e0..4ab1843ec3 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -43,15 +43,6 @@ static Setting::Handle LIMITED_NODELIST_LOCAL_PORT("LimitedNodeList.Loc using namespace std::chrono_literals; static const std::chrono::milliseconds CONNECTION_RATE_INTERVAL_MS = 1s; -const std::set SOLO_NODE_TYPES = { - NodeType::AvatarMixer, - NodeType::AudioMixer, - NodeType::AssetServer, - NodeType::EntityServer, - NodeType::MessagesMixer, - NodeType::EntityScriptServer -}; - LimitedNodeList::LimitedNodeList(int socketListenPort, int dtlsListenPort) : _nodeSocket(this), _packetReceiver(new PacketReceiver(this)) diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 9f4a0177f5..f7ea0ec2ad 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -53,8 +53,6 @@ const quint64 NODE_SILENCE_THRESHOLD_MSECS = 10 * 1000; static const size_t DEFAULT_MAX_CONNECTION_RATE { std::numeric_limits::max() }; -extern const std::set SOLO_NODE_TYPES; - const char DEFAULT_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost"; const char STUN_SERVER_HOSTNAME[] = "stun.highfidelity.io"; @@ -330,6 +328,15 @@ public: float getInboundKbps() const { return _inboundKbps; } float getOutboundKbps() const { return _outboundKbps; } + const std::set SOLO_NODE_TYPES = { + NodeType::AvatarMixer, + NodeType::AudioMixer, + NodeType::AssetServer, + NodeType::EntityServer, + NodeType::MessagesMixer, + NodeType::EntityScriptServer + }; + public slots: void reset(); void eraseAllNodes(); From 55daef837a8bad4b91fe779fbd55dbbdad27c019 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:50 -0700 Subject: [PATCH 032/100] fix uninitialized read --- .../material-networking/src/material-networking/TextureCache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/material-networking/src/material-networking/TextureCache.h b/libraries/material-networking/src/material-networking/TextureCache.h index a328622885..754263566b 100644 --- a/libraries/material-networking/src/material-networking/TextureCache.h +++ b/libraries/material-networking/src/material-networking/TextureCache.h @@ -96,7 +96,7 @@ private: friend class KTXReader; friend class ImageReader; - image::TextureUsage::Type _type; + image::TextureUsage::Type _type { image::TextureUsage::UNUSED_TEXTURE }; image::ColorChannel _sourceChannel; enum class ResourceType { From 8018a84e8b47f1d64e4a8bb6fdc2a12fb0460e7b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:59:03 -0700 Subject: [PATCH 033/100] avoid div by zero --- libraries/render-utils/src/AmbientOcclusionEffect.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp index ee53347158..fd0d2c2522 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp +++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp @@ -474,6 +474,10 @@ void AmbientOcclusionEffect::updateBlurParameters() { } const auto occlusionSize = frameSize >> resolutionLevel; + if (occlusionSize.x == 0 || occlusionSize.y == 0) { + return; + } + // Occlusion UV limit hblur._blurAxis.z = occlusionSize.x / float(frameSize.x); hblur._blurAxis.w = occlusionSize.y / float(frameSize.y); From 19b2d35b876bfc4e6c93d0a9cd2ea4210a6eb2fa Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 4 Jun 2019 13:25:03 -0700 Subject: [PATCH 034/100] Resolve DEV-99: Remove all menus from top bar --- scripts/simplifiedUI/ui/simplifiedUI.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 38d1059da7..295e252ca3 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -42,11 +42,7 @@ function runNewDefaultsTogether() { } -// Uncomment this out once the work is actually complete. -// Until then, users are required to access some functionality from the top menu bar. -//var MENU_NAMES = ["File", "Edit", "Display", "View", "Navigate", "Settings", "Developer", "Help"]; -var MENU_NAMES = ["File", "Edit", "Display", "View", "Navigate", "Help", - "Settings > General...", "Settings > Controls...", "Settings > Audio...", "Settings > Graphics...", "Settings > Security..."]; +var MENU_NAMES = ["File", "Edit", "Display", "View", "Navigate", "Settings", "Developer", "Help"]; var keepMenusSetting = Settings.getValue("simplifiedUI/keepMenus", false); function maybeRemoveDesktopMenu() { if (!keepMenusSetting) { From 07c2d80b0ce1231a11ae98270c4ea9a93b20db22 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 13:29:16 -0700 Subject: [PATCH 035/100] fix ubuntu debian patch to track changes to Qt library handling --- debian/patches/hifi_use_system_qt.diff | 76 +++++++++++++------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/debian/patches/hifi_use_system_qt.diff b/debian/patches/hifi_use_system_qt.diff index 2bd7009928..7f42e3e610 100644 --- a/debian/patches/hifi_use_system_qt.diff +++ b/debian/patches/hifi_use_system_qt.diff @@ -1,43 +1,41 @@ -Index: hifi-interface-84/cmake/macros/SetupQt.cmake +Index: hifi/cmake/macros/SetupQt.cmake =================================================================== ---- hifi-interface-84.orig/cmake/macros/SetupQt.cmake -+++ hifi-interface-84/cmake/macros/SetupQt.cmake -@@ -18,19 +18,19 @@ function(calculate_default_qt_dir _QT_VE - elseif(WIN32) - set(QT_DEFAULT_ARCH "msvc2017_64") - else() -- set(QT_DEFAULT_ARCH "gcc_64") -+ set(QT_DEFAULT_ARCH "x86_64-linux-gnu") - endif() +--- hifi.orig/cmake/macros/SetupQt.cmake ++++ hifi/cmake/macros/SetupQt.cmake +@@ -27,7 +27,7 @@ function(calculate_qt5_version result _Q + set(_QT_CORE_DIR "${_QT_DIR}/include/QtCore") + endif() + if(NOT EXISTS "${_QT_CORE_DIR}") +- message(FATAL_ERROR "Could not find 'include/QtCore' in '${_QT_DIR}'") ++ message("Could not find 'include/QtCore' in '${_QT_DIR}'") + endif() + set(subdirs "") + get_sub_directories(subdirs ${_QT_CORE_DIR}) +@@ -71,13 +71,13 @@ macro(setup_qt) - if (WIN32 OR (ANDROID AND ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows"))) - set(QT_DEFAULT_ROOT "c:/Qt") - else() -- set(QT_DEFAULT_ROOT "$ENV{HOME}/Qt") -+ set(QT_DEFAULT_ROOT "/usr/lib") - endif() + message("QT_CMAKE_PREFIX_PATH = " ${QT_CMAKE_PREFIX_PATH}) - set_from_env(QT_ROOT QT_ROOT ${QT_DEFAULT_ROOT}) - set_from_env(QT_ARCH QT_ARCH ${QT_DEFAULT_ARCH}) +- # figure out where the qt dir is +- get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) +- set(QT_VERSION "unknown") +- calculate_qt5_version(QT_VERSION "${QT_DIR}") +- if (QT_VERSION STREQUAL "unknown") +- message(FATAL_ERROR "Could not determine QT_VERSION") +- endif() ++ # # figure out where the qt dir is ++ # get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) ++ # set(QT_VERSION "unknown") ++ # calculate_qt5_version(QT_VERSION "${QT_DIR}") ++ # if (QT_VERSION STREQUAL "unknown") ++ # message(FATAL_ERROR "Could not determine QT_VERSION") ++ # endif() -- set(${_RESULT_NAME} "${QT_ROOT}/${_QT_VERSION}/${QT_ARCH}" PARENT_SCOPE) -+ set(${_RESULT_NAME} "${QT_ROOT}/${QT_ARCH}" PARENT_SCOPE) - endfunction() - - # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables -@@ -44,7 +44,7 @@ macro(setup_qt) - endif() - if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}")) - calculate_default_qt_dir(${QT_VERSION} QT_DIR) -- set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake") -+ set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/cmake") - else() - # figure out where the qt dir is - get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) -Index: hifi-interface-84/interface/CMakeLists.txt + if(WIN32) + # windows shell does not like backslashes expanded on the command line, +Index: hifi/interface/CMakeLists.txt =================================================================== ---- hifi-interface-84.orig/interface/CMakeLists.txt -+++ hifi-interface-84/interface/CMakeLists.txt +--- hifi.orig/interface/CMakeLists.txt ++++ hifi/interface/CMakeLists.txt @@ -35,7 +35,7 @@ else () add_custom_command( OUTPUT ${RESOURCES_RCC} @@ -60,11 +58,11 @@ Index: hifi-interface-84/interface/CMakeLists.txt + endif() - if (SCRIPTS_INSTALL_DIR) -Index: hifi-interface-84/tools/nitpick/CMakeLists.txt + if (DEV_BUILD AND (APPLE OR UNIX)) +Index: hifi/tools/nitpick/CMakeLists.txt =================================================================== ---- hifi-interface-84.orig/tools/nitpick/CMakeLists.txt -+++ hifi-interface-84/tools/nitpick/CMakeLists.txt +--- hifi.orig/tools/nitpick/CMakeLists.txt ++++ hifi/tools/nitpick/CMakeLists.txt @@ -12,7 +12,7 @@ generate_qrc(OUTPUT ${RESOURCES_QRC} PAT add_custom_command( OUTPUT ${RESOURCES_RCC} From 9150cd288f067cda3e0477630ebec0bdafa72755 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 4 Jun 2019 13:36:00 -0700 Subject: [PATCH 036/100] Add some logging instead of a scary popup --- scripts/simplifiedUI/ui/simplifiedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 295e252ca3..cdf6a9591a 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -531,7 +531,7 @@ function shutdown() { restoreScripts(); if (!keepExistingUIAndScriptsSetting) { - Window.confirm("You'll have to restart Interface to get full functionality back. Clicking yes or no will dismiss this dialog."); + console.log("The Simplified UI script has been shut down. If you notice any strangeness with user interface, please restart this application."); if (!HMD.active) { var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); From 512b43e1de99f113a8b5ec8ee59bf0e4f6be8236 Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Tue, 4 Jun 2019 15:18:38 -0700 Subject: [PATCH 037/100] Log socket error string when socket error happens --- libraries/networking/src/udt/Socket.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 524f7edf72..5e68070bb7 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -486,7 +486,11 @@ std::vector Socket::getConnectionSockAddrs() { } void Socket::handleSocketError(QAbstractSocket::SocketError socketError) { - qCDebug(networking) << "udt::Socket error - " << socketError; + qCDebug(networking) << "udt::Socket (" << _udpSocket.state() << ") error - " << socketError << "(" << _udpSocket.errorString() << ")"; +#ifdef DEBUG_EVENT_QUEUE + int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); + qCDebug(networking) << "Networking queue size - " << nodeListQueueSize; +#endif // DEBUG_EVENT_QUEUE } void Socket::handleStateChanged(QAbstractSocket::SocketState socketState) { From 02ff4ea2f524a51d22fb9e9471a68784447d4b46 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 15:45:33 -0700 Subject: [PATCH 038/100] add some comments to help future devs --- libraries/shared/src/GizmoType.h | 1 + libraries/shared/src/MaterialMappingMode.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/shared/src/GizmoType.h b/libraries/shared/src/GizmoType.h index 464fef087d..fc047b257d 100644 --- a/libraries/shared/src/GizmoType.h +++ b/libraries/shared/src/GizmoType.h @@ -26,6 +26,7 @@ enum GizmoType { RING = 0, + // put new gizmo-types before this line. UNSET_GIZMO_TYPE }; diff --git a/libraries/shared/src/MaterialMappingMode.h b/libraries/shared/src/MaterialMappingMode.h index 190c0603b2..d95fbb339e 100644 --- a/libraries/shared/src/MaterialMappingMode.h +++ b/libraries/shared/src/MaterialMappingMode.h @@ -14,6 +14,7 @@ enum MaterialMappingMode { UV = 0, PROJECTED, + // put new mapping-modes before this line. UNSET_MATERIAL_MAPPING_MODE }; From 0bdca38644c5d21dc5ba7d9512fb0dc6ff5e0390 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 5 Jun 2019 11:46:14 +1200 Subject: [PATCH 039/100] Polish Users JSDoc --- .../src/UsersScriptingInterface.h | 140 +++++++++++------- 1 file changed, 87 insertions(+), 53 deletions(-) diff --git a/libraries/script-engine/src/UsersScriptingInterface.h b/libraries/script-engine/src/UsersScriptingInterface.h index f8ca974b8b..b9857fbd86 100644 --- a/libraries/script-engine/src/UsersScriptingInterface.h +++ b/libraries/script-engine/src/UsersScriptingInterface.h @@ -18,6 +18,8 @@ #include /**jsdoc + * The Users API provides features to regulate your interaction with other users. + * * @namespace Users * * @hifi-interface @@ -25,10 +27,10 @@ * @hifi-avatar * @hifi-assignment-client * - * @property {boolean} canKick - true if the domain server allows the node or avatar to kick (ban) avatars, - * otherwise false. Read-only. - * @property {boolean} requestsDomainListData - true if the avatar requests extra data from the mixers (such as - * positional data of an avatar you've ignored). Read-only. + * @property {boolean} canKick - true if the domain server allows the client to kick (ban) avatars, otherwise + * false. Read-only. + * @property {boolean} requestsDomainListData - true if the client requests extra data from the mixers (such as + * positional data of an avatar they've ignored). Read-only. */ class UsersScriptingInterface : public QObject, public Dependency { Q_OBJECT @@ -49,130 +51,161 @@ public: public slots: /**jsdoc - * Personally ignore another user, making them disappear for you and you disappear for them. + * Ignores or un-ignores another avatar. Ignoring an avatar makes them disappear for you and you disappear for them. * @function Users.ignore - * @param {Uuid} nodeID The node or session ID of the user you want to ignore. - * @param {boolean} enable True for ignored; false for un-ignored. + * @param {Uuid} sessionID - The session ID of the avatar to ignore. + * @param {boolean} [enable=true] - true to ignore, false to un-ignore. + * @example Ignore a nearby avatar for a few seconds. + * var avatars = AvatarList.getAvatarsInRange(MyAvatar.position, 1000); + * if (avatars.length > 1) { // Skip own avatar which is provided in position 0. + * print("Ignore: " + avatars[1]); + * Users.ignore(avatars[1], true); + * Script.setTimeout(function () { + * print("Un-ignore: " + avatars[1]); + * Users.ignore(avatars[1], false); + * }, 5000); + * } else { + * print("No avatars"); + * } */ void ignore(const QUuid& nodeID, bool ignoreEnabled = true); /**jsdoc - * Get whether or not you have ignored the node with the given UUID. + * Gets whether or not you have ignored a particular avatar. * @function Users.getIgnoreStatus - * @param {Uuid} nodeID The node or session ID of the user whose ignore status you want. - * @returns {boolean} + * @param {Uuid} sessionID - The session ID of the avatar to get the ignore status of. + * @returns {boolean} true if the avatar is being ignored, false if it isn't. */ bool getIgnoreStatus(const QUuid& nodeID); /**jsdoc - * Mute another user for you and you only. They won't be able to hear you, and you won't be able to hear them. + * Mutes or un-mutes another avatar. Muting makes you unable to hear them and them unable to hear you. * @function Users.personalMute - * @param {Uuid} nodeID The node or session ID of the user you want to mute. - * @param {boolean} muteEnabled True for enabled; false for disabled. + * @param {Uuid} sessionID - The session ID of the avatar to mute. + * @param {boolean} [muteEnabled=true] - true to mute, false to un-mute. */ void personalMute(const QUuid& nodeID, bool muteEnabled = true); /**jsdoc - * Get whether or not you have personally muted the node with the given UUID. - * @function Users.requestPersonalMuteStatus - * @param {Uuid} nodeID The node or session ID of the user whose personal mute status you want. - * @returns {boolean} + * Gets whether or not you have muted a particular avatar. + * @function Users.getPersonalMuteStatus + * @param {Uuid} sessionID - The session ID of the avatar to get the mute status of. + * @returns {boolean} true if the avatar is muted, false if it isn't. */ bool getPersonalMuteStatus(const QUuid& nodeID); /**jsdoc - * Sets an avatar's gain for you and you only. - * Units are Decibels (dB) + * Sets an avatar's gain (volume) for you and you only, or sets the master gain. * @function Users.setAvatarGain - * @param {Uuid} nodeID The node or session ID of the user whose gain you want to modify, or null to set the master gain. - * @param {number} gain The gain of the avatar you'd like to set. Units are dB. + * @param {Uuid} nodeID - The session ID of the avatar to set the gain for, or null to set the master gain. + * @param {number} gain - The gain to set, in dB. */ void setAvatarGain(const QUuid& nodeID, float gain); /**jsdoc - * Gets an avatar's gain for you and you only. + * Gets an avatar's gain (volume) for you and you only, or gets the master gain. * @function Users.getAvatarGain - * @param {Uuid} nodeID The node or session ID of the user whose gain you want to get, or null to get the master gain. - * @returns {number} gain (in dB) + * @param {Uuid} nodeID - The session ID of the avatar to get the gain for, or null to get the master gain. + * @returns {number} The gain, in dB. */ float getAvatarGain(const QUuid& nodeID); /**jsdoc - * Kick/ban another user. Removes them from the server and prevents them from returning. Bans by either user name (if - * available) or machine fingerprint otherwise. This will only do anything if you're an admin of the domain you're in. + * Kicks and bans a user. This removes them from the server and prevents them from returning. The ban is by user name if + * available, or machine fingerprint otherwise. + *

This function only works if you're an administrator of the domain you're in.

* @function Users.kick - * @param {Uuid} nodeID The node or session ID of the user you want to kick. + * @param {Uuid} sessionID - The session ID of the user to kick and ban. */ void kick(const QUuid& nodeID); /**jsdoc - * Mutes another user's microphone for everyone. Not permanent; the silenced user can unmute themselves with the UNMUTE - * button in their HUD. This will only do anything if you're an admin of the domain you're in. + * Mutes a user's microphone for everyone. The mute is not permanent: the user can unmute themselves. + *

This function only works if you're an administrator of the domain you're in.

* @function Users.mute - * @param {Uuid} nodeID The node or session ID of the user you want to mute. + * @param {Uuid} sessionID - The session ID of the user to mute. */ void mute(const QUuid& nodeID); /**jsdoc - * Request the user name and machine fingerprint associated with the given UUID. The user name will be returned in a - * {@link Users.usernameFromIDReply|usernameFromIDReply} signal. This will only do anything if you're an admin of the domain - * you're in. - * @function Users.requestUsernameFromID - * @param {Uuid} nodeID The node or session ID of the user whose user name you want. - */ + * Requests the user name and machine fingerprint associated with the given UUID. The user name is returned via a + * {@link Users.usernameFromIDReply|usernameFromIDReply} signal. + *

This function only works if you're an administrator of the domain you're in.

+ * @function Users.requestUsernameFromID + * @param {Uuid} sessionID - The session ID of the user to get the user name and machine fingerprint of. + * @example Report the user name and fingerprint of a nearby user. + * function onUsernameFromIDReply(sessionID, userName, machineFingerprint, isAdmin) { + * print("Session: " + sessionID); + * print("User name: " + userName); + * print("Fingerprint: " + machineFingerprint); + * print("Is admin: " + isAdmin); + * } + * + * Users.usernameFromIDReply.connect(onUsernameFromIDReply); + * + * var avatars = AvatarList.getAvatarsInRange(MyAvatar.position, 1000); + * if (avatars.length > 1) { // Skip own avatar which is provided in position 0. + * print("Request data for: " + avatars[1]); + * Users.requestUsernameFromID(avatars[1]); + * } else { + * print("No avatars"); + * } + */ void requestUsernameFromID(const QUuid& nodeID); /**jsdoc - * Returns `true` if the DomainServer will allow this Node/Avatar to make kick. + * Gets whether the client can kick and ban users in the domain. * @function Users.getCanKick - * @returns {boolean} true if the domain server allows the client to kick (ban) other users, otherwise + * @returns {boolean} true if the domain server allows the client to kick and ban users, otherwise * false. */ bool getCanKick(); /**jsdoc - * Toggle the state of the space bubble feature. + * Toggles the state of the privacy bubble. * @function Users.toggleIgnoreRadius */ void toggleIgnoreRadius(); /**jsdoc - * Enables the space bubble feature. + * Enables the privacy bubble. * @function Users.enableIgnoreRadius */ void enableIgnoreRadius(); /**jsdoc - * Disables the space bubble feature. + * Disables the privacy bubble. * @function Users.disableIgnoreRadius */ void disableIgnoreRadius(); /**jsdoc - * Returns `true` if the space bubble feature is enabled. + * Gets the status of the privacy bubble. * @function Users.getIgnoreRadiusEnabled - * @returns {boolean} true if the space bubble is enabled, otherwise false. + * @returns {boolean} true if the privacy bubble is enabled, false if it is disabled. */ bool getIgnoreRadiusEnabled(); signals: /**jsdoc + * Triggered when your ability to kick and ban users changes. * @function Users.canKickChanged - * @param {boolean} canKick + * @param {boolean} canKick - true if you can kick and ban users, false if you can't. * @returns {Signal} */ void canKickChanged(bool canKick); /**jsdoc + * Triggered when the privacy bubble status changes. * @function Users.ignoreRadiusEnabledChanged - * @param {boolean} isEnabled + * @param {boolean} isEnabled - true if the privacy bubble is enabled, false if it isn't. * @returns {Signal} */ void ignoreRadiusEnabledChanged(bool isEnabled); /**jsdoc - * Notifies scripts that another user has entered the ignore radius. + * Triggered when another user enters the privacy bubble. * @function Users.enteredIgnoreRadius * @returns {Signal} */ @@ -181,20 +214,21 @@ signals: /**jsdoc * Triggered in response to a {@link Users.requestUsernameFromID|requestUsernameFromID} call. Provides the user name and * machine fingerprint associated with a UUID. - * Username and machineFingerprint will be their default constructor output if the requesting user isn't an admin. * @function Users.usernameFromIDReply - * @param {Uuid} nodeID - * @param {string} userName - * @param {string} machineFingerprint - * @param {boolean} isAdmin + * @param {Uuid} sessionID - The session ID of the client that the data is for. + * @param {string} userName - The user name of the client, if the requesting client is an administrator in the domain or + * the sessionID is that of the client, otherwise "". + * @param {Uuid} machineFingerprint - The machine fingerprint of the client, if the requesting client is an administrator + * in the domain or the sessionID is that of the client, otherwise {@link Uuid|Uuid.NULL}. + * @param {boolean} isAdmin - true if the client is an administrator in the domain, false if not. * @returns {Signal} */ void usernameFromIDReply(const QString& nodeID, const QString& username, const QString& machineFingerprint, bool isAdmin); /**jsdoc - * Notifies scripts that a user has disconnected from the domain. + * Triggered when a client has disconnected from the domain. * @function Users.avatarDisconnected - * @param {Uuid} nodeID The session ID of the avatar that has disconnected. + * @param {Uuid} sessionID - The session ID of the client that has disconnected. * @returns {Signal} */ void avatarDisconnected(const QUuid& nodeID); From 6299d38673b1aa964de664a6462dd09e9bad8e58 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 5 Jun 2019 14:39:05 +1200 Subject: [PATCH 040/100] Distinguish between Uuid API and Uuid type in JSDoc --- interface/src/ui/overlays/Overlays.h | 8 ++++---- .../src/avatars-renderer/Avatar.h | 4 ++-- .../src/controllers/ScriptingInterface.h | 2 +- libraries/entities/src/EntityItemProperties.cpp | 16 ++++++++-------- .../entities/src/EntityScriptingInterface.h | 10 +++++----- libraries/networking/src/AddressManager.h | 2 +- libraries/script-engine/src/ScriptEngine.h | 2 +- libraries/script-engine/src/ScriptUUID.h | 17 ++++++++--------- libraries/shared/src/RegisteredMetaTypes.h | 6 ++++++ 9 files changed, 36 insertions(+), 31 deletions(-) diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h index 0b2994b872..6eaf481efe 100644 --- a/interface/src/ui/overlays/Overlays.h +++ b/interface/src/ui/overlays/Overlays.h @@ -77,7 +77,7 @@ public: * @hifi-avatar * * @property {Uuid} keyboardFocusOverlay - Get or set the {@link Entities.EntityTypes|Web} entity that has keyboard focus. - * If no entity has keyboard focus, get returns null; set to null or {@link Uuid|Uuid.NULL} to + * If no entity has keyboard focus, get returns null; set to null or {@link Uuid(0)|Uuid.NULL} to * clear keyboard focus. */ @@ -122,7 +122,7 @@ public slots: * @function Overlays.addOverlay * @param {Overlays.OverlayType} type - The type of the overlay to add. * @param {Overlays.OverlayProperties} properties - The properties of the overlay to add. - * @returns {Uuid} The ID of the newly created overlay if successful, otherwise {@link Uuid|Uuid.NULL}. + * @returns {Uuid} The ID of the newly created overlay if successful, otherwise {@link Uuid(0)|Uuid.NULL}. * @example Add a cube overlay in front of your avatar. * var overlay = Overlays.addOverlay("cube", { * position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0, z: -3 })), @@ -137,7 +137,7 @@ public slots: * Create a clone of an existing entity (or 2D overlay). * @function Overlays.cloneOverlay * @param {Uuid} id - The ID of the entity/2D overlay to clone. - * @returns {Uuid} The ID of the new object if successful, otherwise {@link Uuid|Uuid.NULL}. + * @returns {Uuid} The ID of the new object if successful, otherwise {@link Uuid(0)|Uuid.NULL}. */ QUuid cloneOverlay(const QUuid& id); @@ -562,7 +562,7 @@ public slots: * Set the Web3D entity that has keyboard focus. * @function Overlays.setKeyboardFocusOverlay * @param {Uuid} id - The ID of the {@link Entities.EntityTypes|Web} entity to set keyboard focus to. Use - * null or {@link Uuid|Uuid.NULL} to unset keyboard focus from an overlay. + * null or {@link Uuid(0)|Uuid.NULL} to unset keyboard focus from an overlay. */ void setKeyboardFocusOverlay(const QUuid& id) { DependencyManager::get()->setKeyboardFocusEntity(id); } diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h index adafca1d1f..ee0fb6f433 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h @@ -441,7 +441,7 @@ public: /**jsdoc * Gets the ID of the entity of avatar that the avatar is parented to. * @function MyAvatar.getParentID - * @returns {Uuid} The ID of the entity or avatar that the avatar is parented to. {@link Uuid|Uuid.NULL} if not parented. + * @returns {Uuid} The ID of the entity or avatar that the avatar is parented to. {@link Uuid(0)|Uuid.NULL} if not parented. */ // This calls through to the SpatiallyNestable versions, but is here to expose these to JavaScript. Q_INVOKABLE virtual const QUuid getParentID() const override { return SpatiallyNestable::getParentID(); } @@ -450,7 +450,7 @@ public: * Sets the ID of the entity of avatar that the avatar is parented to. * @function MyAvatar.setParentID * @param {Uuid} parentID - The ID of the entity or avatar that the avatar should be parented to. Set to - * {@link Uuid|Uuid.NULL} to unparent. + * {@link Uuid(0)|Uuid.NULL} to unparent. */ // This calls through to the SpatiallyNestable versions, but is here to expose these to JavaScript. Q_INVOKABLE virtual void setParentID(const QUuid& parentID) override; diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index 84396fc8be..6a9a5c9dbb 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -263,7 +263,7 @@ namespace controller { * methods. The mapping can then be enabled using {@link Controller.enableMapping|enableMapping} for it to take effect. * @function Controller.newMapping * @param {string} [mappingName=Uuid.generate()] - A unique name for the mapping. If not specified a new UUID generated - * by {@link Uuid.generate} is used. + * by {@link Uuid(0).generate} is used. * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. * var MAPPING_NAME = "com.highfidelity.controllers.example.newMapping"; diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index e5205e86e8..805eabc877 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -630,7 +630,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * The value can only be set at entity creation by using the entityHostType parameter in * {@link Entities.addEntity}. Read-only. * @property {Uuid} owningAvatarID=Uuid.NULL - The session ID of the owning avatar if avatarEntity is - * true, otherwise {@link Uuid|Uuid.NULL}. Read-only. + * true, otherwise {@link Uuid(0)|Uuid.NULL}. Read-only. * * @property {string} created - The UTC date and time that the entity was created, in ISO 8601 format as * yyyy-MM-ddTHH:mm:ssZ. Read-only. @@ -728,7 +728,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * button beside the "script URL" field in properties tab of the Create app works. * @property {string} serverScripts="" - The URL of the server entity script, if any, that is attached to the entity. * - * @property {Uuid} parentID=Uuid.NULL - The ID of the entity or avatar that this entity is parented to. {@link Uuid|Uuid.NULL} + * @property {Uuid} parentID=Uuid.NULL - The ID of the entity or avatar that this entity is parented to. {@link Uuid(0)|Uuid.NULL} * if the entity is not parented. * @property {number} parentJointIndex=65535 - The joint of the entity or avatar that this entity is parented to. Use * 65535 or -1 to parent to the entity or avatar's position and orientation rather than a joint. @@ -1174,17 +1174,17 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * @property {string} zTextureURL="" - URL of the texture to map to surfaces perpendicular to the entity's local z-axis. JPG or * PNG format. If no texture is specified the surfaces display white. * @property {Uuid} xNNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's -ve local x-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @property {Uuid} yNNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's -ve local y-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @property {Uuid} zNNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's -ve local z-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @property {Uuid} xPNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's +ve local x-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @property {Uuid} yPNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's +ve local y-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @property {Uuid} zPNeighborID=Uuid.NULL - ID of the neighboring PolyVox entity in the entity's +ve local z-axis direction, - * if you want them joined. Set to {@link Uuid|Uuid.NULL} if there is none or you don't want to join them. + * if you want them joined. Set to {@link Uuid(0)|Uuid.NULL} if there is none or you don't want to join them. * @example Create a textured PolyVox sphere. * var position = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.5, z: -8 })); * var texture = "http://public.highfidelity.com/cozza13/tuscany/Concrete2.jpg"; diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 39700bfc31..c3b0371029 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -114,7 +114,7 @@ public: * @hifi-assignment-client * * @property {Uuid} keyboardFocusEntity - Get or set the {@link Entities.EntityType|Web} entity that has keyboard focus. - * If no entity has keyboard focus, get returns null; set to null or {@link Uuid|Uuid.NULL} to + * If no entity has keyboard focus, get returns null; set to null or {@link Uuid(0)|Uuid.NULL} to * clear keyboard focus. */ /// handles scripting of Entity commands from JS passed to assigned clients @@ -267,7 +267,7 @@ public slots: * follows you to each domain you visit, rendering at the same world coordinates unless it's parented to your avatar. * If "local", the entity is created as a local entity, which will only render for you and isn't sent over the wire. * Otherwise it is created as a normal entity and sent over the entity server. - * @returns {Uuid} The ID of the entity if successfully created, otherwise {@link Uuid|Uuid.NULL}. + * @returns {Uuid} The ID of the entity if successfully created, otherwise {@link Uuid(0)|Uuid.NULL}. * @example Create a box entity in front of your avatar. * var entityID = Entities.addEntity({ * type: "Box", @@ -294,7 +294,7 @@ public slots: * @function Entities.addEntity * @param {Entities.EntityProperties} properties - The properties of the entity to create. * @param {boolean} [avatarEntity=false] - Whether to create an avatar entity or a domain entity - * @returns {Uuid} The ID of the entity if successfully created, otherwise {@link Uuid|Uuid.NULL}. + * @returns {Uuid} The ID of the entity if successfully created, otherwise {@link Uuid(0)|Uuid.NULL}. */ Q_INVOKABLE QUuid addEntity(const EntityItemProperties& properties, bool avatarEntity = false) { entity::HostType entityHostType = avatarEntity ? entity::HostType::AVATAR : entity::HostType::DOMAIN; @@ -312,7 +312,7 @@ public slots: * properties set per its clone related-properties, and its clone-related properties are set to defaults. * @function Entities.cloneEntity * @param {Uuid} entityID - The ID of the entity to clone. - * @returns {Uuid} The ID of the new entity if successfully cloned, otherwise {@link Uuid|Uuid.NULL}. + * @returns {Uuid} The ID of the new entity if successfully cloned, otherwise {@link Uuid(0)|Uuid.NULL}. */ Q_INVOKABLE QUuid cloneEntity(const QUuid& entityID); @@ -1446,7 +1446,7 @@ public slots: * Set the {@link Entities.EntityType|Web} entity that has keyboard focus. * @function Entities.setKeyboardFocusEntity * @param {Uuid} id - The ID of the {@link Entities.EntityType|Web} entity to set keyboard focus to. Use - * null or {@link Uuid|Uuid.NULL} to unset keyboard focus from an entity. + * null or {@link Uuid(0)|Uuid.NULL} to unset keyboard focus from an entity. */ Q_INVOKABLE void setKeyboardFocusEntity(const QUuid& id); diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 3cf5637c5f..8187c23f71 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -46,7 +46,7 @@ const QString GET_PLACE = "/api/v1/places/%1"; * @hifi-avatar * @hifi-assignment-client * - * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid|Uuid.NULL} if you're not + * @property {Uuid} domainID - A UUID uniquely identifying the domain you're visiting. Is {@link Uuid(0)|Uuid.NULL} if you're not * connected to the domain or are in a serverless domain. * Read-only. * @property {string} hostname - The name of the domain for your current metaverse address (e.g., "AvatarIsland", diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index e58609f01d..a2b16ed178 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -623,7 +623,7 @@ public: /**jsdoc * @function Script.generateUUID * @returns {Uuid} A new UUID. - * @deprecated This function is deprecated and will be removed. Use {@link Uuid.generate} instead. + * @deprecated This function is deprecated and will be removed. Use {@link Uuid(0).generate|Uuid.generate} instead. */ Q_INVOKABLE QUuid generateUUID() { return QUuid::createUuid(); } diff --git a/libraries/script-engine/src/ScriptUUID.h b/libraries/script-engine/src/ScriptUUID.h index 548bc6a6c8..4f0dfd10b6 100644 --- a/libraries/script-engine/src/ScriptUUID.h +++ b/libraries/script-engine/src/ScriptUUID.h @@ -19,11 +19,10 @@ #include /**jsdoc - * A UUID (Universally Unique IDentifier) is used to uniquely identify entities, avatars, and the like. It is - * represented in JavaScript as a string in the format, {nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn}, where the "n"s are - * hexadecimal digits. + * The Uuid API provides facilities for working with UUIDs. * * @namespace Uuid + * @variation 0 * * @hifi-interface * @hifi-client-entity @@ -42,7 +41,7 @@ class ScriptUUID : public QObject, protected QScriptable { public slots: /**jsdoc * Generates a UUID from a string representation of the UUID. - * @function Uuid.fromString + * @function Uuid(0).fromString * @param {string} string - A string representation of a UUID. The curly braces are optional. * @returns {Uuid} A UUID if the given string is valid, null otherwise. * @example Valid and invalid parameters. @@ -60,7 +59,7 @@ public slots: /**jsdoc * Generates a string representation of a UUID. However, because UUIDs are represented in JavaScript as strings, this is in * effect a no-op. - * @function Uuid.toString + * @function Uuid(0).toString * @param {Uuid} id - The UUID to generate a string from. * @returns {string} - A string representation of the UUID. */ @@ -68,7 +67,7 @@ public slots: /**jsdoc * Generate a new UUID. - * @function Uuid.generate + * @function Uuid(0).generate * @returns {Uuid} A new UUID. * @example Generate a new UUID and reports its JavaScript type. * var uuid = Uuid.generate(); @@ -79,7 +78,7 @@ public slots: /**jsdoc * Test whether two given UUIDs are equal. - * @function Uuid.isEqual + * @function Uuid(0).isEqual * @param {Uuid} idA - The first UUID to compare. * @param {Uuid} idB - The second UUID to compare. * @returns {boolean} true if the two UUIDs are equal, otherwise false. @@ -94,7 +93,7 @@ public slots: /**jsdoc * Test whether a given UUID is null. - * @function Uuid.isNull + * @function Uuid(0).isNull * @param {Uuid} id - The UUID to test. * @returns {boolean} true if the UUID equals Uuid.NULL or is null, otherwise false. * @example Demonstrate true and false cases. @@ -111,7 +110,7 @@ public slots: /**jsdoc * Print to the program log a text label followed by the UUID value. - * @function Uuid.print + * @function Uuid(0).print * @param {string} label - The label to print. * @param {Uuid} id - The UUID to print. * @example Two ways of printing a label plus UUID. diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index be10f09da9..3e73ab6177 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -640,6 +640,12 @@ Q_DECLARE_METATYPE(Collision) QScriptValue collisionToScriptValue(QScriptEngine* engine, const Collision& collision); void collisionFromScriptValue(const QScriptValue &object, Collision& collision); +/**jsdoc + * UUIDs (Universally Unique IDentifiers) are used to uniquely identify entities, avatars, and the like. They are represented + * in JavaScript as strings in the format, "{nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn}", where the "n"s are + * hexadecimal digits. + * @typedef {string} Uuid + */ //Q_DECLARE_METATYPE(QUuid) // don't need to do this for QUuid since it's already a meta type QScriptValue quuidToScriptValue(QScriptEngine* engine, const QUuid& uuid); void quuidFromScriptValue(const QScriptValue& object, QUuid& uuid); From ef56cba71b7f53c42bbe8cb1f2a001fa52394137 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 5 Jun 2019 14:39:27 +1200 Subject: [PATCH 041/100] Polish Uuid API JSDoc --- libraries/script-engine/src/ScriptUUID.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/script-engine/src/ScriptUUID.h b/libraries/script-engine/src/ScriptUUID.h index 4f0dfd10b6..b667447aaa 100644 --- a/libraries/script-engine/src/ScriptUUID.h +++ b/libraries/script-engine/src/ScriptUUID.h @@ -30,7 +30,7 @@ * @hifi-server-entity * @hifi-assignment-client * - * @property {Uuid} NULL - The null UUID, {00000000-0000-0000-0000-000000000000}. + * @property {Uuid} NULL - The null UUID, "{00000000-0000-0000-0000-000000000000}". */ /// Scriptable interface for a UUID helper class object. Used exclusively in the JavaScript API @@ -66,7 +66,7 @@ public slots: QString toString(const QUuid& id); /**jsdoc - * Generate a new UUID. + * Generates a new UUID. * @function Uuid(0).generate * @returns {Uuid} A new UUID. * @example Generate a new UUID and reports its JavaScript type. @@ -77,7 +77,7 @@ public slots: QUuid generate(); /**jsdoc - * Test whether two given UUIDs are equal. + * Tests whether two UUIDs are equal. * @function Uuid(0).isEqual * @param {Uuid} idA - The first UUID to compare. * @param {Uuid} idB - The second UUID to compare. @@ -92,10 +92,11 @@ public slots: bool isEqual(const QUuid& idA, const QUuid& idB); /**jsdoc - * Test whether a given UUID is null. + * Tests whether a UUID is null. * @function Uuid(0).isNull * @param {Uuid} id - The UUID to test. - * @returns {boolean} true if the UUID equals Uuid.NULL or is null, otherwise false. + * @returns {boolean} true if the UUID equals Uuid.NULL or is null, otherwise + * false. * @example Demonstrate true and false cases. * var uuid; // undefined * print(Uuid.isNull(uuid)); // false @@ -109,7 +110,7 @@ public slots: bool isNull(const QUuid& id); /**jsdoc - * Print to the program log a text label followed by the UUID value. + * Prints a UUID to the program log, as a text label followed by the UUID value. * @function Uuid(0).print * @param {string} label - The label to print. * @param {Uuid} id - The UUID to print. From 42c0362303f832ed0c75c07bf377396947e81e9d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 5 Jun 2019 15:14:05 +1200 Subject: [PATCH 042/100] Fix link --- libraries/controllers/src/controllers/ScriptingInterface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index 6a9a5c9dbb..05e246deaa 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -263,7 +263,7 @@ namespace controller { * methods. The mapping can then be enabled using {@link Controller.enableMapping|enableMapping} for it to take effect. * @function Controller.newMapping * @param {string} [mappingName=Uuid.generate()] - A unique name for the mapping. If not specified a new UUID generated - * by {@link Uuid(0).generate} is used. + * by {@link Uuid(0).generate|Uuid.generate} is used. * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. * var MAPPING_NAME = "com.highfidelity.controllers.example.newMapping"; From 34bae25d0e1024c0ed5311ec390062204b6b99b2 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 5 Jun 2019 00:33:44 -0700 Subject: [PATCH 043/100] fixing the broken binding dependency for the propitems --- scripts/developer/utilities/lib/prop/PropBool.qml | 7 +------ scripts/developer/utilities/lib/prop/PropEnum.qml | 7 +------ scripts/developer/utilities/lib/prop/PropItem.qml | 2 +- scripts/developer/utilities/lib/prop/PropScalar.qml | 7 +++++++ scripts/developer/utilities/render/luci/Framebuffer.qml | 2 +- .../utilities/render/luci/PerformanceSettings.qml | 1 + scripts/developer/utilities/render/performanceSetup.qml | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/scripts/developer/utilities/lib/prop/PropBool.qml b/scripts/developer/utilities/lib/prop/PropBool.qml index 1d50ec7dd3..de07a53e47 100644 --- a/scripts/developer/utilities/lib/prop/PropBool.qml +++ b/scripts/developer/utilities/lib/prop/PropBool.qml @@ -14,12 +14,6 @@ PropItem { Global { id: global } id: root - property alias valueVar : checkboxControl.checked - - Component.onCompleted: { - valueVar = root.valueVarGetter(); - } - PropCheckBox { id: checkboxControl @@ -27,6 +21,7 @@ PropItem { anchors.verticalCenter: root.verticalCenter width: root.width * global.valueAreaWidthScale + checked: root.valueVarGetter(); onCheckedChanged: { root.valueVarSetter(checked); } } } \ No newline at end of file diff --git a/scripts/developer/utilities/lib/prop/PropEnum.qml b/scripts/developer/utilities/lib/prop/PropEnum.qml index c7869050ba..2268b21e34 100644 --- a/scripts/developer/utilities/lib/prop/PropEnum.qml +++ b/scripts/developer/utilities/lib/prop/PropEnum.qml @@ -15,13 +15,8 @@ PropItem { Global { id: global } id: root - property alias valueVar : valueCombo.currentIndex property alias enums : valueCombo.model - Component.onCompleted: { - valueVar = root.valueVarGetter(); - } - PropComboBox { id: valueCombo @@ -33,6 +28,6 @@ PropItem { height: global.slimHeight currentIndex: root.valueVarGetter() - onCurrentIndexChanged: { root.valueVarSetter(currentIndex); } + onCurrentIndexChanged: root.valueVarSetter(currentIndex) } } diff --git a/scripts/developer/utilities/lib/prop/PropItem.qml b/scripts/developer/utilities/lib/prop/PropItem.qml index 03eabae39b..f1a3b236d8 100644 --- a/scripts/developer/utilities/lib/prop/PropItem.qml +++ b/scripts/developer/utilities/lib/prop/PropItem.qml @@ -23,7 +23,7 @@ Item { // value is accessed through the "valueVarSetter" and "valueVarGetter" // By default, these just go get or set the value from the object[property] // - function defaultGet() { return root.object[root.property]; } + function defaultGet() { var v = root.object[root.property]; return v; } function defaultSet(value) { root.object[root.property] = value; } // function defaultSetReadOnly(value) { log ( "read only " + property + ", NOT setting to " + value); } // function defaultSetReadOnly(value) {} diff --git a/scripts/developer/utilities/lib/prop/PropScalar.qml b/scripts/developer/utilities/lib/prop/PropScalar.qml index 4c569eb57e..41915bb68b 100644 --- a/scripts/developer/utilities/lib/prop/PropScalar.qml +++ b/scripts/developer/utilities/lib/prop/PropScalar.qml @@ -32,6 +32,13 @@ PropItem { valueVar = root.valueVarGetter(); } + Connections + { + target: obj; + onValueChanged: console.log('changed'); + } + + PropLabel { id: valueLabel enabled: root.showValue diff --git a/scripts/developer/utilities/render/luci/Framebuffer.qml b/scripts/developer/utilities/render/luci/Framebuffer.qml index 89d5e59002..dd2b57d085 100644 --- a/scripts/developer/utilities/render/luci/Framebuffer.qml +++ b/scripts/developer/utilities/render/luci/Framebuffer.qml @@ -29,7 +29,7 @@ Column { label: "Debug Buffer" object: config property: "mode" - valueVar: 0 + // valueVar: 0 enums: [ "Off", "Depth", diff --git a/scripts/developer/utilities/render/luci/PerformanceSettings.qml b/scripts/developer/utilities/render/luci/PerformanceSettings.qml index ba3ecada9d..8794ade40c 100644 --- a/scripts/developer/utilities/render/luci/PerformanceSettings.qml +++ b/scripts/developer/utilities/render/luci/PerformanceSettings.qml @@ -32,6 +32,7 @@ Column { } Prop.PropEnum { + id: refreshrateProfileControl label: "Refresh Rate Profile" object: Performance property: "refreshRateProfile" diff --git a/scripts/developer/utilities/render/performanceSetup.qml b/scripts/developer/utilities/render/performanceSetup.qml index 416c074e0f..ab00d31f2b 100644 --- a/scripts/developer/utilities/render/performanceSetup.qml +++ b/scripts/developer/utilities/render/performanceSetup.qml @@ -50,7 +50,7 @@ Rectangle { } } } - /* Prop.PropFolderPanel { + Prop.PropFolderPanel { label: "Platform" panelFrameData: Component { Platform { @@ -58,7 +58,7 @@ Rectangle { anchors.right: parent.right } } - }*/ + } } } } From a132dad4862af455e8388e2107faabaf65a6da83 Mon Sep 17 00:00:00 2001 From: Ken Cooke Date: Wed, 5 Jun 2019 07:03:18 -0700 Subject: [PATCH 044/100] On platforms where nativeFormatForAudioDevice() is reliable, do not enumerate formats --- libraries/audio-client/src/AudioClient.cpp | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 8797b90860..41396811f0 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -616,23 +616,25 @@ bool adjustedFormatForAudioDevice(const QAudioDeviceInfo& audioDevice, qCDebug(audioclient) << "The desired format for audio I/O is" << desiredAudioFormat; -#if defined(Q_OS_ANDROID) || defined(Q_OS_OSX) - // As of Qt5.6, Android returns the native OpenSLES sample rate when possible, else 48000 - // Mac OSX returns the preferred CoreAudio format - if (nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat)) { - return true; - } -#endif - #if defined(Q_OS_WIN) if (IsWindows8OrGreater()) { // On Windows using WASAPI shared-mode, returns the internal mix format - if (nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat)) { - return true; - } - } + return nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat); + } // else enumerate formats #endif - + +#if defined(Q_OS_MAC) + // Mac OSX returns the preferred CoreAudio format + return nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat); +#endif + +#if defined(Q_OS_ANDROID) + // As of Qt5.6, Android returns the native OpenSLES sample rate when possible, else 48000 + if (nativeFormatForAudioDevice(audioDevice, adjustedAudioFormat)) { + return true; + } // else enumerate formats +#endif + adjustedAudioFormat = desiredAudioFormat; // From 06ed751f56542fd79b286fc687f225e54deaf73c Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 5 Jun 2019 11:08:12 -0700 Subject: [PATCH 045/100] checkpoint to deal with merge --- libraries/networking/src/LimitedNodeList.cpp | 6 +++++- libraries/networking/src/udt/Socket.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 0eda2ee2e0..deed00ac4b 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -446,7 +446,11 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr packet, const HifiS return size; } else { - return sendUnreliablePacket(*packet, sockAddr, hmacAuth); + auto size = sendUnreliablePacket(*packet, sockAddr, hmacAuth); + if (size < 0) { + + } + return size; } } diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 5e68070bb7..5dab1ad2b5 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -226,8 +226,11 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc qint64 bytesWritten = _udpSocket.writeDatagram(datagram, sockAddr.getAddress(), sockAddr.getPort()); if (bytesWritten < 0) { - // when saturating a link this isn't an uncommon message - suppress it so it doesn't bomb the debug - qCDebug(networking) << "Socket::writeDatagram : " << sockAddr << " " << _udpSocket.error(); + qCDebug(networking) << "udt::writeDatagram (" << _udpSocket.state() << ") error - " << _udpSocket.error() << "(" << _udpSocket.errorString() << ")"; +#ifdef DEBUG_EVENT_QUEUE + int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); + qCDebug(networking) << "Networking queue size - " << nodeListQueueSize; +#endif // DEBUG_EVENT_QUEUE } return bytesWritten; From 3cb5b7716e8307f3dd1c4c06a568778886a05570 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 4 Jun 2019 09:30:31 -0700 Subject: [PATCH 046/100] Light Launchers --- launchers/darwin/CMakeLists.txt | 104 + launchers/darwin/cmake/installer/Thumbs.db | Bin 0 -> 7168 bytes .../cmake/installer/install-folder.rsrc | 1634 ++++ .../cmake/installer/installer-header.bmp | Bin 0 -> 102656 bytes .../darwin/cmake/installer/installer.ico | Bin 0 -> 306053 bytes .../cmake/installer/uninstaller-header.bmp | Bin 0 -> 102656 bytes .../cmake/modules/MacOSXBundleInfo.plist.in | 35 + launchers/darwin/images/HiFi_Logo_Large.png | Bin 0 -> 5074 bytes launchers/darwin/images/HiFi_Logo_Small.png | Bin 0 -> 3346 bytes launchers/darwin/images/HiFi_Voxel.png | Bin 0 -> 2988 bytes launchers/darwin/images/HiFi_Window.png | Bin 0 -> 4637 bytes launchers/darwin/images/Hifi_Logo.svg | 14 + .../darwin/images/hifi_logo_large@2x.png | Bin 0 -> 16487 bytes .../darwin/images/hifi_logo_small@2x.png | Bin 0 -> 4678 bytes launchers/darwin/images/hifi_window@2x.png | Bin 0 -> 7787 bytes launchers/darwin/images/interface.icns | Bin 0 -> 321423 bytes launchers/darwin/nib/DisplayNameScreen.xib | 95 + launchers/darwin/nib/ErrorScreen.xib | 83 + launchers/darwin/nib/LoginScreen.xib | 139 + launchers/darwin/nib/ProcessScreen.xib | 65 + launchers/darwin/nib/SplashScreen.xib | 39 + launchers/darwin/nib/Window.xib | 30 + launchers/darwin/src/CredentialsRequest.h | 10 + launchers/darwin/src/CredentialsRequest.m | 95 + launchers/darwin/src/CustomUI.h | 30 + launchers/darwin/src/CustomUI.m | 118 + launchers/darwin/src/DisplayNameScreen.h | 5 + launchers/darwin/src/DisplayNameScreen.m | 34 + launchers/darwin/src/DownloadDomainContent.h | 8 + launchers/darwin/src/DownloadDomainContent.m | 84 + launchers/darwin/src/DownloadInterface.h | 8 + launchers/darwin/src/DownloadInterface.m | 109 + launchers/darwin/src/DownloadScripts.h | 8 + launchers/darwin/src/DownloadScripts.m | 39 + launchers/darwin/src/ErrorViewController.h | 7 + launchers/darwin/src/ErrorViewController.m | 26 + launchers/darwin/src/LatestBuildRequest.h | 10 + launchers/darwin/src/LatestBuildRequest.m | 104 + launchers/darwin/src/LaunchInterface.h | 5 + launchers/darwin/src/Launcher.h | 83 + launchers/darwin/src/Launcher.m | 364 + launchers/darwin/src/LoginScreen.h | 5 + launchers/darwin/src/LoginScreen.m | 76 + launchers/darwin/src/OrganizationRequest.h | 11 + launchers/darwin/src/OrganizationRequest.m | 96 + launchers/darwin/src/ProcessScreen.h | 7 + launchers/darwin/src/ProcessScreen.m | 55 + launchers/darwin/src/Settings.h | 20 + launchers/darwin/src/Settings.m | 127 + launchers/darwin/src/SplashScreen.h | 6 + launchers/darwin/src/SplashScreen.m | 19 + launchers/darwin/src/Window.h | 6 + launchers/darwin/src/Window.m | 7 + launchers/darwin/src/main.mm | 45 + launchers/win32/BUILD.md | 33 + launchers/win32/CMakeLists.txt | 68 + launchers/win32/Launcher.rc | 214 + launchers/win32/LauncherApp.cpp | 91 + launchers/win32/LauncherApp.h | 32 + launchers/win32/LauncherDlg.cpp | 624 ++ launchers/win32/LauncherDlg.h | 120 + launchers/win32/LauncherManager.cpp | 422 + launchers/win32/LauncherManager.h | 109 + launchers/win32/LauncherUtils.cpp | 405 + launchers/win32/LauncherUtils.h | 77 + launchers/win32/libs/json/json-forwards.h | 320 + launchers/win32/libs/json/json.h | 2346 +++++ launchers/win32/libs/jsoncpp.cpp | 5407 ++++++++++++ launchers/win32/libs/miniz.cpp | 7657 +++++++++++++++++ launchers/win32/libs/miniz.h | 1338 +++ launchers/win32/res/Graphikbold.ttf | Bin 0 -> 147012 bytes launchers/win32/res/Graphikregular.ttf | Bin 0 -> 144968 bytes launchers/win32/res/HiFi_Logo_Large.png | Bin 0 -> 16487 bytes launchers/win32/res/HiFi_Logo_Small.png | Bin 0 -> 4678 bytes launchers/win32/res/HiFi_Voxel.png | Bin 0 -> 2988 bytes launchers/win32/res/HiFi_Window.png | Bin 0 -> 7787 bytes launchers/win32/res/Launcher.rc2 | 13 + launchers/win32/res/button.png | Bin 0 -> 17324 bytes launchers/win32/res/interface.ico | Bin 0 -> 31269 bytes launchers/win32/resource.h | 40 + launchers/win32/stdafx.cpp | 13 + launchers/win32/stdafx.h | 35 + launchers/win32/targetver.h | 18 + tools/ci-scripts/postbuild.py | 46 +- 84 files changed, 23290 insertions(+), 3 deletions(-) create mode 100644 launchers/darwin/CMakeLists.txt create mode 100644 launchers/darwin/cmake/installer/Thumbs.db create mode 100644 launchers/darwin/cmake/installer/install-folder.rsrc create mode 100644 launchers/darwin/cmake/installer/installer-header.bmp create mode 100644 launchers/darwin/cmake/installer/installer.ico create mode 100644 launchers/darwin/cmake/installer/uninstaller-header.bmp create mode 100644 launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in create mode 100644 launchers/darwin/images/HiFi_Logo_Large.png create mode 100644 launchers/darwin/images/HiFi_Logo_Small.png create mode 100644 launchers/darwin/images/HiFi_Voxel.png create mode 100644 launchers/darwin/images/HiFi_Window.png create mode 100644 launchers/darwin/images/Hifi_Logo.svg create mode 100644 launchers/darwin/images/hifi_logo_large@2x.png create mode 100644 launchers/darwin/images/hifi_logo_small@2x.png create mode 100644 launchers/darwin/images/hifi_window@2x.png create mode 100644 launchers/darwin/images/interface.icns create mode 100644 launchers/darwin/nib/DisplayNameScreen.xib create mode 100644 launchers/darwin/nib/ErrorScreen.xib create mode 100644 launchers/darwin/nib/LoginScreen.xib create mode 100644 launchers/darwin/nib/ProcessScreen.xib create mode 100644 launchers/darwin/nib/SplashScreen.xib create mode 100644 launchers/darwin/nib/Window.xib create mode 100644 launchers/darwin/src/CredentialsRequest.h create mode 100644 launchers/darwin/src/CredentialsRequest.m create mode 100644 launchers/darwin/src/CustomUI.h create mode 100644 launchers/darwin/src/CustomUI.m create mode 100644 launchers/darwin/src/DisplayNameScreen.h create mode 100644 launchers/darwin/src/DisplayNameScreen.m create mode 100644 launchers/darwin/src/DownloadDomainContent.h create mode 100644 launchers/darwin/src/DownloadDomainContent.m create mode 100644 launchers/darwin/src/DownloadInterface.h create mode 100644 launchers/darwin/src/DownloadInterface.m create mode 100644 launchers/darwin/src/DownloadScripts.h create mode 100644 launchers/darwin/src/DownloadScripts.m create mode 100644 launchers/darwin/src/ErrorViewController.h create mode 100644 launchers/darwin/src/ErrorViewController.m create mode 100644 launchers/darwin/src/LatestBuildRequest.h create mode 100644 launchers/darwin/src/LatestBuildRequest.m create mode 100644 launchers/darwin/src/LaunchInterface.h create mode 100644 launchers/darwin/src/Launcher.h create mode 100644 launchers/darwin/src/Launcher.m create mode 100644 launchers/darwin/src/LoginScreen.h create mode 100644 launchers/darwin/src/LoginScreen.m create mode 100644 launchers/darwin/src/OrganizationRequest.h create mode 100644 launchers/darwin/src/OrganizationRequest.m create mode 100644 launchers/darwin/src/ProcessScreen.h create mode 100644 launchers/darwin/src/ProcessScreen.m create mode 100644 launchers/darwin/src/Settings.h create mode 100644 launchers/darwin/src/Settings.m create mode 100644 launchers/darwin/src/SplashScreen.h create mode 100644 launchers/darwin/src/SplashScreen.m create mode 100644 launchers/darwin/src/Window.h create mode 100644 launchers/darwin/src/Window.m create mode 100644 launchers/darwin/src/main.mm create mode 100644 launchers/win32/BUILD.md create mode 100644 launchers/win32/CMakeLists.txt create mode 100644 launchers/win32/Launcher.rc create mode 100644 launchers/win32/LauncherApp.cpp create mode 100644 launchers/win32/LauncherApp.h create mode 100644 launchers/win32/LauncherDlg.cpp create mode 100644 launchers/win32/LauncherDlg.h create mode 100644 launchers/win32/LauncherManager.cpp create mode 100644 launchers/win32/LauncherManager.h create mode 100644 launchers/win32/LauncherUtils.cpp create mode 100644 launchers/win32/LauncherUtils.h create mode 100644 launchers/win32/libs/json/json-forwards.h create mode 100644 launchers/win32/libs/json/json.h create mode 100644 launchers/win32/libs/jsoncpp.cpp create mode 100644 launchers/win32/libs/miniz.cpp create mode 100644 launchers/win32/libs/miniz.h create mode 100644 launchers/win32/res/Graphikbold.ttf create mode 100644 launchers/win32/res/Graphikregular.ttf create mode 100644 launchers/win32/res/HiFi_Logo_Large.png create mode 100644 launchers/win32/res/HiFi_Logo_Small.png create mode 100644 launchers/win32/res/HiFi_Voxel.png create mode 100644 launchers/win32/res/HiFi_Window.png create mode 100644 launchers/win32/res/Launcher.rc2 create mode 100644 launchers/win32/res/button.png create mode 100644 launchers/win32/res/interface.ico create mode 100644 launchers/win32/resource.h create mode 100644 launchers/win32/stdafx.cpp create mode 100644 launchers/win32/stdafx.h create mode 100644 launchers/win32/targetver.h diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt new file mode 100644 index 0000000000..499fc0440e --- /dev/null +++ b/launchers/darwin/CMakeLists.txt @@ -0,0 +1,104 @@ +cmake_minimum_required(VERSION 3.0) +project(HQLauncher) +set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") +set(src_files + src/Launcher.h + src/Launcher.m + src/SplashScreen.h + src/SplashScreen.m + src/LoginScreen.h + src/LoginScreen.m + src/DisplayNameScreen.h + src/DisplayNameScreen.m + src/ProcessScreen.h + src/ProcessScreen.m + src/Window.h + src/Window.m + src/DownloadInterface.h + src/DownloadInterface.m + src/DownloadDomainContent.h + src/DownloadDomainContent.m + src/DownloadScripts.h + src/DownloadScripts.m + src/CredentialsRequest.h + src/CredentialsRequest.m + src/LatestBuildRequest.h + src/LatestBuildRequest.m + src/OrganizationRequest.m + src/OrganizationRequest.h + src/ErrorViewController.h + src/ErrorViewController.m + src/Settings.h + src/Settings.m + src/LaunchInterface.h + src/CustomUI.h + src/CustomUI.m + src/main.mm + nib/Window.xib + nib/SplashScreen.xib + nib/ErrorScreen.xib + nib/LoginScreen.xib + nib/ProcessScreen.xib + nib/DisplayNameScreen.xib) + +set(APP_NAME "HQ Launcher") + +set(CMAKE_C_FLAGS "-x objective-c") +set(CMAKE_CXX_FLAGS "-x objective-c++") +set(CMAKE_EXE_LINKER_FLAGS "-framework Cocoa -framework AppKit -framework QuartzCore") + +set_target_properties(${this_target} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in) + + +set(MACOSX_BUNDLE_ICON_FILE "interface.icns") + +add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files}) +set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}) + + + +file(GLOB NIB_FILES "nib/*.xib") + +find_program(IBTOOL ibtool HINTS "/usr/bin" "${OSX_DEVELOPER_ROOT}/usr/bin") +foreach (nibFile ${NIB_FILES}) + get_filename_component(fileWithExtension ${nibFile} NAME) + string(REGEX REPLACE "\\.[^.]*$" "" file ${fileWithExtension}) + add_custom_command (TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${IBTOOL} --errors --warnings --notices + --output-format human-readable-text + --compile + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources/${file}.nib" + + ${CMAKE_CURRENT_SOURCE_DIR}/nib/${file}.xib) +endforeach() + + +add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/images "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${APP_NAME}.app/Contents/Resources/") + +install( + TARGETS HQLauncher + BUNDLE DESTINATION "." + COMPONENT applications +) + + +set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) + +include(CPackComponent) + +set(CPACK_PACKAGE_NAME "HQ Launcher") +set(CPACK_PACKAGE_VENDOR "High Fidelity") +set(CPACK_PACKAGE_VERSION ${BUILD_VERSION}) +set(CPACK_PACKAGE_FILE_NAME "HQ Launcher") + +set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME}) + +set(DMG_SUBFOLDER_NAME "High Fidelity") +set(ESCAPED_DMG_SUBFOLDER_NAME "") +set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc") + +set(CPACK_GENERATOR "DragNDrop") +include(CPack) diff --git a/launchers/darwin/cmake/installer/Thumbs.db b/launchers/darwin/cmake/installer/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..86bc943370371869ad9d9b95e647aa37f386685c GIT binary patch literal 7168 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 literal 0 HcmV?d00001 diff --git a/launchers/darwin/cmake/installer/install-folder.rsrc b/launchers/darwin/cmake/installer/install-folder.rsrc new file mode 100644 index 0000000000..8ce12afd3f --- /dev/null +++ b/launchers/darwin/cmake/installer/install-folder.rsrc @@ -0,0 +1,1634 @@ +data 'icns' (-16455) { + $"6963 6E73 0000 65EB 544F 4320 0000 0018" /* icns..eëTOC .... */ + $"6974 3332 0000 25C3 7438 6D6B 0000 4008" /* it32..%Ãt8mk..@. */ + $"6974 3332 0000 25C3 0000 0000 FF00 FF00" /* it32..%Ã....ÿ.ÿ. */ + $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ. */ + $"FF00 FF00 EE00 0005 A008 0007 D500 0309" /* ÿ.ÿ.î... ...Õ..Æ */ + $"549A BBA0 C102 C0A3 48D2 0003 2FB2 E4E3" /* Tš» Á.À£HÒ../²äã */ + $"A2DF 03E3 E176 01CF 0002 30C9 DDA5 D502" /* ¢ß.ãáv.Ï..0ÉÝ¥Õ. */ + $"D7DE 61CE 0002 0EB1 D6A7 D002 D2CC 2BCD" /* ×ÞaÎ...±Ö§Ð.ÒÌ+Í */ + $"0001 5BD4 A9CA 02D1 9A05 CB00 0202 9ACA" /* ..[Ô©Ê.Ñš.Ë...šÊ */ + $"AAC5 01CC 4FCB 0002 0EAF C1AA BF02 C2AF" /* ªÅ.ÌOË...¯Áª¿.¯ */ + $"16CA 0002 14AE BCAA BA03 B9C1 7F02 C900" /* .Ê...®¼ªº.¹Á..É. */ + $"0213 A9B6 ACB4 02BA 6503 C800 0212 A4B1" /* ..©¶¬´.ºe.È...¤± */ + $"ADAF 03B4 803B 26BA 2502 2415 0186 0002" /* ­¯.´€;&º%.$..†.. */ + $"129F ABAE A902 AEAE AAB9 A905 AAA9 A184" /* .Ÿ«®©.®®ª¹©.ª©¡„ */ + $"4003 8400 0211 9AA5 EFA4 04A5 A9AA 740E" /* @.„...š¥ï¤.¥©ªt. */ + $"8300 0211 949F 819E EC9D 049E 9EA6 7607" /* ƒ...”Ÿžì.žž¦v. */ + $"8200 0710 8F9A 9997 9698 9CEA 9F05 9E9A" /* ‚...š™—–˜œêŸ.žš */ + $"9797 A04A 8200 080F 8A94 919C B5CE DDE4" /* —— J‚...Š”‘œµÎÝä */ + $"E9E5 06E2 D5BA 9F94 840B 8100 050F 848F" /* éå.âÕºŸ”„....„ */ + $"B2E1 F9EE FF04 F6D3 A78F 2881 0003 0E80" /* ²áùîÿ.öÓ§(...€ */ + $"BEF6 F1FF 03FD DBA3 3881 0002 0BA1 F5F3" /* ¾öñÿ.ýÛ£8...¡õó */ + $"FF02 FECD 3C81 0001 16D1 F5FF 01ED 4781" /* ÿ.þÍ<...Ñõÿ.íG */ + $"0001 36F1 F5FF 01F9 5281 0001 43F7 F5FF" /* ..6ñõÿ.ùR..C÷õÿ */ + $"01FB 5A81 0002 43F6 FFF3 FE02 FFFB 5F81" /* .ûZ..Cöÿóþ.ÿû_ */ + $"0002 43F5 FFF3 FD02 FEFA 5F81 0002 43F5" /* ..Cõÿóý.þú_..Cõ */ + $"FEB5 FC06 FDFE FEFF FEFE FDB4 FC02 FDF9" /* þµü.ýþþÿþþý´ü.ýù */ + $"5F81 0002 43F5 FEB0 FC00 FD81 FF06 FAF2" /* _..Cõþ°ü.ýÿ.úò */ + $"EDEB EEF4 FD81 FF00 FDAF FC02 FDF9 5F81" /* íëîôýÿ.ý¯ü.ýù_ */ + $"0002 43F4 FDAD FB16 FCFF FFF6 D1A0 704B" /* ..Côý­û.üÿÿöÑ pK */ + $"3222 1A18 1B26 3854 7CAD DDFD FFFF FCAC" /* 2"...&8T|­Ýýÿÿü¬ */ + $"FB02 FCF8 5F81 0002 43F3 FCAB FA06 FCFF" /* û.üø_..Cóü«ú.üÿ */ + $"FAC4 732E 068A 0006 0E3E 89D7 FFFF FBAA" /* úÄs..Š...>‰×ÿÿûª */ + $"FA02 FBF8 5F81 0002 43F3 FBA9 F905 FAFF" /* ú.ûø_..Cóû©ù.úÿ */ + $"F3A1 3C02 8300 0608 131B 1D19 1005 8300" /* ó¡<.ƒ.........ƒ. */ + $"040C 55BC FDFF A9F9 02FA F75F 8100 0243" /* ..U¼ýÿ©ù.ú÷_..C */ + $"F3FB A7F9 04F8 FEFB A831 8200 0E26 5C91" /* óû§ù.øþû¨1‚..&\‘ */ + $"B9D4 E3EA ECE8 DFCE B083 4D19 8100 0501" /* ¹ÔãêìèßΰƒM.... */ + $"4DC7 FFFB F8A6 F902 FAF7 5F81 0002 43F2" /* MÇÿûø¦ù.ú÷_..Cò */ + $"FAA7 F802 FFD5 4E81 0003 1D6E BFEF 80FF" /* ú§ø.ÿÕN...n¿ï€ÿ */ + $"01FC FB80 FA08 FBFD FFFF FEE6 AC56 0D80" /* .üû€ú.ûýÿÿþæ¬V.€ */ + $"0004 0973 EDFF F7A5 F802 F9F6 5F81 0002" /* ..Æsíÿ÷¥ø.ùö_.. */ + $"43F1 F8A4 F704 F6F8 FE9F 1580 0005 238F" /* Cñø¤÷.öøþŸ.€..# */ + $"E6FF FDF8 8AF7 05F9 FFFE D570 0F80 0002" /* æÿýøŠ÷.ùÿþÕp.€.. */ + $"31C6 FFA5 F702 F8F5 5F81 0002 43F0 F7A4" /* 1Æÿ¥÷.øõ_..Cð÷¤ */ + $"F602 F9F7 7280 0004 0C7C E8FF F990 F603" /* ö.ù÷r€...|èÿùö. */ + $"FBFF D357 8000 030F A1FF F7A3 F602 F7F5" /* ûÿÓW€...¡ÿ÷£ö.÷õ */ + $"5F81 0002 43F0 F7A3 F602 F9F2 5880 0003" /* _..Cð÷£ö.ùòX€.. */ + $"37C8 FFF9 94F6 09FB FCA4 1900 0003 8AFE" /* 7Èÿù”öÆûü¤....Šþ */ + $"F7A2 F602 F7F5 5F81 0002 43F0 F6A2 F502" /* ÷¢ö.÷õ_..Cðö¢õ. */ + $"F8F2 5180 0002 63EE FC82 F501 F6F6 91F5" /* øòQ€..cîü‚õ.öö‘õ */ + $"02FF D539 8000 0186 FDA2 F502 F6F4 5F81" /* .ÿÕ9€..†ý¢õ.öô_ */ + $"0002 43EF F5A1 F408 F5F7 5D00 0001 7FFA" /* ..Cïõ¡ô.õ÷]....ú */ + $"F781 F405 F5FD F3F4 FDF5 90F4 07FB EA4F" /* ÷ô.õýóôýõô.ûêO */ + $"0000 0194 FEA1 F402 F5F3 5E81 0002 43EE" /* ...”þ¡ô.õó^..Cî */ + $"F4A1 F301 FC7D 8000 0286 FCF4 81F3 07F5" /* ô¡ó.ü}€..†üôó.õ */ + $"EF81 3335 88F2 F490 F307 F7F0 5200 0008" /* ï35ˆòôó.÷ðR... */ + $"B4FC A0F3 02F4 F25E 8100 0243 EEF3 A0F2" /* ´ü ó.ôò^..Cîó ò */ + $"07FB AE04 0000 77FB F382 F201 F86A 8100" /* .û®...wûó‚ò.øj. */ + $"0177 F991 F207 F6ED 4200 001D DBF7 9FF2" /* .wù‘ò.öíB...Û÷Ÿò */ + $"02F3 F25E 8100 0243 EDF2 9FF1 07F5 DF20" /* .óò^..CíòŸñ.õß */ + $"0000 53F5 F382 F102 F5D8 0D81 0002 15E0" /* ..Sõó‚ñ.õØ....à */ + $"F486 F101 F2F2 86F1 07F7 DD25 0000 50F5" /* ô†ñ.òò†ñ.÷Ý%..Põ */ + $"F29E F102 F2F1 5E81 0002 43EC F19F F006" /* òžñ.òñ^..CìñŸð. */ + $"F864 0000 25E1 F483 F002 F5CA 0481 0002" /* ød..%áôƒð.õÊ... */ + $"0AD4 F484 F005 F1F9 F4F5 F8F1 85F0 06F9" /* ÂÔô„ð.ñùôõøñ…ð.ù */ + $"B808 0000 A0F9 9EF0 02F1 F05E 8100 0243" /* ¸... ùžð.ñð^..C */ + $"EBF0 9EEF 06F6 BE06 0004 AEF8 84EF 02F1" /* ëðžï.ö¾...®ø„ï.ñ */ + $"E92C 8100 0237 EEF0 83EF 07F1 ED88 3E43" /* é,..7îðƒï.ñíˆ>C */ + $"99F2 F085 EF06 FA74 0000 25E5 F19D EF02" /* ™òð…ï.út..%åñï. */ + $"F0EF 5E81 0002 43EB F09E EF05 F54B 0000" /* ðï^..Cëðžï.õK.. */ + $"59F7 86EF 07F5 BA20 0000 26C3 F584 EF01" /* Y÷†ï.õº ..&Ãõ„ï. */ + $"F569 8100 0188 F785 EF06 F1E5 2500 0088" /* õi..ˆ÷…ï.ñå%..ˆ */ + $"F99D EF02 F0EF 5E81 0002 43EB F09D EF06" /* ùï.ðï^..Cëðï. */ + $"F5BE 0500 0DCC F486 EF07 EEFA B400 13D3" /* õ¾...Ìô†ï.îú´..Ó */ + $"F6EE 83EF 02F2 D20A 8100 021E E5F0 84EF" /* öîƒï.òÒÂ...åð„ï */ + $"07EE F898 0000 23E5 F09C EF02 F0EF 5E81" /* .îø˜..#åðœï.ðï^ */ + $"0002 43EB EF9D EE06 F760 0000 61F7 ED87" /* ..Cëïî.÷`..a÷í‡ */ + $"EE05 F4BD 0018 DFEF 84EE 01F3 BF82 0002" /* î.ô½..ßï„î.ó¿‚.. */ + $"0FD7 F085 EE07 EFE9 2A00 009D F6ED 9BEE" /* .×ð…î.ïé*..öí›î */ + $"02EF EF5E 8100 0243 EAEE 9CED 06EF DB16" /* .ïï^..Cêîœí.ïÛ. */ + $"0006 C0F3 88ED 05F3 BB00 17DD EF84 ED02" /* ..Àóˆí.ó»..Ýï„í. */ + $"EFE0 1E81 0000 3988 ED05 F788 0000 46F2" /* ïà...9ˆí.÷ˆ..Fò */ + $"9CED 02EE EE5E 8100 0243 E9ED 9CEC 05F4" /* œí.îî^..Céíœì.ô */ + $"9D00 003B EE89 EC05 F2BB 0017 DCEE 85EC" /* ..;î‰ì.ò»..Üî…ì */ + $"07F3 A715 0000 20BF F187 EC06 EFD3 1000" /* .ó§... ¿ñ‡ì.ïÓ.. */ + $"0DD0 EF9B EC02 EDED 5E81 0002 43E9 EC9C" /* .Ðï›ì.íí^..Céìœ */ + $"EB05 F459 0000 86F5 89EB 05F1 BA00 17DB" /* ë.ôY..†õ‰ë.ñº..Û */ + $"ED86 EB05 F7A4 0016 CFF2 89EB 05F1 4900" /* í†ë.÷¤..Ïò‰ë.ñI. */ + $"0096 F49B EB02 ECEC 5E81 0002 43E8 EB9B" /* .–ô›ë.ìì^..Cèë› */ + $"EA06 EBE4 2500 05C2 EF89 EA05 F0B9 0017" /* ê.ëä%..Âï‰ê.ð¹.. */ + $"DAEC 86EA 05F1 B300 1DE1 EC89 EA05 F48B" /* Úì†ê.ñ³..áì‰ê.ô‹ */ + $"0000 5AF3 9BEA 02EB EC5E 8100 0243 E7EA" /* ..Zó›ê.ëì^..Cçê */ + $"9BE9 06ED C607 0024 E3EA 89E9 05EF B800" /* ›é.íÆ..$ãê‰é.ï¸. */ + $"18E1 ED86 E905 F0B0 001C DFEB 89E9 06EE" /* .áí†é.ð°..ßë‰é.î */ + $"BE04 002D E7EA 9AE9 02EA EB5E 8100 0243" /* ¾..-çêšé.êë^..C */ + $"E7EA 9BE9 05F1 A400 004B F08A E907 EFB8" /* çê›é.ñ¤..KðŠé.ï¸ */ + $"000A 8AE0 F3EC 84E9 05F0 B000 1CDF EB89" /* .Šàóì„é.ð°..ßë‰ */ + $"E906 EBDC 1A00 11D3 EC9A E902 EAEB 5E81" /* é.ëÜ...Óìšé.êë^ */ + $"0002 43E7 E99B E805 F284 0000 6FF2 8AE8" /* ..Cçé›è.ò„..oòŠè */ + $"01EE B780 0004 2481 D6F2 EC82 E805 EFAF" /* .î·€..$Öòì‚è.ï¯ */ + $"001C DEEA 89E8 06E9 EA35 0002 BCEE 9AE8" /* ..Þê‰è.éê5..¼îšè */ + $"02E9 EA5E 8100 0243 E6E8 9BE7 05F1 6B00" /* .éê^..Cæè›ç.ñk. */ + $"008A F18A E70B EDB7 0003 0200 0019 70CB" /* .ŠñŠç.í·......pË */ + $"F0ED 80E7 05EE AF00 1CDD E98A E705 EF4E" /* ðí€ç.î¯..ÝéŠç.ïN */ + $"0000 A7EF 9AE7 02E8 E95E 8100 0243 E5E7" /* ..§ïšç.èé^..Cåç */ + $"9BE6 05EF 5B00 009B EF8A E614 ECB6 0017" /* ›æ.ï[..›ïŠæ.ì¶.. */ + $"A959 0B00 0010 60BF EDED E7ED AE00 1CDC" /* ©Y....`¿ííçí®..Ü */ + $"E88A E605 F05F 0000 97EF 9AE6 02E7 E95E" /* èŠæ.ð_..—ïšæ.çé^ */ + $"8100 0243 E4E6 9BE5 05ED 5300 00A3 ED8A" /* ..Cäæ›å.íS..£íŠ */ + $"E514 EBB5 0016 DCEF C367 1400 0008 50B1" /* å.ëµ..ÜïÃg....P± */ + $"E9F4 AE00 1CDB E78A E505 EF68 0000 8FEE" /* éô®..ÛçŠå.ïh..î */ + $"9AE5 02E6 E85E 8100 0243 E4E5 9BE4 05EC" /* šå.æè^..Cäå›ä.ì */ + $"5200 00A3 EC8A E414 EAB4 0016 D5E7 E9EE" /* R..£ìŠä.ê´..Õçéî */ + $"CD76 1D00 0002 42A9 A900 1CDA E68A E405" /* Ív....B©©..ÚæŠä. */ + $"EF68 0000 8EEE 9AE4 02E5 E75E 8100 0243" /* ïh..Žîšä.åç^..C */ + $"E3E4 9BE3 05EC 5900 009A EC8A E30C E9B3" /* ãä›ã.ìY..šìŠã.é³ */ + $"0016 D4E5 E3E3 E7ED D585 2880 0004 1E00" /* ..ÔåããçíÕ…(€.... */ + $"1CD9 E58A E305 ED5F 0000 95EC 9AE3 02E4" /* .ÙåŠã.í_..•ìšã.ä */ + $"E65E 8100 0243 E3E4 9BE3 05ED 6800 0089" /* æ^..Cãä›ã.íh..‰ */ + $"EC8A E305 E9B3 0016 D4E5 81E3 04E5 EDDC" /* ìŠã.é³..Ôåã.åíÜ */ + $"9435 8000 021C D9E5 8AE3 05EB 4E00 00A3" /* ”5€...ÙåŠã.ëN..£ */ + $"EA9A E302 E4E6 5E81 0002 43E3 E49B E305" /* êšã.äæ^..Cãä›ã. */ + $"EC80 0000 6FED 8AE3 05E9 B300 16D4 E583" /* ì€..oíŠã.é³..Ôåƒ */ + $"E308 E4EC E2A4 3B00 1CD9 E58A E305 E536" /* ã.äìâ¤;..ÙåŠã.å6 */ + $"0002 B6E8 9AE3 02E4 E65E 8100 0243 E2E3" /* ..¶èšã.äæ^..Câã */ + $"9BE2 05EA 9D00 004B E98A E205 E8B3 0016" /* ›â.ê..KéŠâ.è³.. */ + $"D3E4 85E2 06E3 EFAF 001B D8E4 89E2 06E4" /* Óä…â.ãï¯..Øä‰â.ä */ + $"D61A 000F CCE5 9AE2 02E3 E65D 8100 0243" /* Ö...Ìåšâ.ãæ]..C */ + $"E2E2 9BE1 06E5 BE06 0025 DCE2 89E1 05E7" /* ââ›á.å¾..%Üâ‰á.ç */ + $"B200 16D2 E386 E105 E7AA 001B D7E3 89E1" /* ²..Òã†á.çª..×ã‰á */ + $"06E6 B904 002A DEE2 9AE1 02E2 E55D 8100" /* .æ¹..*Þâšá.âå]. */ + $"0243 E1E1 9BE0 06E1 D921 0006 BCE4 89E0" /* .Cáá›à.áÙ!..¼ä‰à */ + $"05E6 B200 16D3 E286 E005 E6A9 001B D6E2" /* .æ²..Óâ†à.æ©..Öâ */ + $"89E0 05E9 8800 0054 E89B E002 E1E4 5D81" /* ‰à.éˆ..Tè›à.áä] */ + $"0002 43E0 E09C DF05 E751 0000 83E9 89DF" /* ..Cààœß.çQ..ƒé‰ß */ + $"05EA A900 12C6 E686 DF05 E5A8 001B D5E1" /* .ê©..Ææ†ß.å¨..Õá */ + $"89DF 05E6 4900 008B E89B DF02 E0E3 5D81" /* ‰ß.æI..‹è›ß.àã] */ + $"0002 43DF DF9C DE05 E691 0000 3BE2 88DE" /* ..CßßœÞ.æ‘..;âˆÞ */ + $"07E4 AF1F 0000 25B7 E385 DE05 E4A8 001B" /* .ä¯...%·ã…Þ.ä¨.. */ + $"D4E0 88DE 06E1 C911 000A C1E2 9BDE 02DF" /* ÔàˆÞ.áÉ..ÂÁâ›Þ.ß */ + $"E35D 8100 0243 DFDE 9CDD 06E0 CA12 0007" /* ã]..CßÞœÝ.àÊ... */ + $"B7E2 86DD 02DE D82A 8100 0234 DCDE 84DD" /* ·â†Ý.ÞØ*..4ÜÞ„Ý */ + $"05E3 A700 1BD3 DF88 DD05 E783 0000 3DE1" /* .ã§..Ó߈Ý.çƒ..=á */ + $"9DDD 01E2 5D81 0002 43DE DD9D DC05 E454" /* Ý.â]..CÞÝÜ.äT */ + $"0000 5FE5 86DC 02E1 B904 8100 0209 C3E0" /* .._å†Ü.á¹...ÆÃà */ + $"84DC 05E2 A700 1BD3 DE87 DC06 DDDA 2B00" /* „Ü.â§..ÓÞ‡Ü.ÝÚ+. */ + $"008D E59D DC01 E15D 8100 0243 DEDD 9DDC" /* .åÜ.á]..CÞÝÜ */ + $"06E2 AB03 000E C0E0 85DC 02DF C40C 8100" /* .â«...Àà…Ü.ßÄ.. */ + $"0213 CCDE 84DC 05E7 A300 18CE E287 DC06" /* ..ÌÞ„Ü.ç£..Îâ‡Ü. */ + $"E592 0000 1DD1 DE9D DC01 E15D 8100 0243" /* å’...ÑÞÜ.á]..C */ + $"DDDC 9DDB 07DC DF40 0000 57E4 DC84 DB02" /* ÝÜÛ.Üß@..WäÜ„Û. */ + $"DCE1 5E81 0001 6AE2 84DB 07E1 AF23 0001" /* Üá^..jâ„Û.á¯#.. */ + $"32C1 DF85 DB06 DDD5 2700 0077 E49E DB01" /* 2Áß…Û.ÝÕ'..wäžÛ. */ + $"E05D 8100 0243 DDDC 9DDB 08DA E1A9 0400" /* à]..CÝÜÛ.Úá©.. */ + $"05A5 E2DA 83DB 09DA DCD6 712C 2E78 D9DC" /* .¥âÚƒÛÆÚÜÖq,.xÙÜ */ + $"DA82 DB02 DCD4 2881 0001 42DE 84DB 07DA" /* Ú‚Û.ÜÔ(..BÞ„Û.Ú */ + $"E471 0000 1DCE DD9E DB01 E05D 8100 0243" /* äq...ÎÝžÛ.à]..C */ + $"DDDB 9FDA 07E0 5400 0027 CFDD D983 DA07" /* ÝÛŸÚ.àT..'ÏÝÙƒÚ. */ + $"D9DB E1D8 D9E1 DBD9 83DA 01DE B182 0002" /* ÙÛáØÙáÛÙƒÚ.Þ±‚.. */ + $"0FC7 DC82 DA08 D9E1 AD0A 0000 8AE2 D99E" /* .ÇÜ‚Ú.Ùá­Â..ŠâÙž */ + $"DA01 E05D 8100 0144 DCA0 D907 DCC4 1800" /* Ú.à]..DÜ Ù.ÜÄ.. */ + $"0052 DEDA 91D9 02DC B905 8100 0216 CCDA" /* .RÞÚ‘Ù.ܹ....ÌÚ */ + $"81D9 07D8 DDCB 2600 0041 DBA0 D901 DF5D" /* Ù.ØÝË&..AÛ Ù.ß] */ + $"8100 0144 DBA0 D807 D7E0 9402 0000 72E0" /* ..DÛ Ø.×à”...rà */ + $"92D8 01DA 4C81 0001 68DE 82D8 07DA D642" /* ’Ø.ÚL..hÞ‚Ø.ÚÖB */ + $"0000 16BE DCA0 D801 DE5D 8100 0144 DBA2" /* ...¾Ü Ø.Þ]..DÛ¢ */ + $"D707 DE66 0000 027F E0D8 90D7 07D9 CC5E" /* ×.Þf....àØ×.ÙÌ^ */ + $"2024 6ED4 D881 D707 DAD8 5100 0005 98DF" /* $nÔØ×.ÚØQ...˜ß */ + $"A1D7 01DD 5D81 0001 44DA A2D6 08D8 D74A" /* ¡×.Ý]..DÚ¢Ö.Ø×J */ + $"0000 0279 DDD8 90D6 05D8 DDCF D1DD D781" /* ...yÝØÖ.ØÝÏÑÝ× */ + $"D602 DBD2 4E80 0001 7ADE A2D6 01DC 5D81" /* Ö.ÛÒN€..zÞ¢Ö.Ü] */ + $"0001 44DA A3D6 02D9 D03F 8000 0260 D4DB" /* ..DÚ£Ö.ÙÐ?€..`ÔÛ */ + $"91D6 01D7 D782 D602 DEC1 3A80 0002 6CDC" /* ‘Ö.×ׂÖ.ÞÁ:€..lÜ */ + $"D7A2 D601 DC5D 8100 0144 D9A4 D502 D9CE" /* ×¢Ö.Ü]..DÙ¤Õ.ÙÎ */ + $"4480 0003 38B5 DFD7 94D5 03D9 DC98 1C80" /* D€..8µß×”Õ.Ùܘ.€ */ + $"0002 6FDB D6A3 D501 DC5D 8100 0144 D8A5" /* ..oÛÖ£Õ.Ü]..DØ¥ */ + $"D402 D8D2 5980 0004 0F75 CDDD D690 D40A" /* Ô.ØÒY€...uÍÝÖÔ */ + $"D7DD BD55 0200 0009 82DB D5A4 D401 DB5D" /* ×ݽU...Æ‚ÛÕ¤Ô.Û] */ + $"8100 0144 D8A6 D303 D5D8 7F0D 8000 0526" /* ..DئÓ.ÕØ..€..& */ + $"85CA DCD8 D48A D305 D5DA DBBD 6A13 8000" /* …ÊÜØÔŠÓ.ÕÚÛ½j.€. */ + $"0323 A2DC D4A5 D301 DA5D 8100 0144 D7A7" /* .#¢ÜÔ¥Ó.Ú]..Dק */ + $"D203 D3DB AE39 8100 141F 68AB D0DB DAD8" /* Ò.ÓÛ®9...h«ÐÛÚØ */ + $"D5D4 D4D3 D4D4 D6D8 DBD9 C99C 5411 8000" /* ÕÔÔÓÔÔÖØÛÙÉœT.€. */ + $"0303 57C5 D9A7 D201 D95D 8100 0144 D6A9" /* ..WÅÙ§Ò.Ù]..DÖ© */ + $"D103 D7D1 8422 8100 0F04 2859 85A5 B9C5" /* Ñ.×Ñ„"...(Y…¥¹Å */ + $"CACB C9C3 B59D 7A4B 1C82 0003 389F D8D4" /* ÊËÉõzK.‚..8ŸØÔ */ + $"A8D1 01D9 5D81 0001 44D6 AAD0 04D1 D9C7" /* ¨Ñ.Ù]..DÖªÐ.ÑÙÇ */ + $"7D2A 8400 060B 161E 201C 1408 8300 0506" /* }*„..... ...ƒ... */ + $"3D95 D1D7 D1A9 D001 D85C 8100 0144 D6AC" /* =•Ñ×Ñ©Ð.Ø\..DÖ¬ */ + $"D006 D2D9 CD9B 551F 018A 0006 072A 68AB" /* Ð.ÒÙÍ›U..Š...*h« */ + $"D4D7 D1AB D001 D85C 8100 0144 D6AD D016" /* Ô×Ñ«Ð.Ø\..DÖ­Ð. */ + $"CFD1 D6D8 C8A5 7A52 3521 150F 0D10 1825" /* ÏÑÖØÈ¥zR5!.....% */ + $"3B5C 85AF CED8 D4AE D001 D85C 8100 0144" /* ;\…¯ÎØÔ®Ð.Ø\..D */ + $"D5B1 CF0F D0D4 D7D7 D1C9 C1BC BABD C3CC" /* Õ±Ï.ÐÔ××ÑÉÁ¼º½ÃÌ */ + $"D3D7 D7D3 B1CF 01D7 5C81 0001 44D4 B6CE" /* Ó××Ó±Ï.×\..DԶΠ*/ + $"00CF 81D0 01CF CFB5 CE01 D65C 8100 0144" /* .ÏÐ.ÏϵÎ.Ö\..D */ + $"D3F5 CD01 D65C 8100 0144 D3F5 CC01 D55C" /* ÓõÍ.Ö\..DÓõÌ.Õ\ */ + $"8100 0144 D2F5 CB01 D45C 8100 0144 D1F5" /* ..DÒõË.Ô\..DÑõ */ + $"CA01 D35C 8100 0144 D1F5 CA01 D35C 8100" /* Ê.Ó\..DÑõÊ.Ó\. */ + $"0144 D1F5 C901 D35C 8100 0144 D0F5 C801" /* .DÑõÉ.Ó\..DÐõÈ. */ + $"D25C 8100 0144 CFF5 C801 D15C 8100 0244" /* Ò\..DÏõÈ.Ñ\..D */ + $"C7BA F3BB 02BA C85B 8100 0144 C6F5 BA01" /* Ǻó».ºÈ[..DÆõº. */ + $"C75B 8100 0144 CAF5 C001 CC5C 8100 0144" /* Ç[..DÊõÀ.Ì\..D */ + $"CEF5 C501 CF5C 8100 0144 D1F5 CA01 D35C" /* ÎõÅ.Ï\..DÑõÊ.Ó\ */ + $"8100 0144 D5F5 CF01 D75C 8100 0144 D9F5" /* ..DÕõÏ.×\..DÙõ */ + $"D401 DB5D 8100 0146 DEF5 DA01 E05E 8100" /* Ô.Û]..FÞõÚ.à^. */ + $"022A B5B8 F4B7 01BF 5382 0000 07F5 0801" /* .*µ¸ô·.¿S‚...õ.. */ + $"0904 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* Æ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ. */ + $"FF00 FF00 FF00 FF00 FF00 E700 FF00 FF00" /* ÿ.ÿ.ÿ.ÿ.ÿ.ç.ÿ.ÿ. */ + $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ. */ + $"FF00 FF00 EE00 0004 A008 0007 D500 0409" /* ÿ.ÿ.î... ...Õ..Æ */ + $"5399 BAC1 A0C0 01A2 48D2 0004 2FB1 E3E2" /* S™ºÁ À.¢HÒ../±ãâ */ + $"DFA1 DE03 E2E0 7601 CF00 0230 C9DC A4D5" /* ß¡Þ.âàv.Ï..0ÉÜ¤Õ */ + $"03D4 D6DD 60CE 0002 0EB0 D5A7 CF02 D1CB" /* .ÔÖÝ`Î...°Õ§Ï.ÑË */ + $"2BCD 0001 5BD3 A9C9 02D0 9905 CB00 0202" /* +Í..[Ó©É.Й.Ë... */ + $"99C9 AAC4 01CB 4FCB 0002 0EAE C0AA BE02" /* ™ÉªÄ.ËOË...®Àª¾. */ + $"C1AE 16CA 0002 13AD BAAB B802 C07F 02C9" /* Á®.Ê...­º«¸.À..É */ + $"0002 13A8 B5AC B302 B964 03C8 0002 12A2" /* ...¨µ¬³.¹d.È...¢ */ + $"AFAC AD04 AEB2 7F3B 26BA 2502 2415 0186" /* ¯¬­.®².;&º%.$..† */ + $"0002 129D AAAE A801 ADAD BCA8 03A0 8240" /* ...ª®¨.­­¼¨. ‚@ */ + $"0384 0002 1198 A3EF A204 A3A7 A973 0D83" /* .„...˜£ï¢.£§©s.ƒ */ + $"0002 1192 9D81 9CEC 9B04 9C9C A474 0782" /* ...’œì›.œœ¤t.‚ */ + $"0007 108D 9897 9594 969A EA9D 059C 9895" /* ...˜—•”–šê.œ˜• */ + $"959E 4982 0008 0F88 928F 9AB4 CDDD E4E9" /* •žI‚...ˆ’š´ÍÝäé */ + $"E506 E2D5 B99E 9282 0B81 0005 0F82 8DB1" /* å.âÕ¹ž’‚....‚± */ + $"E1F9 EEFF 04F6 D2A6 8D28 8100 030D 7EBD" /* áùîÿ.öÒ¦(...~½ */ + $"F6F1 FF03 FDDB A137 8100 020A A0F6 F3FF" /* öñÿ.ýÛ¡7.. öóÿ */ + $"02FE CD3B 8100 0116 D1F5 FF01 ED46 8100" /* .þÍ;...Ñõÿ.íF. */ + $"0136 F1F5 FF01 F852 8100 0143 F7F5 FF01" /* .6ñõÿ.øR..C÷õÿ. */ + $"FB5A 8100 0243 F6FF F3FE 02FF FB5F 8100" /* ûZ..Cöÿóþ.ÿû_. */ + $"0243 F5FF F3FD 02FE FA5F 8100 0243 F5FE" /* .Cõÿóý.þú_..Cõþ */ + $"B6FC 82FD B5FC 02FD F95F 8100 0243 F4FD" /* ¶ü‚ýµü.ýù_..Côý */ + $"B0FB 0FFC FDFF FFFE FBF7 F5F5 F6F8 FBFE" /* °û.üýÿÿþû÷õõöøûþ */ + $"FFFF FDB0 FB02 FCF8 5F81 0002 43F4 FDAE" /* ÿÿý°û.üø_..Côý® */ + $"FB14 FDFF F9EB D8C6 B7AE A8A5 A4A5 A9B0" /* û.ýÿùëØÆ·®¨¥¤¥©° */ + $"BBCA DDEF FCFF FDAD FB02 FCF8 5F81 0002" /* »ÊÝïüÿý­û.üø_.. */ + $"43F3 FCAB FA08 FBFE FAE6 C6AC 9D97 9785" /* Cóü«ú.ûþúæƬ——… */ + $"9809 9797 98A0 B2CF EDFD FDFB AAFA 02FB" /* ˜Æ——˜ ²Ïíýýûªú.û */ + $"F85F 8100 0243 F3FB A9F9 1DFA FDF7 D8B1" /* ø_..Cóû©ù.úý÷ر */ + $"9B97 9999 9797 9A9E A2A5 A6A5 A19D 9997" /* ›—™™——šž¢¥¦¥¡™— */ + $"9899 9897 9FBA E3FB FCA9 F902 FAF7 5F81" /* ˜™˜—Ÿºãûü©ù.ú÷_ */ + $"0002 43F3 FBA7 F922 F8FB FADA AC98 9899" /* ..Cóû§ù"øûúÚ¬˜˜™ */ + $"979B A9BD D1E1 EBF0 F3F4 F2EF E8DD CCB7" /* —›©½ÑáëðóôòïèÝÌ· */ + $"A499 989A 979A B7E6 FCFA F8A6 F902 FAF7" /* ¤™˜š—š·æüúø¦ù.ú÷ */ + $"5F81 0002 43F2 FAA7 F802 FBEB B780 991C" /* _..Còú§ø.ûë·€™. */ + $"98A5 C4E2 F5FB FCFA F9F9 F8F8 F9F9 FAFB" /* ˜¥Äâõûüúùùøøùùúû */ + $"FCFA F1DB BB9F 979A 979D C6F4 FAA6 F802" /* üúñÛ»Ÿ—š—Æôú¦ø. */ + $"F9F6 5F81 0002 43F1 F8A6 F70A FAD6 A197" /* ùö_..Cñø¦÷ÂúÖ¡— */ + $"9A97 A7D0 F1FB F98B F70B F8FA FAEA C4A0" /* š—§Ðñûù‹÷.øúúêÄ  */ + $"989A 97AC E5FA A5F7 02F8 F55F 8100 0243" /* ˜š—¬åú¥÷.øõ_..C */ + $"F0F7 A4F6 0AF7 F6C5 999A 989E C8F1 FAF7" /* ð÷¤öÂ÷öÅ™š˜žÈñú÷ */ + $"90F6 09F8 FAE9 BB99 9998 9FD6 F9A4 F602" /* öÆøúé»™™˜ŸÖù¤ö. */ + $"F7F5 5F81 0002 43F0 F6A3 F509 F6F3 BB97" /* ÷õ_..Cðö£õÆöó»— */ + $"9A97 AEE4 F9F6 94F5 08F7 F7D7 A398 9A9A" /* š—®äùö”õ.÷÷×£˜šš */ + $"CEF8 A3F5 02F6 F45F 8100 0243 EFF5 A2F4" /* Îø£õ.öô_..Cïõ¢ô */ + $"08F5 F3B8 979A 98BF F2F7 98F4 07F8 E9AF" /* .õó¸—š˜¿ò÷˜ô.øé¯ */ + $"989A 99CC F7A2 F402 F5F3 5E81 0002 43EF" /* ˜š™Ì÷¢ô.õó^..Cï */ + $"F5A2 F407 F5BD 979A 99C9 F6F5 82F4 03F7" /* õ¢ô.õ½—š™Éöõ‚ô.÷ */ + $"F4F4 F791 F407 F6F1 B797 9A99 D1F7 A1F4" /* ôô÷‘ô.öñ·—š™Ñ÷¡ô */ + $"02F5 F35E 8100 0243 EEF4 A1F3 07F6 C897" /* .õó^..Cîô¡ó.öÈ— */ + $"9A99 CBF6 F481 F305 F4F2 CAAC ADCC 92F3" /* š™Ëöôó.ôòʬ­Ì’ó */ + $"07F5 F2B8 989A 9CDC F6A0 F302 F4F2 5E81" /* .õò¸˜šœÜö ó.ôò^ */ + $"0002 43EE F3A0 F206 F5DA 9B9A 98C6 F583" /* ..Cîó ò.õÚ›š˜Æõƒ */ + $"F207 F4C1 9699 9996 C6F5 91F2 07F3 F0B3" /* ò.ôÁ–™™–Æõ‘ò.óð³ */ + $"9899 A5EA F49F F202 F3F2 5E81 0002 43ED" /* ˜™¥êôŸò.óò^..Cí */ + $"F29F F107 F2EB A699 98B9 F3F2 82F1 09F2" /* òŸñ.ò릙˜¹óò‚ñÆò */ + $"E8A0 9A9B 9B9A A2EB F291 F106 F3EA A799" /* è š››š¢ëò‘ñ.ó꧙ */ + $"97B8 F39F F102 F2F1 5E81 0002 43EC F19F" /* —¸óŸñ.òñ^..CìñŸ */ + $"F006 F3BF 9799 A8EB F283 F002 F2E3 9C80" /* ð.ó¿—™¨ëòƒð.ò㜀 */ + $"9B03 9A9F E6F1 84F0 04F1 F3F1 F2F3 86F0" /* ›.šŸæñ„ð.ñóñòó†ð */ + $"06F3 DC9C 9A99 D4F4 9EF0 02F1 F05E 8100" /* .óÜœš™Ôôžð.ñð^. */ + $"0243 EBF0 9EEF 06F2 DE9C 9A9B D8F3 84EF" /* .Cëðžï.òÞœš›Øó„ï */ + $"09F0 EDAA 989B 9B97 AEEF F083 EF07 F0EF" /* Æðíª˜››—®ïðƒï.ðï */ + $"CBB0 B2D1 F0F0 85EF 06F3 C498 99A8 ECF0" /* Ë°²Ñðð…ï.óĘ™¨ìð */ + $"9DEF 02F0 EF5E 8100 0243 EBEF 9EEE 05F0" /* ï.ðï^..Cëïžî.ð */ + $"B598 98BA F186 EE07 F1DC A59A 9AA7 DFF0" /* µ˜˜ºñ†î.ñÜ¥šš§ßð */ + $"84EE 07F0 C096 9898 97CB F185 EE06 EFEB" /* „î.ðÀ–˜˜—Ëñ…î.ïë */ + $"A899 98CB F29D EE02 EFEF 5E81 0002 43EB" /* ¨™˜Ëòî.ïï^..Cë */ + $"EF9D EE07 F0DD 9C9A 9FE2 EFED 85EE 07ED" /* ïî.ðÝœšŸâïí…î.í */ + $"F1DA 9AA1 E4F0 ED83 EE08 EFE3 9E9A 9B9B" /* ñÚš¡äðíƒî.ïãžš›› */ + $"99A6 EA85 EE06 EDF1 D099 99A7 EA9D EE02" /* ™¦ê…î.íñЙ™§êî. */ + $"EFEF 5E81 0002 43EA EE9D ED05 F0BC 9798" /* ïï^..Cêîí.ð¼—˜ */ + $"BDF0 88ED 05EF DD9A A3E8 EE84 ED01 EFDD" /* ½ðˆí.ïÝš£èî„í.ïÝ */ + $"819B 039A A0E5 EE86 ED05 EBAA 9998 D1F0" /* ›.š åî†í.몙˜Ñð */ + $"9CED 02EE EE5E 8100 0243 EAEE 9CED 06EE" /* œí.îî^..Cêîœí.î */ + $"E6A3 9A9C DDEF 88ED 05EF DC9A A3E7 EE85" /* 棚œÝïˆí.ïÜš£çî… */ + $"ED06 E8A6 989B 9B97 AF88 ED05 F0CA 9898" /* í.覘››—¯ˆí.ðʘ˜ */ + $"B3EE 9CED 02EE EE5E 8100 0243 E9ED 9CEC" /* ³îœí.îî^..Céíœì */ + $"05EF D199 99AF ED89 EC05 EEDB 9AA3 E7ED" /* .ïÑ™™¯í‰ì.îÛš£çí */ + $"85EC 07EE D4A1 9A9A A5DC EE87 EC06 EDE3" /* …ì.îÔ¡šš¥Üî‡ì.íã */ + $"A09A 9FE2 ED9B EC02 EDED 5E81 0002 43E9" /*  šŸâí›ì.íí^..Cé */ + $"EC9C EB05 EEB9 9898 C9EE 89EB 05ED DA9A" /* ìœë.˜Éî‰ë.íÚš */ + $"A3E6 EC86 EB05 EFD2 99A2 E1EE 89EB 05ED" /* £æì†ë.ïÒ™¢áî‰ë.í */ + $"B498 98CE EE9B EB02 ECEC 5E81 0002 43E8" /* ´˜˜Îî›ë.ìì^..Cè */ + $"EB9C EA05 E8A7 999C DCEC 89EA 05EC D99A" /* ëœê.觙œÜì‰ê.ìÙš */ + $"A3E5 EB86 EA05 ECD8 99A5 E7EB 89EA 05ED" /* £åë†ê.ìØ™¥çë‰ê.í */ + $"CA98 98BA ED9B EA02 EBEC 5E81 0002 43E7" /* ʘ˜ºí›ê.ëì^..Cç */ + $"EA9B E905 EADD 9D99 A7E7 8AE9 05EB D99A" /* ê›é.êÝ™§çŠé.ëÙš */ + $"A3E7 EB86 E905 EBD6 99A5 E6EA 89E9 05EB" /* £çë†é.ëÖ™¥æê‰é.ë */ + $"DA9C 99AA E89B E902 EAEB 5E81 0002 43E7" /* Úœ™ªè›é.êë^..Cç */ + $"E99B E805 EBD1 9998 B4EA 8AE8 07EA D89B" /* é›è.ëÑ™˜´êŠè.êØ› */ + $"9DC8 E5EB E984 E805 EAD5 99A4 E5E9 89E8" /* Èåëé„è.êÕ™¤åé‰è */ + $"06E9 E4A4 99A1 E1E9 9AE8 02E9 EA5E 8100" /* .é䤙¡áéšè.éê^. */ + $"0243 E6E8 9BE7 05EA C698 98C0 EA8A E709" /* .Cæè›ç.êƘ˜ÀêŠçÆ */ + $"E9D7 9B9A 98A6 C5E1 EAE8 82E7 05E9 D499" /* é×›š˜¦Åáêè‚ç.éÔ™ */ + $"A4E4 E88A E705 E8AC 999C D9E9 9AE7 02E8" /* ¤äèŠç.謙œÙéšç.è */ + $"E95E 8100 0243 E5E7 9BE6 05E9 BE98 98C8" /* é^..Cåç›æ.龘˜È */ + $"E98A E60B E8D6 9B9C 9C97 97A2 BFDD E9E8" /* éŠæ.èÖ›œœ——¢¿Ýéè */ + $"80E6 05E8 D499 A4E3 E78A E605 E9B4 9899" /* €æ.èÔ™¤ãçŠæ.é´˜™ */ + $"D1E9 9AE6 02E7 E95E 8100 0243 E5E7 9BE6" /* Ñéšæ.çé^..Cåç›æ */ + $"05E9 B998 99CE E98A E614 E8D6 9AA2 D2B8" /* .鹘™ÎéŠæ.èÖš¢Ò¸ */ + $"9E97 979F BAD9 E8E8 E6E8 D499 A4E3 E78A" /* ž——ŸºÙèèæèÔ™¤ãçŠ */ + $"E605 E9BA 9898 CCE9 9AE6 02E7 E95E 8100" /* æ.麘˜Ìéšæ.çé^. */ + $"0243 E4E6 9BE5 05E8 B698 99D0 E88A E514" /* .Cäæ›å.趘™ÐèŠå. */ + $"E7D5 9AA2 E2E9 DABC A197 979D B5D4 E7EA" /* çÕš¢âéÚ¼¡——µÔçê */ + $"D499 A4E2 E68A E505 E8BD 9898 C9E8 9AE5" /* Ô™¤âæŠå.轘˜Éèšå */ + $"02E6 E85E 8100 0243 E4E5 9BE4 05E7 B698" /* .æè^..Cäå›ä.綘 */ + $"99CF E78A E414 E6D5 9AA2 DFE6 E6E8 DDC1" /* ™ÏçŠä.æÕš¢ßææèÝÁ */ + $"A398 969B AFD1 D299 A4E1 E58A E405 E7BC" /* £˜–›¯ÑÒ™¤áåŠä.ç¼ */ + $"9898 C9E7 9AE4 02E5 E75E 8100 0243 E4E4" /* ˜˜Éçšä.åç^..Cää */ + $"9BE3 05E6 B798 99CC E68A E314 E5D5 9AA2" /* ›ã.æ·˜™ÌæŠã.åÕš¢ */ + $"DEE4 E3E3 E5E7 DFC5 A799 979A A49A A4E0" /* Þäããåçßŧ™—š¤š¤à */ + $"E48A E305 E7B9 9899 CAE6 9AE3 02E4 E65E" /* äŠã.繘™Êæšã.äæ^ */ + $"8100 0243 E3E4 9BE3 05E6 BC98 98C6 E68A" /* ..Cãä›ã.漘˜ÆæŠ */ + $"E305 E5D4 9AA2 DEE4 82E3 09E6 E0C9 AB99" /* ã.åÔš¢Þä‚ãÆæàÉ«™ */ + $"989A A4E0 E48A E305 E5B4 9899 CEE5 9AE3" /* ˜š¤àäŠã.å´˜™Îåšã */ + $"02E4 E65E 8100 0243 E2E3 9BE2 05E5 C398" /* .äæ^..Câã›â.åØ */ + $"98BD E58A E205 E4D3 9AA2 DDE3 84E2 07E4" /* ˜½åŠâ.äÓš¢Ýã„â.ä */ + $"E2CE AD99 A4DF E38B E204 AC99 9BD4 E39A" /* âέ™¤ßã‹â.¬™›Ôãš */ + $"E202 E3E6 5D81 0002 43E2 E29B E105 E3CC" /* â.ãæ]..Cââ›á.ãÌ */ + $"9998 B2E3 8AE1 05E3 D29A A2DC E286 E105" /* ™˜²ãŠá.ãÒš¢Üâ†á. */ + $"E5D1 99A3 DEE2 8AE1 05DD A399 A0DA E29A" /* åÑ™£ÞâŠá.Ý£™ Úâš */ + $"E102 E2E5 5D81 0002 43E1 E19B E005 E1D5" /* á.âå]..Cáá›à.áÕ */ + $"9D99 A6DE 8AE0 05E2 D29A A2DB E186 E004" /* ™¦ÞŠà.âÒš¢Ûá†à. */ + $"E2CF 99A3 DD8A E005 E1D4 9C99 A8DF 9BE0" /* âÏ™£ÝŠà.áÔœ™¨ß›à */ + $"02E1 E45D 8100 0243 E0E0 9CDF 05DD A599" /* .áä]..Cààœß.Ý¥™ */ + $"9DD4 E089 DF05 E1D1 9AA2 DBE0 86DF 04E1" /* Ôà‰ß.áÑš¢Ûà†ß.á */ + $"CE99 A3DC 8ADF 05E2 C498 98B4 E19B DF02" /* Ι£ÜŠß.âĘ˜´á›ß. */ + $"E0E3 5D81 0002 43DF DF9C DE05 E0B3 9898" /* àã]..CßßœÞ.೘˜ */ + $"C2E1 89DE 05E1 CE9A A0D7 E086 DE04 E0CE" /* Âá‰Þ.áΚ ×à†Þ.àÎ */ + $"99A3 DB8A DE05 E0B1 9999 C5E1 9BDE 02DF" /* ™£ÛŠÞ.à±™™Åá›Þ.ß */ + $"E35D 8100 0243 DFDF 9CDE 05E1 C799 99AD" /* ã]..CßßœÞ.áÇ™™­ */ + $"DF88 DE07 E0D0 A39A 9AA5 D2DF 85DE 04E0" /* ߈Þ.àУšš¥Òß…Þ.à */ + $"CE99 A3DB 89DE 06DF D8A0 9A9E D5DF 9BDE" /* Ι£Û‰Þ.ßØ šžÕß›Þ */ + $"02DF E35D 8100 0243 DFDE 9CDD 06DE D7A0" /* .ßã]..CßÞœÝ.Þ×  */ + $"9A9C D2DF 86DD 07DE DCA7 989B 9B98 AA86" /* šœÒ߆Ý.Þܧ˜››˜ª† */ + $"DD04 DFCD 99A3 DA89 DD05 E0C2 9899 ADDE" /* Ý.ßÍ™£Ú‰Ý.à˜™­Þ */ + $"9DDD 01E2 5D81 0002 43DE DD9D DC05 DFB4" /* Ý.â]..CÞÝÜ.ß´ */ + $"9898 B7DF 86DC 02DD D29C 809B 039A 9ED5" /* ˜˜·ß†Ü.ÝÒœ€›.šžÕ */ + $"DD84 DC04 DECC 99A3 DA88 DC06 DDDB A899" /* Ý„Ü.ÞÌ™£ÚˆÜ.ÝÛ¨™ */ + $"99C5 DF9D DC01 E15D 8100 0243 DDDC 9DDB" /* ™ÅßÜ.á]..CÝÜÛ */ + $"06DD CD9B 9A9F D3DD 85DB 09DC D49E 9A9B" /* .ÝÍ›šŸÓÝ…ÛÆÜÔžš› */ + $"9B9A A1D7 DC84 DB05 DFCA 99A2 D7DD 87DB" /* ›š¡×Ü„Û.ßÊ™¢×Ý‡Û */ + $"06DE C699 9AA3 D8DC 9DDB 01E0 5D81 0002" /* .ÞÆ™š£ØÜÛ.à].. */ + $"43DD DB9E DA05 DCAE 9998 B4DD 86DA 07DC" /* CÝÛžÚ.Ü®™˜´Ý†Ú.Ü */ + $"B697 9999 97BA DC84 DA07 DCCE A49A 9BA9" /* ¶—™™—ºÜ„Ú.ÜΤš›© */ + $"D3DC 85DA 06DB D8A6 9A98 BEDD 9EDA 01E0" /* ÓÜ…Ú.Ûئš˜¾ÝžÚ.à */ + $"5D81 0002 43DD DB9E DA07 DBCB 9B9A 9BCA" /* ]..CÝÛžÚ.ÛË›š›Ê */ + $"DCD9 85DA 05D8 BBA7 A7BD D985 DA07 D8A6" /* ÜÙ…Ú.Ø»§§½Ù…Ú.ئ */ + $"989B 9B98 AEDB 84DA 06D9 DCBB 989A A3D6" /* ˜››˜®Û„Ú.ÙÜ»˜š£Ö */ + $"9FDA 01E0 5D81 0001 44DB A0D9 07DA B398" /* ŸÚ.à]..DÛ Ù.Ú³˜ */ + $"99A6 D6D9 D883 D907 D8D9 DBD8 D8DB D9D8" /* ™¦ÖÙ؃Ù.ØÙÛØØÛÙØ */ + $"83D9 01DA CD81 9B02 9A9F D383 D908 D8DB" /* ƒÙ.ÚÍ›.šŸÓƒÙ.ØÛ */ + $"CC9D 9A99 C2DB D89E D901 DF5D 8100 0144" /* Ìš™ÂÛØžÙ.ß]..D */ + $"DBA0 D806 D9D2 A29A 98B2 D992 D802 D9CF" /* Û Ø.ÙÒ¢š˜²Ù’Ø.ÙÏ */ + $"9C80 9B02 9AA1 D483 D805 D9D4 A599 99AD" /* œ€›.š¡ÔƒØ.ÙÔ¥™™­ */ + $"A1D8 01DE 5D81 0001 44DB A1D7 06D9 C49A" /* ¡Ø.Þ]..DÛ¡×.ÙÄš */ + $"9B99 BBD9 92D7 07D8 B097 9A9A 97B8 D982" /* ›™»Ù’×.Ø°—šš—¸Ù‚ */ + $"D707 D8D7 AD99 9AA1 D0D8 A0D7 01DD 5D81" /* ×.Ø×­™š¡ÐØ ×.Ý] */ + $"0001 44DB A2D7 06D9 B799 9B9A BED9 91D7" /* ..DÛ¢×.Ù·™›š¾Ù‘× */ + $"06D8 D4B5 A3A4 B9D6 82D7 07D8 D7B1 989A" /* .ØÔµ£¤¹Ö‚×.Ø×±˜š */ + $"9BC5 D9A1 D701 DD5D 8100 0144 DAA4 D605" /* ›ÅÙ¡×.Ý]..DÚ¤Ö. */ + $"AF98 9A9B BCD8 92D6 03D8 D4D4 D882 D607" /* ¯˜š›¼Ø’Ö.ØÔÔØ‚Ö. */ + $"D7D5 B099 9B99 BCD8 A2D6 01DC 5D81 0001" /* ×Õ°™›™¼Ø¢Ö.Ü].. */ + $"44D9 A3D5 08D6 D3AC 999A 9AB5 D4D6 98D5" /* DÙ£Õ.ÖÓ¬™ššµÔÖ˜Õ */ + $"07D7 CFAA 999B 99B8 D7A3 D501 DC5D 8100" /* .×Ϫ™›™¸×£Õ.Ü]. */ + $"0144 D8A4 D409 D5D2 AD99 9B99 AACB D6D5" /* .DؤÔÆÕÒ­™›™ªËÖÕ */ + $"94D4 08D5 D6C4 A299 9A9A B9D5 A4D4 01DB" /* ”Ô.ÕÖÄ¢™šš¹Õ¤Ô.Û */ + $"5D81 0001 44D8 A5D3 0AD4 D2B2 999A 999E" /* ]..DØ¥ÓÂÔÒ²™š™ž */ + $"BAD1 D5D4 90D3 09D4 D5CD B19B 9A9A 9CBD" /* ºÑÕÔÓÆÔÕͱ›ššœ½ */ + $"D5A5 D301 DA5D 8100 0144 D7A6 D20B D3D4" /* Õ¥Ó.Ú]..DצÒ.ÓÔ */ + $"BC9E 999A 99A4 BED0 D5D3 8BD2 0BD3 D4D4" /* ¼ž™š™¤¾ÐÕÓ‹Ò.ÓÔÔ */ + $"CCB6 9F99 9A99 A3C5 D4A6 D201 D95D 8100" /* ̶Ÿ™š™£ÅÔ¦Ò.Ù]. */ + $"0144 D6A8 D10A D3C8 A999 9A9A 99A3 B6C7" /* .DÖ¨ÑÂÓÈ©™šš™£¶Ç */ + $"D180 D384 D280 D30A CFC3 B09F 999A 999B" /* Ñ€Ó„Ò€ÓÂÏ🙚™› */ + $"B1CE D3A7 D101 D95D 8100 0144 D6A9 D020" /* ±ÎÓ§Ñ.Ù]..DÖ©Ð */ + $"D2D0 BCA3 999A 9A99 9CA5 B1BD C5CA CDCE" /* Òм£™šš™œ¥±½ÅÊÍÎ */ + $"CFCE CDC9 C3BA AEA2 9A99 9A99 9AA9 C3D2" /* ÏÎÍÉú®¢š™š™š©ÃÒ */ + $"D1A8 D001 D85C 8100 0144 D6AB D01C D2CE" /* ѨÐ.Ø\..DÖ«Ð.ÒÎ */ + $"BBA5 9A99 9A9A 9999 9B9E A1A2 A3A2 A09D" /* »¥š™šš™™›ž¡¢£¢  */ + $"9A99 999A 9A99 9CAA C1D0 D2AA D001 D85C" /* š™™šš™œªÁÐÒªÐ.Ø\ */ + $"8100 0144 D5AC CF06 D0D2 CFC2 B0A2 9B80" /* ..DÕ¬Ï.ÐÒÏ°¢›€ */ + $"9984 9A80 9906 9CA5 B5C6 D0D1 D0AB CF01" /* ™„š€™.œ¥µÆÐÑЫÏ. */ + $"D75C 8100 0144 D5AF CF14 D0D1 CDC4 B9AF" /* ×\..DÕ¯Ï.ÐÑÍĹ¯ */ + $"A8A3 A09F 9E9F A1A4 A9B1 BCC7 CED1 D0AE" /* ¨£ ŸžŸ¡¤©±¼ÇÎÑЮ */ + $"CF01 D65C 8100 0144 D4B2 CE05 CFD0 D0CE" /* Ï.Ö\..DÔ²Î.ÏÐÐÎ */ + $"CCCA 80C9 05CB CDCF D0D0 CFB1 CE01 D65C" /* ÌÊ€É.ËÍÏÐÐϱÎ.Ö\ */ + $"8100 0144 D3F5 CD01 D65C 8100 0144 D3F5" /* ..DÓõÍ.Ö\..DÓõ */ + $"CC01 D55C 8100 0144 D2F5 CB01 D45C 8100" /* Ì.Õ\..DÒõË.Ô\. */ + $"0144 D1F5 CA01 D35C 8100 0144 D1F5 C901" /* .DÑõÊ.Ó\..DÑõÉ. */ + $"D35C 8100 0144 D1F5 C901 D35C 8100 0144" /* Ó\..DÑõÉ.Ó\..D */ + $"D0F5 C801 D25C 8100 0144 CFF5 C701 D15C" /* ÐõÈ.Ò\..DÏõÇ.Ñ\ */ + $"8100 0144 CFF5 C701 D05C 8100 0244 C6B8" /* ..DÏõÇ.Ð\..DƸ */ + $"F3B9 02B8 C75B 8100 0244 C5B8 F3B9 02B8" /* ó¹.¸Ç[..DŸó¹.¸ */ + $"C65B 8100 0144 C9F5 BF01 CB5C 8100 0144" /* Æ[..DÉõ¿.Ë\..D */ + $"CDF5 C401 CF5C 8100 0144 D1F5 C901 D35C" /* ÍõÄ.Ï\..DÑõÉ.Ó\ */ + $"8100 0144 D4F5 CE01 D65C 8100 0144 D8F5" /* ..DÔõÎ.Ö\..DØõ */ + $"D301 DA5D 8100 0146 DEF5 D901 E05E 8100" /* Ó.Ú]..FÞõÙ.à^. */ + $"022A B5B7 F4B6 01BE 5382 0000 07F5 0801" /* .*µ·ô¶.¾S‚...õ.. */ + $"0904 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* Æ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ. */ + $"FF00 FF00 FF00 FF00 FF00 E700 FF00 FF00" /* ÿ.ÿ.ÿ.ÿ.ÿ.ç.ÿ.ÿ. */ + $"FF00 FF00 FF00 FF00 FF00 FF00 FF00 FF00" /* ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ. */ + $"FF00 FF00 EE00 0004 A008 0007 D500 0409" /* ÿ.ÿ.î... ...Õ..Æ */ + $"549A BAC1 9EC0 03C1 C0A3 48D2 0004 2FB2" /* TšºÁžÀ.ÁÀ£HÒ../² */ + $"E3E3 DFA1 DE03 E2E1 7601 CF00 0230 C9DC" /* ããß¡Þ.âáv.Ï..0ÉÜ */ + $"A5D5 02D6 DD60 CE00 020E B0D6 A7CF 02D1" /* ¥Õ.ÖÝ`Î...°Ö§Ï.Ñ */ + $"CB2B CD00 025B D3C9 A7CA 03C9 D09A 05CB" /* Ë+Í..[ÓɧÊ.ÉК.Ë */ + $"0002 0299 CAAA C401 CB4F CB00 020E AEC1" /* ...™ÊªÄ.ËOË...®Á */ + $"AABE 02C1 AE16 CA00 0213 ADBB ABB9 02C0" /* ª¾.Á®.Ê...­»«¹.À */ + $"7F02 C900 0213 A8B5 ACB3 02B9 6503 C800" /* ..É...¨µ¬³.¹e.È. */ + $"0212 A3B0 ADAE 03B3 803B 26BA 2502 2415" /* ..£°­®.³€;&º%.$. */ + $"0186 0002 129E AAAE A802 ADAD A9BB A803" /* .†...žª®¨.­­©»¨. */ + $"A083 4003 8400 0211 98A4 AFA2 BDA3 04A4" /*  ƒ@.„...˜¤¯¢½£.¤ */ + $"A7A9 730E 8300 0211 939E 819D ED9C 039D" /* §©s.ƒ...“žíœ. */ + $"A575 0782 0007 108E 9897 9694 969B EA9E" /* ¥u.‚...Ž˜—–”–›êž */ + $"059D 9995 959F 4A82 0008 0F89 928F 9AB4" /* .™••ŸJ‚...‰’š´ */ + $"CDDD E4E9 E506 E2D5 B99E 9283 0B81 0005" /* ÍÝäéå.âÕ¹ž’ƒ... */ + $"0F82 8EB1 E1F9 EEFF 04F6 D2A7 8E28 8100" /* .‚Ž±áùîÿ.öÒ§Ž(. */ + $"030D 7FBD F6F1 FF03 FDDB A237 8100 020A" /* ...½öñÿ.ýÛ¢7.. */ + $"A0F6 F3FF 02FE CD3B 8100 0116 D1F5 FF01" /*  öóÿ.þÍ;...Ñõÿ. */ + $"ED46 8100 0136 F1F5 FF01 F852 8100 0143" /* íF..6ñõÿ.øR..C */ + $"F7F5 FF01 FB5A 8100 0243 F6FF F3FE 02FF" /* ÷õÿ.ûZ..Cöÿóþ.ÿ */ + $"FB5F 8100 0243 F5FF F3FD 02FE FA5F 8100" /* û_..Cõÿóý.þú_. */ + $"0243 F5FE B6FC 81FD B6FC 02FD F95F 8100" /* .Cõþ¶üý¶ü.ýù_. */ + $"0243 F5FE B1FC 05FD FEFF FEFC FA80 F805" /* .Cõþ±ü.ýþÿþüú€ø. */ + $"FAFC FEFF FEFD B0FC 02FD F95F 8100 0243" /* úüþÿþý°ü.ýù_..C */ + $"F4FD ADFB 15FC FDFE FAF1 E5D9 D0CA C6C4" /* ôý­û.üýþúñåÙÐÊÆÄ */ + $"C4C5 C7CB D2DC E8F4 FCFE FCAD FB02 FCF8" /* ÄÅÇËÒÜèôüþü­û.üø */ + $"5F81 0002 43F3 FCAB FA08 FBFD FAED DAC9" /* _..Cóü«ú.ûýúíÚÉ */ + $"BFBC BB86 BC07 BBBC C1CD DFF2 FCFC ABFA" /* ¿¼»†¼.»¼ÁÍßòüü«ú */ + $"02FB F85F 8100 0243 F3FB A9F9 1DFA FCF8" /* .ûø_..Cóû©ù.úüø */ + $"E5CC BEBB BCBD BCBC BDC0 C2C4 C5C4 C2BF" /* å̾»¼½¼¼½ÀÂÄÅÄ¿ */ + $"BDBC BCBD BCBB C1D2 EBFA FBA9 F902 FAF7" /* ½¼¼½¼»ÁÒëúû©ù.ú÷ */ + $"5F81 0002 43F3 FBA7 F90F F8FA F9E5 C9BC" /* _..Cóû§ù.øúùåɼ */ + $"BCBD BCBE C7D3 E0EA F0F3 80F5 0FF3 EEE7" /* ¼½¼¾ÇÓàêðó€õ.óîç */ + $"DDD0 C4BD BCBD BCBE D0ED FBF9 F8A6 F902" /* ÝÐĽ¼½¼¾Ðíûùø¦ù. */ + $"FAF7 5F81 0002 43F2 FAA7 F80E FAF0 D0BC" /* ú÷_..Còú§ø.úðм */ + $"BCBD BCC4 D7EA F6FA FAF9 F982 F80E F9FA" /* ¼½¼Ä×êöúúùù‚ø.ùú */ + $"FAF9 F4E6 D2C1 BCBD BCBF D9F5 F9A6 F802" /* úùôæÒÁ¼½¼¿Ùõù¦ø. */ + $"F9F6 5F81 0002 43F1 F8A6 F70A F8E3 C2BC" /* ùö_..Cñø¦÷Âøã¼ */ + $"BDBC C5DE F3F9 F88C F70A F9F9 EFD7 C1BC" /* ½¼ÅÞóùøŒ÷Âùùï×Á¼ */ + $"BDBB C9EC F9A5 F702 F8F5 5F81 0002 43F0" /* ½»Éìù¥÷.øõ_..Cð */ + $"F7A6 F607 D8BD BDBC C0DA F3F8 91F6 09F7" /* ÷¦ö.ؽ½¼ÀÚóø‘öÆ÷ */ + $"F8EE D1BD BDBC C1E3 F8A4 F602 F7F5 5F81" /* øîѽ½¼Áãø¤ö.÷õ_ */ + $"0002 43F0 F6A3 F509 F6F4 D2BC BEBC CAEB" /* ..Cðö£õÆöôÒ¼¾¼Êë */ + $"F7F6 94F5 08F6 F7E3 C3BC BDBE DDF7 A3F5" /* ÷ö”õ.ö÷ãü½¾Ý÷£õ */ + $"02F6 F45F 8100 0243 F0F6 A3F5 07F4 D0BC" /* .öô_..Cðö£õ.ôм */ + $"BEBC D4F3 F698 F507 F7EE CABC BDBD DCF7" /* ¾¼Ôóö˜õ.÷îʼ½½Ü÷ */ + $"A2F5 02F6 F45F 8100 0243 EFF5 A2F4 07F5" /* ¢õ.öô_..Cïõ¢ô.õ */ + $"D2BC BEBD DAF5 F582 F403 F6F4 F4F6 91F4" /* Ò¼¾½Úõõ‚ô.öôôö‘ô */ + $"07F5 F2CF BCBE BDDF F6A1 F402 F5F3 5E81" /* .õòϼ¾½ßö¡ô.õó^ */ + $"0002 43EE F4A1 F306 F5D9 BCBE BDDB F583" /* ..Cîô¡ó.õÙ¼¾½Ûõƒ */ + $"F304 F2DA C9C9 DC92 F307 F4F2 CFBC BDBF" /* ó.òÚÉÉÜ’ó.ôòϼ½¿ */ + $"E5F5 A0F3 02F4 F25E 8100 0243 EEF3 A0F2" /* åõ ó.ôò^..Cîó ò */ + $"06F4 E4BE BEBC D8F4 83F2 07F3 D5BB BDBC" /* .ôä¾¾¼Øôƒò.óÕ»½¼ */ + $"BBD8 F491 F207 F3F1 CCBC BDC4 EDF3 9FF2" /* »Øô‘ò.óñ̼½ÄíóŸò */ + $"02F3 F25E 8100 0243 EDF2 9FF1 07F2 EDC5" /* .óò^..CíòŸñ.òíÅ */ + $"BDBC D0F2 F282 F109 F2EC C1BD BEBE BDC2" /* ½¼Ðòò‚ñÆòìÁ½¾¾½Â */ + $"EEF2 91F1 06F2 EDC5 BDBC CFF2 9FF1 02F2" /* îò‘ñ.ò펼ÏòŸñ.ò */ + $"F15E 8100 0243 ECF1 9FF0 06F2 D3BC BDC6" /* ñ^..CìñŸð.òÓ¼½Æ */ + $"EDF1 83F0 02F1 E8BF 81BE 02C0 EAF1 85F0" /* íñƒð.ñ迾.Àêñ…ð */ + $"03F2 F1F1 F286 F006 F2E4 BFBE BDDF F29E" /* .òññò†ð.ò俾½ßòž */ + $"F002 F1F0 5E81 0002 43EB F09E EF06 F1E5" /* ð.ñð^..Cëðžï.ñå */ + $"BFBE BEE2 F184 EF07 F0EE C7BC BEBE BCC9" /* ¿¾¾âñ„ï.ðîǼ¾¾¼É */ + $"85EF 06F0 EFDA CACB DEF0 86EF 06F2 D6BC" /* …ï.ðïÚÊËÞð†ï.òÖ¼ */ + $"BDC6 EDF0 9DEF 02F0 EF5E 8100 0243 EBEF" /* ½Æíðï.ðï^..Cëï */ + $"9EEE 05F0 CDBC BCD0 F086 EE07 F0E4 C4BE" /* žî.ðͼ¼Ðð†î.ðäľ */ + $"BDC5 E5EF 84EE 02F0 D3BB 80BC 01DA F085" /* ½Ååï„î.ðÓ»€¼.Úð… */ + $"EE06 EFEC C5BD BCDA F09D EE02 EFEF 5E81" /* î.ï쎼Úðî.ïï^ */ + $"0002 43EB EF9D EE06 EFE4 BEBD C0E7 EF87" /* ..Cëïî.ïä¾½Àçï‡ */ + $"EE05 F0E2 BDC2 E9EF 84EE 02EF E8C0 80BE" /* î.ðâ½Âéï„î.ïèÀ€¾ */ + $"02BD C4EC 86EE 05F0 DDBC BDC5 EC9D EE02" /* .½Äì†î.ðݼ½Åìî. */ + $"EFEF 5E81 0002 43EB EF9D EE05 EFD1 BCBC" /* ïï^..Cëïî.ïѼ¼ */ + $"D1F0 88EE 04EF E4BD C3EB 85EE 01EF E482" /* Ñðˆî.ïä½Ãë…î.ïä‚ */ + $"BE01 C1E9 87EE 05ED C6BD BCDD EF9C EE02" /* ¾.Áé‡î.íƽ¼Ýïœî. */ + $"EFEF 5E81 0002 43EA EE9D ED05 E9C2 BDBF" /* ïï^..Cêîí.齿 */ + $"E4EE 88ED 04EE E3BD C3EA 86ED 06EA C4BD" /* äîˆí.îã½Ãê†í.êĽ */ + $"BEBE BCC9 88ED 05EF D9BC BCCC EE9C ED02" /* ¾¾¼Éˆí.ïÙ¼¼Ìîœí. */ + $"EEEE 5E81 0002 43E9 ED9C EC04 EEDC BDBD" /* îî^..Céíœì.îܽ½ */ + $"C98A EC04 EDE2 BDC2 E986 EC07 EDDE C1BE" /* ÉŠì.íâ½Âé†ì.íÞÁ¾ */ + $"BEC4 E3ED 88EC 04E7 C1BD C1E6 9CEC 02ED" /* ¾Äãíˆì.çÁ½Áæœì.í */ + $"ED5E 8100 0243 E9EC 9CEB 05ED CFBC BCD8" /* í^..Céìœë.íϼ¼Ø */ + $"ED89 EB04 ECE2 BDC2 E887 EB05 EDDD BDC2" /* í‰ë.ìâ½Âè‡ë.íݽ */ + $"E6EC 89EB 05EC CCBC BCDB ED9B EB02 ECEC" /* æì‰ë.ì̼¼Ûí›ë.ìì */ + $"5E81 0002 43E8 EB9C EA05 E9C5 BDBF E2EB" /* ^..Cèëœê.鎿âë */ + $"89EA 04EB E1BD C2E7 87EA 04EB DFBD C3E8" /* ‰ê.ëá½Âç‡ê.ëß½Ãè */ + $"8AEA 05EC D8BC BCCF EC9B EA02 EBEC 5E81" /* Šê.ìؼ¼Ïì›ê.ëì^ */ + $"0002 43E7 EA9B E905 EAE3 BFBD C5E8 8AE9" /* ..Cçê›é.ê㿽ÅèŠé */ + $"04EA E0BD C2E7 87E9 04EA DEBD C3E7 8AE9" /* .êà½Âç‡é.êÞ½ÃçŠé */ + $"04EA E1BF BDC6 9CE9 02EA EB5E 8100 0243" /* .ê´Ɯé.êë^..C */ + $"E7E9 9BE8 05E9 DCBD BCCC E98A E807 E9DF" /* çé›è.éܽ¼ÌéŠè.éß */ + $"BEBF D7E6 EAE9 84E8 04E9 DEBD C3E6 8BE8" /* ¾¿×æêé„è.éÞ½Ãæ‹è */ + $"05E6 C3BD C1E4 E99A E802 E9EA 5E81 0002" /* .æýÁäéšè.éê^.. */ + $"43E6 E89B E705 E9D5 BCBC D2E9 8AE7 09E8" /* Cæè›ç.éÕ¼¼ÒéŠçÆè */ + $"DEBE BEBD C4D5 E4E9 E882 E704 E8DD BDC3" /* Þ¾¾½ÄÕäéè‚ç.èݽà */ + $"E58C E704 C8BD BEDF E89A E702 E8E9 5E81" /* åŒç.Ƚ¾ßèšç.èé^ */ + $"0002 43E6 E89B E705 E9D1 BCBC D7E9 8AE7" /* ..Cæè›ç.éѼ¼×éŠç */ + $"0BE8 DEBE BFBE BCBC C2D2 E2E9 E880 E704" /* .èÞ¾¿¾¼¼ÂÒâéè€ç. */ + $"E8DD BDC3 E58B E705 E8CC BCBD DCE8 9AE7" /* èݽÃå‹ç.è̼½Üèšç */ + $"02E8 E95E 8100 0243 E5E7 9BE6 05E8 CEBC" /* .èé^..Cåç›æ.èμ */ + $"BDD9 E88A E613 E7DE BDC2 DBCD C0BC BCC0" /* ½ÙèŠæ.çÞ½ÂÛÍÀ¼¼À */ + $"CFDF E7E7 E6E7 DCBD C3E4 8BE6 05E8 CFBC" /* ÏßççæçܽÃä‹æ.èϼ */ + $"BDD9 E89A E602 E7E9 5E81 0002 43E4 E69B" /* ½Ùèšæ.çé^..Cäæ› */ + $"E505 E6CC BCBD DAE6 8AE5 13E6 DDBD C2E3" /* å.æ̼½ÚæŠå.æݽÂã */ + $"E7DF CFC1 BCBC BFCC DCE6 E8DC BDC3 E38B" /* çßÏÁ¼¼¿ÌÜæèܽÃã‹ */ + $"E505 E7D0 BCBD D6E7 9AE5 02E6 E85E 8100" /* å.çм½Öçšå.æè^. */ + $"0243 E4E5 9BE4 05E5 CCBC BDD9 E58A E413" /* .Cäå›ä.å̼½ÙåŠä. */ + $"E5DC BDC2 E1E4 E5E6 E1D2 C3BC BCBE C9DB" /* åܽÂáäåæáÒü¼¾ÉÛ */ + $"DABD C3E2 8BE4 05E7 D0BC BDD6 E69A E402" /* Ú½Ãâ‹ä.çм½Öæšä. */ + $"E5E7 5E81 0002 43E4 E49B E305 E5CD BCBD" /* åç^..Cää›ã.åͼ½ */ + $"D7E4 8AE3 04E4 DBBD C2E1 80E3 0BE4 E5E1" /* ×äŠã.äÛ½Âá€ã.äåá */ + $"D4C4 BDBC BEC3 BDC3 E18B E305 E5CE BCBD" /* ÔĽ¼¾Ã½Ãá‹ã.åμ½ */ + $"D7E4 9AE3 02E4 E65E 8100 0243 E3E4 9BE3" /* ×äšã.äæ^..Cãä›ã */ + $"05E5 CFBC BDD4 E48A E304 E4DB BDC2 E183" /* .åϼ½ÔäŠã.äÛ½Âრ*/ + $"E308 E4E2 D6C6 BDBC BDC3 E18B E305 E4CB" /* ã.äâÖƽ¼½Ãá‹ã.äË */ + $"BDBD D8E4 9AE3 02E4 E65E 8100 0243 E2E3" /* ½½Øäšã.äæ^..Câã */ + $"9BE2 05E3 D2BC BCCF E48A E204 E3DA BDC1" /* ›â.ãÒ¼¼ÏäŠâ.ãÚ½Á */ + $"E085 E206 E3E2 D8C7 BDC2 E08C E204 C6BD" /* à…â.ãâØǽÂàŒâ.ƽ */ + $"BEDB E39A E202 E3E6 5D81 0002 43E2 E29B" /* ¾Ûãšâ.ãæ]..Cââ› */ + $"E105 E2D6 BDBD CAE2 8AE1 04E2 DABE C1DF" /* á.âÖ½½ÊâŠá.âÚ¾Áß */ + $"87E1 04E3 D9BD C2DF 8BE1 04DF C2BD C0DD" /* ‡á.ãÙ½Âß‹á.ß½ÀÝ */ + $"9BE1 02E2 E55D 8100 0243 E1E1 9BE0 05E1" /* ›á.âå]..Cáá›à.á */ + $"DBBF BDC4 DF8A E004 E1D9 BEC1 DE87 E004" /* Û¿½Äߊà.áÙ¾ÁÞ‡à. */ + $"E1D8 BDC2 DE8A E004 E1DA BEBD C49C E002" /* áؽÂÞŠà.áÚ¾½Äœà. */ + $"E1E4 5D81 0002 43E1 E19C E005 DFC3 BDBF" /* áä]..Cááœà.ßý¿ */ + $"DAE1 89E0 04E1 D9BE C1DE 87E0 04E1 D8BD" /* Úá‰à.áÙ¾ÁÞ‡à.áؽ */ + $"C2DE 8AE0 05E1 D3BD BDCB E19B E002 E1E4" /* ÂÞŠà.áÓ½½Ëá›à.áä */ + $"5D81 0002 43E0 E09C DF05 E0CA BDBD D1E0" /* ]..Cààœß.àʽ½Ñà */ + $"89DF 05E1 D7BE C0DC E086 DF04 E0D7 BDC2" /* ‰ß.á×¾ÀÜà†ß.à׽ */ + $"DE8A DF05 E0C9 BDBD D3E0 9BDF 02E0 E35D" /* ÞŠß.àɽ½Óà›ß.àã] */ + $"8100 0243 DFDF 9CDE 05DF D3BD BDC6 DF88" /* ..CßßœÞ.ßÓ½½Æ߈ */ + $"DE07 DFD7 C2BE BEC3 D8DF 85DE 04DF D6BD" /* Þ.ß×¾¾ÃØß…Þ.ßÖ½ */ + $"C2DD 8ADE 05DB C0BD BFDA DF9B DE02 DFE3" /* ÂÝŠÞ.ÛÀ½¿Úß›Þ.ßã */ + $"5D81 0002 43DF DE9D DD05 DAC0 BDBF D8DE" /* ]..CßÞÝ.ÚÀ½¿ØÞ */ + $"88DD 05C4 BDBE BEBD C586 DD04 DED5 BDC2" /* ˆÝ.Ľ¾¾½Å†Ý.Þս */ + $"DC89 DD05 DED1 BDBD C6DE 9DDD 01E2 5D81" /* ܉Ý.Þѽ½ÆÞÝ.â] */ + $"0002 43DE DD9D DC05 DDC9 BDBD CBDD 86DC" /* ..CÞÝÜ.Ýɽ½ËÝ†Ü */ + $"02DD D7BF 81BE 01BF D985 DC04 DDD5 BDC2" /* .Ý׿¾.¿Ù…Ü.Ýս */ + $"DB8A DC04 C4BD BDD1 DD9D DC01 E15D 8100" /* ÛŠÜ.Ľ½ÑÝÜ.á]. */ + $"0243 DDDC 9DDB 06DC D5BE BEC0 D8DC 85DB" /* .CÝÜÛ.ÜÕ¾¾ÀØÜ…Û */ + $"02DC D8C0 81BE 01C0 D985 DB05 DDD4 BDC1" /* .ÜØÀ¾.ÀÙ…Û.ÝÔ½Á */ + $"DADC 87DB 05DC D1BD BEC2 DA9E DB01 E05D" /* Ú܇Û.Üѽ¾ÂÚžÛ.à] */ + $"8100 0243 DDDB 9EDA 05DB C6BD BDC9 DB86" /* ..CÝÛžÚ.Ûƽ½ÉÛ† */ + $"DA07 DBCA BCBD BDBC CCDB 84DA 07DB D5C2" /* Ú.Ûʼ½½¼ÌÛ„Ú.ÛÕ */ + $"BEBE C4D7 DB85 DA06 DBDA C3BD BDCD DC9E" /* ¾¾Ä×Û…Ú.ÛÚý½ÍÜž */ + $"DA01 E05D 8100 0243 DDDA 9ED9 01DA D380" /* Ú.à]..CÝÚžÙ.ÚÓ€ */ + $"BE01 D3DA 85D9 07DA D9CC C3C3 CDD9 DA85" /* ¾.ÓÚ…Ù.ÚÙÌÃÃÍÙÚ… */ + $"D906 C3BD BEBE BCC6 DA85 D906 DBCC BDBD" /* Ù.ý¾¾¼ÆÚ…Ù.Û̽½ */ + $"C2D8 DA9E D901 E05D 8100 0244 DCDA 9FD9" /* ÂØÚžÙ.à]..DÜÚŸÙ */ + $"05DA C8BD BDC3 D887 D903 DAD9 D9DA 85D9" /* .ÚȽ½Ã؇Ù.ÚÙÙÚ…Ù */ + $"01DA D482 BE01 C0D7 84D9 06DA D3BF BEBD" /* .ÚÔ‚¾.ÀׄÙ.ÚÓ¿¾½ */ + $"CFDA 9FD9 01DF 5D81 0001 44DC A1D9 04D6" /* ÏÚŸÙ.ß]..DÜ¡Ù.Ö */ + $"C1BE BDC8 94D9 01D5 BF81 BE01 C1D7 84D9" /* Á¾½È”Ù.Õ¿¾.Áׄ٠*/ + $"04D7 C3BD BDC6 A1D9 01DF 5D81 0001 44DB" /* .×ý½Æ¡Ù.ß]..DÛ */ + $"A1D8 06D9 D0BE BEBD CCD9 93D8 06C7 BCBE" /* ¡Ø.Ùо¾½ÌÙ“Ø.Ǽ¾ */ + $"BDBC CAD9 83D8 05D7 C6BD BEC0 D5A1 D801" /* ½¼ÊÙƒØ.×ƽ¾ÀÕ¡Ø. */ + $"DE5D 8100 0144 DBA2 D706 D8CA BDBE BECD" /* Þ]..DÛ¢×.Øʽ¾¾Í */ + $"D892 D704 D6C9 C1C2 CB85 D705 C7BD BEBE" /* Ø’×.ÖÉÁÂË…×.ǽ¾¾ */ + $"D0D8 A1D7 01DD 5D81 0001 44DA A4D6 05C6" /* ÐØ¡×.Ý]..DÚ¤Ö.Æ */ + $"BDBE BECC D792 D603 D7D5 D5D7 84D6 05C7" /* ½¾¾Ì×’Ö.×ÕÕׄÖ.Ç */ + $"BDBE BDCC D7A2 D601 DC5D 8100 0144 D9A4" /* ½¾½Ì×¢Ö.Ü]..DÙ¤ */ + $"D505 D4C5 BDBE BDC8 9AD5 07D6 D3C4 BDBE" /* Õ.ÔŽ¾½ÈšÕ.ÖÓĽ¾ */ + $"BDCA D6A3 D501 DC5D 8100 0144 D8A5 D407" /* ½ÊÖ£Õ.Ü]..DØ¥Ô. */ + $"D3C5 BDBE BDC4 D1D5 96D4 07D5 CEC1 BDBE" /* ÓŽ¾½ÄÑÕ–Ô.ÕÎÁ½¾ */ + $"BDC9 D5A4 D401 DB5D 8100 0144 D8A7 D307" /* ½ÉÕ¤Ô.Û]..DاÓ. */ + $"C7BD BEBD BFCA D2D4 92D3 08D4 D1C6 BEBE" /* ǽ¾½¿ÊÒÔ’Ó.ÔÑƾ¾ */ + $"BDBE CBD4 A5D3 01DA 5D81 0001 44D7 A7D2" /* ½¾ËÔ¥Ó.Ú]..D×§Ò */ + $"0AD3 CABF BDBE BDC1 CBD1 D3D3 8CD2 0AD3" /* ÂÓÊ¿½¾½ÁËÑÓÓŒÒÂÓ */ + $"D3D0 C8C0 BDBE BDC1 CDD3 A6D2 01D9 5D81" /* ÓÐÈÀ½¾½ÁÍÓ¦Ò.Ù] */ + $"0001 44D7 A8D2 0CD3 CEC3 BDBE BEBD C1C8" /* ..DרÒ.ÓÎý¾¾½ÁÈ */ + $"CED2 D3D3 85D2 80D3 0AD1 CDC6 BFBD BEBD" /* ÎÒÓÓ…Ò€ÓÂÑÍÆ¿½¾½ */ + $"BEC6 D1D3 A7D2 01D9 5D81 0001 44D6 A9D1" /* ¾ÆÑÓ§Ò.Ù]..DÖ©Ñ */ + $"0ED2 D1CA C1BD BEBE BDBE C2C6 CACD CFD0" /* .ÒÑÊÁ½¾¾½¾ÂÆÊÍÏÐ */ + $"80D1 0ED0 CFCD C9C5 C1BE BDBE BDBE C3CD" /* €Ñ.ÐÏÍÉÅÁ¾½¾½¾ÃÍ */ + $"D2D2 A8D1 01D9 5D81 0001 44D6 AAD0 07D1" /* ÒÒ¨Ñ.Ù]..DÖªÐ.Ñ */ + $"D1D0 C9C2 BEBD BE80 BD02 BEBF C080 C10C" /* ÑÐɾ½¾€½.¾¿À€Á. */ + $"C0BF BEBD BDBE BEBD BEC3 CBD1 D1AA D001" /* À¿¾½½¾¾½¾ÃËÑѪÐ. */ + $"D85C 8100 0144 D5AC CF06 D0D0 CFCB C5C0" /* Ø\..DÕ¬Ï.ÐÐÏËÅÀ */ + $"BE80 BD80 BE00 BD80 BE80 BD05 BFC1 C7CC" /* ¾€½€¾.½€¾€½.¿ÁÇÌ */ + $"D0D0 ACCF 01D7 5C81 0001 44D5 B1CF 06CE" /* ÐЬÏ.×\..DÕ±Ï.Î */ + $"CBC7 C4C2 C1C0 80BF 06C0 C1C3 C5C8 CCCE" /* ËÇÄÂÁÀ€¿.ÀÁÃÅÈÌÎ */ + $"B0CF 01D6 5C81 0001 44D4 B6CE 01CD CD80" /* °Ï.Ö\..DÔ¶Î.ÍÍ€ */ + $"CC01 CDCD B5CE 01D6 5C81 0001 44D3 F5CD" /* Ì.Í͵Î.Ö\..DÓõÍ */ + $"01D6 5C81 0001 44D3 F5CC 01D5 5C81 0001" /* .Ö\..DÓõÌ.Õ\.. */ + $"44D2 F5CB 01D4 5C81 0001 44D2 F5CB 01D4" /* DÒõË.Ô\..DÒõË.Ô */ + $"5C81 0001 44D1 F5CA 01D3 5C81 0001 44D1" /* \..DÑõÊ.Ó\..DÑ */ + $"F5C9 01D3 5C81 0001 44D0 F5C8 01D2 5C81" /* õÉ.Ó\..DÐõÈ.Ò\ */ + $"0001 44CF F5C7 01D1 5C81 0001 44CF F5C7" /* ..DÏõÇ.Ñ\..DÏõÇ */ + $"01D0 5C81 0002 44C6 B9F3 BA02 B9C7 5B81" /* .Ð\..Dƹóº.¹Ç[ */ + $"0001 44C5 F5B9 01C7 5B81 0001 44C9 F5BF" /* ..DÅõ¹.Ç[..DÉõ¿ */ + $"01CB 5C81 0001 44CD F5C4 01CF 5C81 0001" /* .Ë\..DÍõÄ.Ï\.. */ + $"44D1 F5C9 01D3 5C81 0001 44D4 F5CE 01D7" /* DÑõÉ.Ó\..DÔõÎ.× */ + $"5C81 0001 44D8 F5D4 01DB 5D81 0002 46DE" /* \..DØõÔ.Û]..FÞ */ + $"DAF4 D901 E05E 8100 012B B5F5 B701 BF53" /* ÚôÙ.à^..+µõ·.¿S */ + $"8200 0007 F508 0109 04FF 00FF 00FF 00FF" /* ‚...õ..Æ.ÿ.ÿ.ÿ.ÿ */ + $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF" /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */ + $"00E7 0074 386D 6B00 0040 0800 0000 0000" /* .ç.t8mk..@...... */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0508 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0700 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"000B 5FAD D3DB DBDB DBDB DBDB DBDB DBDB" /* .._­ÓÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB D9B7 5300 0000 0000" /* ÛÛÛÛÛÛÛÛÙ·S..... */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"37CC FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* 7Ìÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FF8A 0100 0000" /* ÿÿÿÿÿÿÿÿÿÿÿŠ.... */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 003A" /* ...............: */ + $"EDFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* íÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF 7400 0000" /* ÿÿÿÿÿÿÿÿÿÿÿÿt... */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 11D8" /* ...............Ø */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF F636 0000" /* ÿÿÿÿÿÿÿÿÿÿÿÿö6.. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 73FF" /* ..............sÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFC3 0600" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÃ.. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0003 C7FF" /* ..............Çÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 6800" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿh. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0013 E9FF" /* ..............éÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF E71D" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿç. */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 001B EFFF" /* ..............ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFAF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯ */ + $"0300 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 001B EFFF" /* ..............ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"8F04 0000 0000 0000 0000 0000 0000 0000" /* ............... */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 001B EFFF" /* ..............ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFBB 5738 3737 3737 3737 3737 3737 3737" /* ÿ»W8777777777777 */ + $"3737 3737 3737 3737 3737 3737 3737 3737" /* 7777777777777777 */ + $"3737 3737 3737 3737 3737 3737 3737 3737" /* 7777777777777777 */ + $"3737 3737 3737 3737 3737 3737 3737 3737" /* 7777777777777777 */ + $"3734 1F01 0000 0000 0000 0000 001B EFFF" /* 74............ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFE F2C4 6104 0000 0000 0000 001B EFFF" /* ÿþòÄa.........ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFB3 1500 0000 0000 001B EFFF" /* ÿÿÿÿÿ³........ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF BE0B 0000 0000 001B EFFF" /* ÿÿÿÿÿÿ¾.......ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FF7D 0000 0000 001B EFFF" /* ÿÿÿÿÿÿÿ}......ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFE5 1300 0000 001B EFFF" /* ÿÿÿÿÿÿÿå......ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 4900 0000 001B EFFF" /* ÿÿÿÿÿÿÿÿI.....ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 6D00 0000 001A EFFF" /* ÿÿÿÿÿÿÿÿm.....ïÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7400 0000 0021 F4FF" /* ÿÿÿÿÿÿÿÿt....!ôÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0046 FFFF" /* ÿÿÿÿÿÿÿÿs....Fÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0056 FFFF" /* ÿÿÿÿÿÿÿÿs....Vÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0055 FFFF" /* ÿÿÿÿÿÿÿÿs....Uÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7300 0000 0058 FFFF" /* ÿÿÿÿÿÿÿÿs....Xÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF" /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */ + $"FFFF FFFF FFFF FFFF 7500 0000 0034 D6DB" /* ÿÿÿÿÿÿÿÿu....4ÖÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB DBDB DBDB DBDB DBDB" /* ÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛÛ */ + $"DBDB DBDB DBDB DBDB 6300 0000 0000 0708" /* ÛÛÛÛÛÛÛÛc....... */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0808 0808 0808 0808 0808" /* ................ */ + $"0808 0808 0808 0809 0400 0000 0000 0000" /* .......Æ........ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */ + $"0000 0000 0000 0000 0000 00" /* ........... */ +}; + diff --git a/launchers/darwin/cmake/installer/installer-header.bmp b/launchers/darwin/cmake/installer/installer-header.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7588a338b1bb0685b9d1d2a6ddb828d1ad9715d1 GIT binary patch literal 102656 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 R0000000000z-=uk=s$YR{73)* literal 0 HcmV?d00001 diff --git a/launchers/darwin/cmake/installer/installer.ico b/launchers/darwin/cmake/installer/installer.ico new file mode 100644 index 0000000000000000000000000000000000000000..d42eae96adb83a395122ecfe25bb1eb1d2893fa2 GIT binary patch literal 306053 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

j*o&)~=MZ2p3J_5M6`m;Per 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 Z2m}IwKp+qZ1OkCTAP@)yqP_I$^?$FtU&;Ug literal 0 HcmV?d00001 diff --git a/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in b/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in new file mode 100644 index 0000000000..62d6856ba9 --- /dev/null +++ b/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in @@ -0,0 +1,35 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + ${MACOSX_BUNDLE_ICON_FILE} + CFBundleIdentifier + com.highfidelity.launcher + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + CFBundleVersion + 1.0 + NSMainNibFile + Window + NSPrincipalClass + NSApplication + CFBundleDisplayName + HQ Launcher + + diff --git a/launchers/darwin/images/HiFi_Logo_Large.png b/launchers/darwin/images/HiFi_Logo_Large.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3e3024e3e6f12d7ccf26be85b9619cf5ac0142 GIT binary patch literal 5074 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 VozuMg|7QMck@*Emk1vYe^dFTWK8gSU literal 0 HcmV?d00001 diff --git a/launchers/darwin/images/HiFi_Voxel.png b/launchers/darwin/images/HiFi_Voxel.png new file mode 100644 index 0000000000000000000000000000000000000000..cd46b96c28c35dee45cf7b11d4d0a74352ab46f1 GIT binary patch literal 2988 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 literal 0 HcmV?d00001 diff --git a/launchers/darwin/images/Hifi_Logo.svg b/launchers/darwin/images/Hifi_Logo.svg new file mode 100644 index 0000000000..2dc9b52f8d --- /dev/null +++ b/launchers/darwin/images/Hifi_Logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/launchers/darwin/images/hifi_logo_large@2x.png b/launchers/darwin/images/hifi_logo_large@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d480da86ddc13c61dee02443563bfed4022ecdbc GIT binary patch literal 16487 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 literal 0 HcmV?d00001 diff --git a/launchers/darwin/images/hifi_logo_small@2x.png b/launchers/darwin/images/hifi_logo_small@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b8782dd226488ca46eda5755d54507177608592f GIT binary patch literal 4678 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 b7G-T4&!2i=qu;#rr^nXHp7Q6eBgg*-w6q($ literal 0 HcmV?d00001 diff --git a/launchers/darwin/images/hifi_window@2x.png b/launchers/darwin/images/hifi_window@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c7638fb61c0ea753d04943535c678688bbf092ea GIT binary patch literal 7787 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 literal 0 HcmV?d00001 diff --git a/launchers/darwin/images/interface.icns b/launchers/darwin/images/interface.icns new file mode 100644 index 0000000000000000000000000000000000000000..4aeb8301ceefd372ffbd2975ade867a7294a0be6 GIT binary patch literal 321423 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≪bQUpm%<@IufrNve<252{ET! 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 KisAozb^H&&ncL3* literal 0 HcmV?d00001 diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib new file mode 100644 index 0000000000..e56f2bf66b --- /dev/null +++ b/launchers/darwin/nib/DisplayNameScreen.xib @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/nib/ErrorScreen.xib b/launchers/darwin/nib/ErrorScreen.xib new file mode 100644 index 0000000000..37feca60cb --- /dev/null +++ b/launchers/darwin/nib/ErrorScreen.xib @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib new file mode 100644 index 0000000000..6784b8eff1 --- /dev/null +++ b/launchers/darwin/nib/LoginScreen.xib @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSAllRomanInputSourcesLocaleIdentifier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/nib/ProcessScreen.xib b/launchers/darwin/nib/ProcessScreen.xib new file mode 100644 index 0000000000..c6bd8abbec --- /dev/null +++ b/launchers/darwin/nib/ProcessScreen.xib @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/nib/SplashScreen.xib b/launchers/darwin/nib/SplashScreen.xib new file mode 100644 index 0000000000..3e2e37c81a --- /dev/null +++ b/launchers/darwin/nib/SplashScreen.xib @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/nib/Window.xib b/launchers/darwin/nib/Window.xib new file mode 100644 index 0000000000..8260f1d3cd --- /dev/null +++ b/launchers/darwin/nib/Window.xib @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/launchers/darwin/src/CredentialsRequest.h b/launchers/darwin/src/CredentialsRequest.h new file mode 100644 index 0000000000..2e0807c5ba --- /dev/null +++ b/launchers/darwin/src/CredentialsRequest.h @@ -0,0 +1,10 @@ +#import + +@interface CredentialsRequest : NSObject { +} + +@property (nonatomic, retain) NSMutableData* webData; +@property (nonatomic, retain) NSString* jsonString; + +- (void) confirmCredentials:(NSString*)username :(NSString*)password; +@end diff --git a/launchers/darwin/src/CredentialsRequest.m b/launchers/darwin/src/CredentialsRequest.m new file mode 100644 index 0000000000..966bb8cb31 --- /dev/null +++ b/launchers/darwin/src/CredentialsRequest.m @@ -0,0 +1,95 @@ +#import "CredentialsRequest.h" +#import "Launcher.h" +#import "Settings.h" + +@implementation CredentialsRequest + +- (void) confirmCredentials:(NSString*)username :(NSString*)password { + + NSLog(@"web request started"); + NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", username, password]; + NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding]; + NSString *postLength = [NSString stringWithFormat:@"%ld", (unsigned long)[postData length]]; + + NSMutableURLRequest *request = [NSMutableURLRequest new]; + [request setURL:[NSURL URLWithString:@"https://metaverse.highfidelity.com/oauth/token"]]; + [request setHTTPMethod:@"POST"]; + [request setValue:postLength forHTTPHeaderField:@"Content-Length"]; + [request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; + [request setHTTPBody:postData]; + + //NSURLConnection *theConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self]; + NSURLSession* session = [NSURLSession sharedSession]; + NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + + NSLog(@"credentials request finished"); + NSMutableData* webData = [NSMutableData data]; + [webData appendData:data]; + NSString* jsonString = [[NSString alloc] initWithBytes: [webData mutableBytes] length:[data length] encoding:NSUTF8StringEncoding]; + NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + id json = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil]; + + Launcher* sharedLauncher = [Launcher sharedLauncher]; + if (json[@"error"] != nil) { + dispatch_async(dispatch_get_main_queue(), ^{ + [[Settings sharedSettings] login:FALSE]; + [sharedLauncher setLoginErrorState: CREDENTIALS]; + [sharedLauncher credentialsAccepted:FALSE]; + }); + } else { + dispatch_async(dispatch_get_main_queue(), ^{ + [[Settings sharedSettings] login:TRUE]; + [sharedLauncher setTokenString:jsonString]; + [sharedLauncher credentialsAccepted:TRUE]; + }); + } + + NSLog(@"credentials: connectionDidFinished completed"); + + }]; + + [dataTask resume]; +} + +- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { + [self.webData appendData:data]; + NSLog(@"credentials connection received data"); +} + +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSLog(@"credentials connection received response"); + NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; + if([ne statusCode] == 200) { + NSLog(@"connection state is 200 - all okay"); + } else { + NSLog(@"connection state is NOT 200"); + [[Launcher sharedLauncher] displayErrorPage]; + } +} + +-(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + NSLog(@"Conn Err: %@", [error localizedDescription]); + [[Launcher sharedLauncher] displayErrorPage]; +} + +- (void)connectionDidFinishLoading:(NSURLConnection *)connection { + NSLog(@"credentials request finished"); + NSString* jsonString = [[NSString alloc] initWithBytes: [self.webData mutableBytes] length:[self.webData length] encoding:NSUTF8StringEncoding]; + NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil]; + + Launcher* sharedLauncher = [Launcher sharedLauncher]; + if (json[@"error"] != nil) { + [[Settings sharedSettings] login:FALSE]; + [sharedLauncher setLoginErrorState: CREDENTIALS]; + [sharedLauncher credentialsAccepted:FALSE]; + } else { + [[Settings sharedSettings] login:TRUE]; + [sharedLauncher setTokenString:jsonString]; + [sharedLauncher credentialsAccepted:TRUE]; + } + + NSLog(@"credentials: connectionDidFinished completed"); +} + +@end diff --git a/launchers/darwin/src/CustomUI.h b/launchers/darwin/src/CustomUI.h new file mode 100644 index 0000000000..a9d93d03c7 --- /dev/null +++ b/launchers/darwin/src/CustomUI.h @@ -0,0 +1,30 @@ +#import +#import +#import + +extern NSString* hifiSmallLogoFilename; +extern NSString* hifiLargeLogoFilename; +extern NSString* hifiVoxelFilename; +extern NSString* hifiBackgroundFilename; + +@interface TextField : NSTextField { +} +@end + + +@interface SecureTextField : NSSecureTextField { +} + +@end + + +@interface HFButton : NSButton + + @property (nonatomic, strong) CATextLayer *titleLayer; + +@end + +@interface Hyperlink : NSTextField { + +} +@end diff --git a/launchers/darwin/src/CustomUI.m b/launchers/darwin/src/CustomUI.m new file mode 100644 index 0000000000..01e666637a --- /dev/null +++ b/launchers/darwin/src/CustomUI.m @@ -0,0 +1,118 @@ +#import "CustomUI.h" + +#import + +NSString* hifiSmallLogoFilename = @"hifi_logo_small"; +NSString* hifiLargeLogoFilename = @"hifi_logo_large"; +NSString* hifiVoxelFilename = @"HiFi_Voxel"; +NSString* hifiBackgroundFilename = @"hifi_window"; + +@implementation TextField +- (void) textDidBeginEditing:(NSNotification *)notification +{ + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; +} +- (void) mouseDown:(NSEvent *)event +{ + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; + +} + +-(BOOL)becomeFirstResponder +{ + BOOL status = [super becomeFirstResponder]; + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; + return status; +} +@end + +@implementation SecureTextField + +- (void) textDidBeginEditing:(NSNotification *)notification +{ + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; +} +- (void) mouseDown:(NSEvent *)event +{ + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; + +} + + +-(BOOL)becomeFirstResponder +{ + BOOL status = [super becomeFirstResponder]; + NSColor *insertionPointColor = [NSColor whiteColor]; + NSTextView *fieldEditor = (NSTextView*)[self.window fieldEditor:YES + forObject:self]; + fieldEditor.insertionPointColor = insertionPointColor; + return status; +} +@end + + +@implementation HFButton +- (void)drawRect:(NSRect)dirtyRect { + // The UI layers implemented in awakeFromNib will handle drawing +} + +- (BOOL)layer:(CALayer *)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow *)window { + return YES; +} + +- (void)awakeFromNib { + [super awakeFromNib]; + + self.wantsLayer = YES; + self.layer.backgroundColor = [NSColor blackColor].CGColor; + self.layer.borderColor = [NSColor whiteColor].CGColor; + self.layer.borderWidth = 2.0f; + self.layer.masksToBounds = YES; + + _titleLayer = [[CATextLayer alloc] init]; + + CGSize buttonSize = self.frame.size; + CGSize titleSize = [self.title sizeWithAttributes:@{NSFontAttributeName: self.font}]; + CGFloat x = (buttonSize.width - titleSize.width) / 2.0; // Title's origin x + CGFloat y = (buttonSize.height - titleSize.height) / 2.0; // Title's origin y + + self.titleLayer.frame = NSMakeRect(round(x), round(y), ceil(titleSize.width), ceil(titleSize.height)); + self.titleLayer.string = self.title; + self.titleLayer.foregroundColor = [NSColor whiteColor].CGColor; + + // TODO(huffman) Fix this to be dynamic based on screen? + self.titleLayer.contentsScale = 2.0; + + self.titleLayer.font = (__bridge CFTypeRef _Nullable)(self.font); + self.titleLayer.fontSize = self.font.pointSize; + //self.titleLayer.allowsEdgeAntialiasing = YES; + //self.titleLayer.allowsFontSubpixelQuantization = YES; + + [self.layer addSublayer:self.titleLayer]; +} + +@end + +@implementation Hyperlink + +- (void) mouseDown:(NSEvent *)event +{ + [self sendAction:[self action] to:[self target]]; +} + +@end diff --git a/launchers/darwin/src/DisplayNameScreen.h b/launchers/darwin/src/DisplayNameScreen.h new file mode 100644 index 0000000000..77c0f4e7f5 --- /dev/null +++ b/launchers/darwin/src/DisplayNameScreen.h @@ -0,0 +1,5 @@ +#import + +@interface DisplayNameScreen : NSViewController { +} +@end diff --git a/launchers/darwin/src/DisplayNameScreen.m b/launchers/darwin/src/DisplayNameScreen.m new file mode 100644 index 0000000000..7a402d792b --- /dev/null +++ b/launchers/darwin/src/DisplayNameScreen.m @@ -0,0 +1,34 @@ +#import "DisplayNameScreen.h" +#import "Launcher.h" +#import "CustomUI.h" + +@interface DisplayNameScreen () +@property (nonatomic, assign) IBOutlet NSImageView* backgroundImage; +@property (nonatomic, assign) IBOutlet NSImageView* smallLogo; +@property (nonatomic, assign) IBOutlet NSTextField* displayName; +@end + +@implementation DisplayNameScreen +- (void) awakeFromNib { + [self.backgroundImage setImage: [NSImage imageNamed:hifiBackgroundFilename]]; + [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]]; + NSMutableAttributedString* displayNameString = [[NSMutableAttributedString alloc] initWithString:@"Display Name"]; + + [displayNameString addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0, displayNameString.length)]; + [displayNameString addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,displayNameString.length)]; + + [self.displayName setPlaceholderAttributedString:displayNameString]; + [self.displayName setTarget:self]; + [self.displayName setAction:@selector(login:)]; +} + +- (IBAction)login:(id)sender { + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher displayNameEntered: [self.displayName stringValue]]; +} + +- (IBAction)hyperLink:(id)sender +{ + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.highfidelity.com/hq-support"]]; +} +@end diff --git a/launchers/darwin/src/DownloadDomainContent.h b/launchers/darwin/src/DownloadDomainContent.h new file mode 100644 index 0000000000..a714b201de --- /dev/null +++ b/launchers/darwin/src/DownloadDomainContent.h @@ -0,0 +1,8 @@ +#import + +@interface DownloadDomainContent : NSObject { +} + +- (void) downloadDomainContent:(NSString*) domainContentUrl; + +@end diff --git a/launchers/darwin/src/DownloadDomainContent.m b/launchers/darwin/src/DownloadDomainContent.m new file mode 100644 index 0000000000..8d1ad715f4 --- /dev/null +++ b/launchers/darwin/src/DownloadDomainContent.m @@ -0,0 +1,84 @@ +#import "DownloadDomainContent.h" +#import "Launcher.h" + +@implementation DownloadDomainContent + +- (void) downloadDomainContent:(NSString *)domainContentUrl +{ + NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:domainContentUrl] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:60.0]; + NSURLDownload* theDownload = [[NSURLDownload alloc] initWithRequest:request delegate:self]; + + /*NSURLSession *session = [NSURLSession sharedSession]; + NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithRequest:request + completionHandler: + ^(NSURL *location, NSURLResponse *response,NSError *error) { + NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:[response suggestedFilename]]; + [[NSFileManager defaultManager] moveItemAtURL:location + toURL:[NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]] + error:nil]; + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher setDownloadContextFilename:[response suggestedFilename]]; + NSLog(@"extracting domain content file"); + [sharedLauncher extractZipFileAtDestination:[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:@"content"] :[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:[sharedLauncher getDownloadContentFilename]]]; + + NSLog(@"finished extracting content file"); + dispatch_async(dispatch_get_main_queue(), ^{ + [sharedLauncher domainContentDownloadFinished]; + }); + + }];*/ + + //[downloadTask resume]; + + if (!theDownload) { + NSLog(@"Download Failed"); + [[Launcher sharedLauncher] displayErrorPage]; + } +} + +- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { + NSLog(@"download domain content: data received"); +} + +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; + if([ne statusCode] == 200) { + NSLog(@"connection state is 200 - all okay"); + } else { + NSLog(@"connection state is NOT 200"); + [[Launcher sharedLauncher] displayErrorPage]; + } +} + +-(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + NSLog(@"download domain content - Conn Err: %@", [error localizedDescription]); + [[Launcher sharedLauncher] displayErrorPage]; +} + +- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename +{ + NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:filename]; + [download setDestination:finalFilePath allowOverwrite:YES]; + + [[Launcher sharedLauncher] setDownloadContextFilename:filename]; +} + +- (void)downloadDidFinish:(NSURLDownload*)download +{ + Launcher* sharedLauncher = [Launcher sharedLauncher]; + NSLog(@"extracting domain content file"); + [sharedLauncher extractZipFileAtDestination:[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:@"content"] :[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:[sharedLauncher getDownloadContentFilename]]]; + + NSLog(@"finished extracting content file"); + + [sharedLauncher domainContentDownloadFinished]; +} + +- (void)download:(NSURLDownload*)download didReceiveResponse:(NSURLResponse*)response +{ + NSLog(@"Download content set response"); +} + +@end diff --git a/launchers/darwin/src/DownloadInterface.h b/launchers/darwin/src/DownloadInterface.h new file mode 100644 index 0000000000..8edb75e8ad --- /dev/null +++ b/launchers/darwin/src/DownloadInterface.h @@ -0,0 +1,8 @@ +#import + +@interface DownloadInterface : NSObject { +} +@property (nonatomic, assign) NSString* finalFilePath; + +- (void) downloadInterface:(NSString*) downloadUrl; +@end diff --git a/launchers/darwin/src/DownloadInterface.m b/launchers/darwin/src/DownloadInterface.m new file mode 100644 index 0000000000..73d8663e48 --- /dev/null +++ b/launchers/darwin/src/DownloadInterface.m @@ -0,0 +1,109 @@ +#import "DownloadInterface.h" +#import "Launcher.h" +#import "Settings.h" + +@implementation DownloadInterface + +- (void) downloadInterface:(NSString*) downloadUrl +{ + NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:downloadUrl] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:60.0]; + + NSURLDownload* theDownload = [[NSURLDownload alloc] initWithRequest:request delegate:self]; + + /*NSURLSession *session = [NSURLSession sharedSession]; + NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithRequest:request + completionHandler: + ^(NSURL *location, NSURLResponse *response,NSError *error) { + Launcher* sharedLauncher = [Launcher sharedLauncher]; + NSString* finalFilePath = [[sharedLauncher getAppPath] stringByAppendingPathComponent:[response suggestedFilename]]; + [[Launcher sharedLauncher] setDownloadFilename:[response suggestedFilename]]; + + NSLog(@"----------->%@", location); + [[NSFileManager defaultManager] moveItemAtURL:location + toURL:[NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]] + error:nil]; + dispatch_async(dispatch_get_main_queue(), ^{ + + NSString* appPath = [sharedLauncher getAppPath]; + NSString* downloadFileName = [sharedLauncher getDownloadFilename]; + NSLog(@"!!!!!!%@", downloadFileName); + NSLog(@"extract interface zip"); + [sharedLauncher extractZipFileAtDestination:appPath :[appPath stringByAppendingString:downloadFileName]]; + NSLog(@"finished extracting interface zip"); + + NSLog(@"starting xattr"); + NSTask* quaratineTask = [[NSTask alloc] init]; + quaratineTask.launchPath = @"/usr/bin/xattr"; + quaratineTask.arguments = @[@"-d", @"com.apple.quarantine", [appPath stringByAppendingString:@"interface.app"]]; + + [quaratineTask launch]; + [quaratineTask waitUntilExit]; + NSLog(@"finished xattr"); + + NSString* launcherPath = [appPath stringByAppendingString:@"Launcher"]; + + [[Settings sharedSettings] setLauncherPath:launcherPath]; + [sharedLauncher interfaceFinishedDownloading]; + + }); + }]; + + [downloadTask resume];*/ +} + +- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename +{ + self.finalFilePath = [[[Launcher sharedLauncher] getAppPath] stringByAppendingPathComponent:filename]; + [download setDestination:self.finalFilePath allowOverwrite:YES]; + + [[Launcher sharedLauncher] setDownloadFilename:filename]; +} + + +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; + if([ne statusCode] == 200) { + NSLog(@"download interface connection state is 200 - all okay"); + } else { + NSLog(@"download interface connection state is NOT 200"); + [[Launcher sharedLauncher] displayErrorPage]; + } +} + +-(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + NSLog(@"download interface content - Conn Err: %@", [error localizedDescription]); + [[Launcher sharedLauncher] displayErrorPage]; +} + +- (void)downloadDidFinish:(NSURLDownload*)download +{ + Launcher* sharedLauncher = [Launcher sharedLauncher]; + NSString* appPath = [sharedLauncher getAppPath]; + NSString* downloadFileName = [sharedLauncher getDownloadFilename]; + + NSLog(@"extract interface zip"); + [sharedLauncher extractZipFileAtDestination:appPath :[appPath stringByAppendingString:downloadFileName]]; + NSLog(@"finished extracting interface zip"); + + NSLog(@"starting xattr"); + NSTask* quaratineTask = [[NSTask alloc] init]; + quaratineTask.launchPath = @"/usr/bin/xattr"; + quaratineTask.arguments = @[@"-d", @"com.apple.quarantine", [appPath stringByAppendingString:@"interface.app"]]; + + [quaratineTask launch]; + [quaratineTask waitUntilExit]; + NSLog(@"finished xattr"); + + NSString* launcherPath = [appPath stringByAppendingString:@"Launcher"]; + + [[Settings sharedSettings] setLauncherPath:launcherPath]; + [sharedLauncher interfaceFinishedDownloading]; +} + +- (void)download:(NSURLDownload*)download didReceiveResponse:(NSURLResponse*)response +{ + NSLog(@"Download interface response"); +} +@end diff --git a/launchers/darwin/src/DownloadScripts.h b/launchers/darwin/src/DownloadScripts.h new file mode 100644 index 0000000000..711cf4f8b2 --- /dev/null +++ b/launchers/darwin/src/DownloadScripts.h @@ -0,0 +1,8 @@ +#import + +@interface DownloadScripts : NSObject { +} +@property (nonatomic, assign) NSString* finalFilePath; + +- (void) downloadScripts:(NSString*) scriptUrl; +@end diff --git a/launchers/darwin/src/DownloadScripts.m b/launchers/darwin/src/DownloadScripts.m new file mode 100644 index 0000000000..8e5863d159 --- /dev/null +++ b/launchers/darwin/src/DownloadScripts.m @@ -0,0 +1,39 @@ +#import "DownloadScripts.h" +#import "Launcher.h" + +@implementation DownloadScripts + +- (void) downloadScripts:(NSString*) scriptsUrl +{ + /*NSURLRequest* theRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:scriptsUrl] + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:6000.0]; + NSURLDownload *theDownload = [[NSURLDownload alloc] initWithRequest:theRequest delegate:self]; + + if (!theDownload) { + NSLog(@"Download Failed"); + }*/ +} + +- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename +{ + NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:filename]; + [download setDestination:finalFilePath allowOverwrite:YES]; + + [[Launcher sharedLauncher] setDownloadScriptsFilename:filename]; +} + +- (void)downloadDidFinish:(NSURLDownload*)download +{ + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher extractZipFileAtDestination:[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:@"scripts"] :[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:[sharedLauncher getDownloadScriptsFilename]]]; + + [sharedLauncher domainScriptsDownloadFinished]; + +} + +- (void)download:(NSURLDownload*)download didReceiveResponse:(NSURLResponse*)response +{ + NSLog(@"DownloadScripts received a response"); +} +@end diff --git a/launchers/darwin/src/ErrorViewController.h b/launchers/darwin/src/ErrorViewController.h new file mode 100644 index 0000000000..4463edb0e5 --- /dev/null +++ b/launchers/darwin/src/ErrorViewController.h @@ -0,0 +1,7 @@ +#import + +@interface ErrorViewController : NSViewController { +} + +@end + diff --git a/launchers/darwin/src/ErrorViewController.m b/launchers/darwin/src/ErrorViewController.m new file mode 100644 index 0000000000..0ae321763f --- /dev/null +++ b/launchers/darwin/src/ErrorViewController.m @@ -0,0 +1,26 @@ +#import "ErrorViewController.h" +#import "Launcher.h" +#import "CustomUI.h" + +@interface ErrorViewController() +@property (nonatomic, assign) IBOutlet NSImageView* backgroundImage; +@property (nonatomic, assign) IBOutlet NSImageView* smallLogo; +@property (nonatomic, assign) IBOutlet NSImageView* voxelImage; + +@end + +@implementation ErrorViewController + +- (void) awakeFromNib +{ + [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]]; + [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]]; + [self.voxelImage setImage:[NSImage imageNamed:hifiVoxelFilename]]; +} + +-(IBAction)resartLauncher:(id)sender +{ + [[Launcher sharedLauncher] showLoginScreen]; +} + +@end diff --git a/launchers/darwin/src/LatestBuildRequest.h b/launchers/darwin/src/LatestBuildRequest.h new file mode 100644 index 0000000000..be2a168a21 --- /dev/null +++ b/launchers/darwin/src/LatestBuildRequest.h @@ -0,0 +1,10 @@ +#import + +@interface LatestBuildRequest : NSObject { +} + +@property (nonatomic, retain) NSMutableData* webData; +@property (nonatomic, retain) NSString* jsonString; + +- (void) requestLatestBuildInfo; +@end diff --git a/launchers/darwin/src/LatestBuildRequest.m b/launchers/darwin/src/LatestBuildRequest.m new file mode 100644 index 0000000000..019637ed55 --- /dev/null +++ b/launchers/darwin/src/LatestBuildRequest.m @@ -0,0 +1,104 @@ +#import "LatestBuildRequest.h" +#import "Launcher.h" +#import "Settings.h" + +@implementation LatestBuildRequest + +- (void) requestLatestBuildInfo { + NSMutableURLRequest *request = [NSMutableURLRequest new]; + [request setURL:[NSURL URLWithString:@"https://thunder.highfidelity.com/builds/api/tags/latest?format=json"]]; + [request setHTTPMethod:@"GET"]; + [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; + + + NSURLSession* session = [NSURLSession sharedSession]; + NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + + Launcher* sharedLauncher = [Launcher sharedLauncher]; + NSLog(@"credentials request finished"); + NSMutableData* webData = [NSMutableData data]; + [webData appendData:data]; + NSString* jsonString = [[NSString alloc] initWithBytes: [webData mutableBytes] length:[data length] encoding:NSUTF8StringEncoding]; + NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + id json = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil]; + + NSFileManager* fileManager = [NSFileManager defaultManager]; + NSArray *values = [json valueForKey:@"results"]; + NSDictionary *value = [values objectAtIndex:0]; + + + NSString* buildNumber = [value valueForKey:@"latest_version"]; + NSDictionary* installers = [value objectForKey:@"installers"]; + NSDictionary* macInstallerObject = [installers objectForKey:@"mac"]; + NSString* macInstallerUrl = [macInstallerObject valueForKey:@"zip_url"]; + + BOOL appDirectoryExist = [fileManager fileExistsAtPath:[[sharedLauncher getAppPath] stringByAppendingString:@"interface.app"]]; + + dispatch_async(dispatch_get_main_queue(), ^{ + Settings* settings = [Settings sharedSettings]; + NSInteger currentVersion = [settings latestBuildVersion]; + BOOL latestVersionAvailable = (currentVersion != buildNumber.integerValue); + [[Settings sharedSettings] buildVersion:buildNumber.integerValue]; + + BOOL shouldDownloadInterface = (latestVersionAvailable || !appDirectoryExist); + [sharedLauncher shouldDownloadLatestBuild:shouldDownloadInterface :macInstallerUrl]; + }); + }]; + + [dataTask resume]; + + //NSURLConnection *theConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self]; + + /*if(theConnection) { + self.webData = [NSMutableData data]; + NSLog(@"connection initiated"); + }*/ +} + +- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { + [self.webData appendData:data]; +} + +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; + if([ne statusCode] == 200) { + NSLog(@"connection state is 200 - all okay"); + } else { + NSLog(@"connection state is NOT 200"); + [[Launcher sharedLauncher] displayErrorPage]; + } +} + +-(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + NSLog(@"Conn Err: %@", [error localizedDescription]); + [[Launcher sharedLauncher] displayErrorPage]; +} + +- (void)connectionDidFinishLoading:(NSURLConnection *)connection { + Launcher* sharedLauncher = [Launcher sharedLauncher]; + self.jsonString = [[NSString alloc] initWithBytes: [self.webData mutableBytes] length:[self.webData length] encoding:NSUTF8StringEncoding]; + NSData *data = [self.jsonString dataUsingEncoding:NSUTF8StringEncoding]; + id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil]; + + NSFileManager* fileManager = [NSFileManager defaultManager]; + NSArray *values = [json valueForKey:@"results"]; + NSDictionary *value = [values objectAtIndex:0]; + + + NSString* buildNumber = [value valueForKey:@"latest_version"]; + NSDictionary* installers = [value objectForKey:@"installers"]; + NSDictionary* macInstallerObject = [installers objectForKey:@"mac"]; + NSString* macInstallerUrl = [macInstallerObject valueForKey:@"zip_url"]; + + BOOL appDirectoryExist = [fileManager fileExistsAtPath:[[sharedLauncher getAppPath] stringByAppendingString:@"interface.app"]]; + + Settings* settings = [Settings sharedSettings]; + NSInteger currentVersion = [settings latestBuildVersion]; + BOOL latestVersionAvailable = (currentVersion != buildNumber.integerValue); + [[Settings sharedSettings] buildVersion:buildNumber.integerValue]; + + BOOL shouldDownloadInterface = (latestVersionAvailable || !appDirectoryExist); + [sharedLauncher shouldDownloadLatestBuild:shouldDownloadInterface :macInstallerUrl]; +} + +@end diff --git a/launchers/darwin/src/LaunchInterface.h b/launchers/darwin/src/LaunchInterface.h new file mode 100644 index 0000000000..2d6df927d6 --- /dev/null +++ b/launchers/darwin/src/LaunchInterface.h @@ -0,0 +1,5 @@ +#pragma once + +#include +void launchInterface() { +} diff --git a/launchers/darwin/src/Launcher.h b/launchers/darwin/src/Launcher.h new file mode 100644 index 0000000000..5838e25a82 --- /dev/null +++ b/launchers/darwin/src/Launcher.h @@ -0,0 +1,83 @@ +#import +#import "DownloadInterface.h" +#import "CredentialsRequest.h" +#import "DownloadDomainContent.h" +#import "LatestBuildRequest.h" +#import "OrganizationRequest.h" +#import "DownloadScripts.h" + +typedef enum processStateTypes +{ + DOWNLOADING_INTERFACE = 0, + RUNNING_INTERFACE_AFTER_DOWNLOAD, + CHECKING_UPDATE, + RUNNING_INTERFACE_AFTER_UPDATE +} ProcessState; + +typedef enum LoginErrorTypes +{ + NONE = 0, + ORGANIZATION, + CREDENTIALS +} LoginError; + +@interface Launcher : NSObject { +} +@property (nonatomic, retain) NSString* password; +@property (nonatomic, retain) NSString* username; +@property (nonatomic, retain) NSString* organization; +@property (nonatomic, retain) NSString* userToken; +@property (nonatomic, retain) NSString* displayName; +@property (nonatomic, retain) NSString* filename; +@property (nonatomic, retain) NSString* scriptsFilename; +@property (nonatomic, retain) NSString* contentFilename; +@property (nonatomic, retain) NSString* domainURL; +@property (nonatomic, retain) NSString* domainContentUrl; +@property (nonatomic, retain) NSString* domainScriptsUrl; +@property (nonatomic, retain) DownloadInterface* downloadInterface; +@property (nonatomic, retain) CredentialsRequest* credentialsRequest; +@property (nonatomic, retain) DownloadDomainContent* downloadDomainContent; +@property (nonatomic, retain) DownloadScripts* downloadScripts; +@property (nonatomic, retain) LatestBuildRequest* latestBuildRequest; +@property (nonatomic, retain) OrganizationRequest* organizationRequest; +@property (nonatomic) BOOL credentialsAccepted; +@property (nonatomic) BOOL waitingForCredentialReponse; +@property (nonatomic) BOOL gotCredentialResponse; +@property (nonatomic) BOOL waitingForInterfaceToTerminate; +@property (nonatomic, assign, readwrite) ProcessState processState; +@property (nonatomic, assign, readwrite) LoginError loginError; + +- (void) displayNameEntered:(NSString*)aDisplayName; +- (void) credentialsEntered:(NSString*)aOrginization :(NSString*)aUsername :(NSString*)aPassword; +- (void) credentialsAccepted:(BOOL) aCredentialsAccepted; +- (void) domainContentDownloadFinished; +- (void) domainScriptsDownloadFinished; +- (void) setDomainURLInfo:(NSString*) aDomainURL :(NSString*) aDomainContentUrl :(NSString*) aDomainScriptsUrl; +- (void) organizationRequestFinished:(BOOL) aOriginzationAccepted; +- (BOOL) loginShouldSetErrorState; +- (void) displayErrorPage; +- (void) showLoginScreen; +- (ProcessState) currentProccessState; +- (void) setCurrentProcessState:(ProcessState) aProcessState; +- (void) setLoginErrorState:(LoginError) aLoginError; +- (LoginError) getLoginErrorState; +- (void) shouldDownloadLatestBuild:(BOOL) shouldDownload :(NSString*) downloadUrl; +- (void) interfaceFinishedDownloading; +- (NSString*) getDownloadPathForContentAndScripts; +- (void) launchInterface; +- (void) extractZipFileAtDestination:(NSString*) destination :(NSString*) file; +- (BOOL) isWaitingForInterfaceToTerminate; +- (void) setDownloadFilename:(NSString*) aFilename; +- (void) setDownloadContextFilename:(NSString*) aFilename; +- (void) setDownloadScriptsFilename:(NSString*) aFilename; +- (void) setTokenString:(NSString*) aToken; +- (NSString*) getTokenString; +- (NSString*) getDownloadContentFilename; +- (NSString*) getDownloadScriptsFilename; +- (NSString*) getDownloadFilename; +- (BOOL) isLoadedIn; +- (NSString*) getAppPath; + ++ (id) sharedLauncher; +@end + diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m new file mode 100644 index 0000000000..07fc8878da --- /dev/null +++ b/launchers/darwin/src/Launcher.m @@ -0,0 +1,364 @@ +#import "Launcher.h" +#import "Window.h" +#import "SplashScreen.h" +#import "LoginScreen.h" +#import "DisplayNameScreen.h" +#import "ProcessScreen.h" +#import "ErrorViewController.h" +#import "Settings.h" + +@interface Launcher () + +@property (strong) IBOutlet Window* window; +@property (nonatomic, assign) NSString* finalFilePath; +@property (nonatomic, assign) NSButton* button; +@end + + +static BOOL const DELETE_ZIP_FILES = TRUE; +@implementation Launcher ++ (id) sharedLauncher { + static Launcher* sharedLauncher = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedLauncher = [[self alloc]init]; + }); + return sharedLauncher; +} + +-(id)init { + if (self = [super init]) { + self.username = [[NSString alloc] initWithString:@"Default Property Value"]; + self.downloadInterface = [DownloadInterface alloc]; + self.downloadDomainContent = [DownloadDomainContent alloc]; + self.credentialsRequest = [CredentialsRequest alloc]; + self.latestBuildRequest = [LatestBuildRequest alloc]; + self.organizationRequest = [OrganizationRequest alloc]; + self.downloadScripts = [DownloadScripts alloc]; + self.credentialsAccepted = TRUE; + self.gotCredentialResponse = FALSE; + self.waitingForCredentialReponse = FALSE; + self.waitingForInterfaceToTerminate = FALSE; + self.userToken = nil; + self.processState = DOWNLOADING_INTERFACE; + } + return self; +} + +-(void)awakeFromNib { + [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self + selector:@selector(didTerminateApp:) + name:NSWorkspaceDidTerminateApplicationNotification + object:nil]; + + SplashScreen* splashScreen = [[SplashScreen alloc] initWithNibName:@"SplashScreen" bundle:nil]; + [self.window setContentViewController: splashScreen]; + [self closeInterfaceIfRunning]; + + if (!self.waitingForInterfaceToTerminate) { + [self checkLoginStatus]; + } +} + +- (NSString*) getDownloadPathForContentAndScripts +{ + NSString* filePath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0] + stringByAppendingString:@"/Launcher/"]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) { + NSError * error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:filePath withIntermediateDirectories:TRUE attributes:nil error:&error]; + } + + return filePath; +} + +- (void) extractZipFileAtDestination:(NSString *)destination :(NSString*)file +{ + NSTask* task = [[NSTask alloc] init]; + task.launchPath = @"/usr/bin/unzip"; + task.arguments = @[@"-o", @"-d", destination, file]; + + [task launch]; + [task waitUntilExit]; + + if (DELETE_ZIP_FILES) { + NSFileManager* fileManager = [NSFileManager defaultManager]; + [fileManager removeItemAtPath:file error:NULL]; + } +} + +- (void) displayErrorPage +{ + ErrorViewController* errorPage = [[ErrorViewController alloc] initWithNibName:@"ErrorScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: errorPage]; +} + +- (void) checkLoginStatus +{ + if ([self isLoadedIn]) { + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher setCurrentProcessState:CHECKING_UPDATE]; + ProcessScreen* processScreen = [[ProcessScreen alloc] initWithNibName:@"ProcessScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: processScreen]; + [self.latestBuildRequest requestLatestBuildInfo]; + } else { + [NSTimer scheduledTimerWithTimeInterval:2.0 + target:self + selector:@selector(onSplashScreenTimerFinished:) + userInfo:nil + repeats:NO]; + } +} + +- (void) setDownloadContextFilename:(NSString *)aFilename +{ + self.contentFilename = aFilename; +} + +- (void) setDownloadScriptsFilename:(NSString*)aFilename +{ + self.scriptsFilename = aFilename; +} + +- (NSString*) getDownloadContentFilename +{ + return self.contentFilename; +} + +- (NSString*) getDownloadScriptsFilename +{ + return self.scriptsFilename; +} + +- (void)didTerminateApp:(NSNotification *)notification { + if (self.waitingForInterfaceToTerminate) { + NSString* appName = [notification.userInfo valueForKey:@"NSApplicationName"]; + if ([appName isEqualToString:@"interface"]) { + self.waitingForInterfaceToTerminate = FALSE; + [self checkLoginStatus]; + } + } +} + +- (void) closeInterfaceIfRunning +{ + NSWorkspace* workspace = [NSWorkspace sharedWorkspace]; + NSArray* apps = [workspace runningApplications]; + for (NSRunningApplication* app in apps) { + if ([[app bundleIdentifier] isEqualToString:@"com.highfidelity.interface"] || + [[app bundleIdentifier] isEqualToString:@"com.highfidelity.interface-pr"]) { + [app terminate]; + self.waitingForInterfaceToTerminate = true; + } + } +} + +- (BOOL) isWaitingForInterfaceToTerminate { + return self.waitingForInterfaceToTerminate; +} + +- (BOOL) isLoadedIn +{ + return [[Settings sharedSettings] isLoggedIn]; +} + +- (void) setDomainURLInfo:(NSString *)aDomainURL :(NSString *)aDomainContentUrl :(NSString *)aDomainScriptsUrl +{ + self.domainURL = aDomainURL; + self.domainContentUrl = aDomainContentUrl; + self.domainScriptsUrl = aDomainScriptsUrl; + + [[Settings sharedSettings] setDomainUrl:aDomainURL]; +} + +- (NSString*) getAppPath +{ + return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents/MacOS/"]; +} + +- (BOOL) loginShouldSetErrorState +{ + return !self.credentialsAccepted; +} + +- (void) displayNameEntered:(NSString*)aDiplayName +{ + self.processState = DOWNLOADING_INTERFACE; + ProcessScreen* processScreen = [[ProcessScreen alloc] initWithNibName:@"ProcessScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: processScreen]; + [self.downloadDomainContent downloadDomainContent:self.domainContentUrl]; + self.displayName = aDiplayName; +} + +- (void) domainContentDownloadFinished +{ + //.[self.downloadScripts downloadScripts:self.domainScriptsUrl]; + [self.latestBuildRequest requestLatestBuildInfo]; +} + +- (void) domainScriptsDownloadFinished +{ + [self.latestBuildRequest requestLatestBuildInfo]; +} + +- (void) saveCredentialsAccepted:(BOOL)aCredentialsAccepted +{ + self.credentialsAccepted = aCredentialsAccepted; +} + +- (void) credentialsAccepted:(BOOL)aCredentialsAccepted +{ + self.credentialsAccepted = aCredentialsAccepted; + if (aCredentialsAccepted) { + DisplayNameScreen* displayNameScreen = [[DisplayNameScreen alloc] initWithNibName:@"DisplayNameScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: displayNameScreen]; + } else { + LoginScreen* loginScreen = [[LoginScreen alloc] initWithNibName:@"LoginScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: loginScreen]; + } +} + +- (void) interfaceFinishedDownloading +{ + if (self.processState == DOWNLOADING_INTERFACE) { + self.processState = RUNNING_INTERFACE_AFTER_DOWNLOAD; + } else { + self.processState = RUNNING_INTERFACE_AFTER_UPDATE; + } + ProcessScreen* processScreen = [[ProcessScreen alloc] initWithNibName:@"ProcessScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: processScreen]; + [self launchInterface]; +} + +- (void) credentialsEntered:(NSString*)aOrginization :(NSString*)aUsername :(NSString*)aPassword +{ + self.organization = aOrginization; + self.username = aUsername; + self.password = aPassword; + [self.organizationRequest confirmOrganization:aOrginization :aUsername]; +} + +- (void) organizationRequestFinished:(BOOL)aOriginzationAccepted +{ + self.credentialsAccepted = aOriginzationAccepted; + if (aOriginzationAccepted) { + [self.credentialsRequest confirmCredentials:self.username : self.password]; + } else { + LoginScreen* loginScreen = [[LoginScreen alloc] initWithNibName:@"LoginScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: loginScreen]; + } +} + +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + +-(void) showLoginScreen +{ + LoginScreen* loginScreen = [[LoginScreen alloc] initWithNibName:@"LoginScreen" bundle:nil]; + [[[[NSApplication sharedApplication] windows] objectAtIndex:0] setContentViewController: loginScreen]; +} + +- (void) shouldDownloadLatestBuild:(BOOL) shouldDownload :(NSString*) downloadUrl +{ + if (shouldDownload) { + [self.downloadInterface downloadInterface: downloadUrl]; + return; + } + [self launchInterface]; +} + +-(void)onSplashScreenTimerFinished:(NSTimer *)timer +{ + [self showLoginScreen]; +} + +-(void)setCurrentProcessState:(ProcessState)aProcessState +{ + self.processState = aProcessState; +} + +- (void)applicationWillFinishLaunching:(NSNotification *)notification +{ + [self.window makeKeyAndOrderFront:self]; +} + +- (void) setDownloadFilename:(NSString *)aFilename +{ + self.filename = aFilename; +} + +- (NSString*) getDownloadFilename +{ + return self.filename; +} + +- (void) setTokenString:(NSString *)aToken +{ + self.userToken = aToken; +} + +- (NSString*) getTokenString +{ + return self.userToken; +} + +- (void) setLoginErrorState:(LoginError)aLoginError +{ + self.loginError = aLoginError; +} + +- (LoginError) getLoginErrorState +{ + return self.loginError; +} + +- (void) launchInterface +{ + NSString* launcherPath = [[self getAppPath] stringByAppendingString:@"HQ Launcher"]; + + [[Settings sharedSettings] setLauncherPath:launcherPath]; + [[Settings sharedSettings] save]; + NSWorkspace *workspace = [NSWorkspace sharedWorkspace]; + NSURL *url = [NSURL fileURLWithPath:[workspace fullPathForApplication:[[self getAppPath] stringByAppendingString:@"interface.app/Contents/MacOS/interface"]]]; + + NSError *error = nil; + + NSString* contentPath = [[self getDownloadPathForContentAndScripts] stringByAppendingString:@"content"]; + NSString* displayName = [ self displayName]; + NSString* scriptsPath = [[self getAppPath] stringByAppendingString:@"interface.app/Contents/Resources/scripts/simplifiedUI/"]; + NSString* domainUrl = [[Settings sharedSettings] getDomainUrl]; + NSString* userToken = [[Launcher sharedLauncher] getTokenString]; + NSArray* arguments; + if (userToken != nil) { + arguments = [NSArray arrayWithObjects: + @"--url" , domainUrl , + @"--tokens", userToken, + @"--cache", contentPath, + @"--displayName", displayName, + @"--script", scriptsPath, + @"--no-updater", + @"--no-launcher", nil]; + } else { + arguments = [NSArray arrayWithObjects: + @"--url" , domainUrl, + @"--cache", contentPath, + @"--script", scriptsPath, + @"--no-updater", + @"--no-launcher", nil]; + } + [workspace launchApplicationAtURL:url options:NSWorkspaceLaunchNewInstance configuration:[NSDictionary dictionaryWithObject:arguments forKey:NSWorkspaceLaunchConfigurationArguments] error:&error]; + + //NSLog(@"arguments %@", [NSDictionary dictionaryWithObject:arguments forKey:NSWorkspaceLaunchConfigurationArguments]); + + [NSApp terminate:self]; +} + +- (ProcessState) currentProccessState +{ + return self.processState; +} + +@end diff --git a/launchers/darwin/src/LoginScreen.h b/launchers/darwin/src/LoginScreen.h new file mode 100644 index 0000000000..9b2d3d529c --- /dev/null +++ b/launchers/darwin/src/LoginScreen.h @@ -0,0 +1,5 @@ +#import + +@interface LoginScreen : NSViewController { +} +@end diff --git a/launchers/darwin/src/LoginScreen.m b/launchers/darwin/src/LoginScreen.m new file mode 100644 index 0000000000..4c83558160 --- /dev/null +++ b/launchers/darwin/src/LoginScreen.m @@ -0,0 +1,76 @@ +#import "LoginScreen.h" +#import "Launcher.h" +#import "CustomUI.h" + +@interface LoginScreen () +@property (nonatomic, assign) IBOutlet NSImageView* backgroundImage; +@property (nonatomic, assign) IBOutlet NSImageView* smallLogo; +@property (nonatomic, assign) IBOutlet NSTextField* username; +@property (nonatomic, assign) IBOutlet NSTextField* password; +@property (nonatomic, assign) IBOutlet NSTextField* orginization; +@property (nonatomic, assign) IBOutlet NSTextField* header; +@property (nonatomic, assign) IBOutlet NSTextField* smallHeader; +@property (nonatomic, assign) IBOutlet NSTextField* trouble; +@property (nonatomic, assign) IBOutlet NSButton* button; +@end + +@implementation LoginScreen + +- (void) awakeFromNib +{ + Launcher* sharedLauncher = [Launcher sharedLauncher]; + if ([sharedLauncher loginShouldSetErrorState]) { + [self.header setStringValue:@"Uh-oh, we have a problem"]; + switch ([sharedLauncher getLoginErrorState]) { + case CREDENTIALS: + [self.smallHeader setStringValue:@"There is a problem with your credentials, please try again"]; + break; + case ORGANIZATION: + [self.smallHeader setStringValue:@"There is a problem with your organization name, please try again"]; + break; + case NONE: + break; + default: + break; + } + [self.button setTitle:@"TRY AGAIN"]; + } + + [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]]; + [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]]; + + NSMutableAttributedString* usernameString = [[NSMutableAttributedString alloc] initWithString:@"Username"]; + + [usernameString addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0,8)]; + [usernameString addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,8)]; + + NSMutableAttributedString* orgName = [[NSMutableAttributedString alloc] initWithString:@"Organization Name"]; + [orgName addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0,17)]; + [orgName addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,17)]; + + NSMutableAttributedString* passwordString = [[NSMutableAttributedString alloc] initWithString:@"Password"]; + + [passwordString addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0,8)]; + [passwordString addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,8)]; + + [self.username setPlaceholderAttributedString:usernameString]; + [self.orginization setPlaceholderAttributedString:orgName]; + [self.password setPlaceholderAttributedString:passwordString]; + + [self.password setTarget:self]; + [self.password setAction:@selector(goToLogin:)]; +} + +- (IBAction)goToLogin:(id)sender +{ + printf("In gotologin"); + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher credentialsEntered:[self.orginization stringValue] :[self.username stringValue] :[self.password stringValue]]; +} + +- (IBAction)havingTrouble:(id)sender +{ + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.highfidelity.com/hq-support"]]; +} + +@end diff --git a/launchers/darwin/src/OrganizationRequest.h b/launchers/darwin/src/OrganizationRequest.h new file mode 100644 index 0000000000..2f7d2570d6 --- /dev/null +++ b/launchers/darwin/src/OrganizationRequest.h @@ -0,0 +1,11 @@ +#import + +@interface OrganizationRequest : NSObject { +} + +@property (nonatomic, retain) NSMutableData* webData; +@property (nonatomic, retain) NSString* jsonString; +@property (nonatomic, retain) NSString* username; + +- (void) confirmOrganization:(NSString*) aOrganization :(NSString*) aUsername; +@end diff --git a/launchers/darwin/src/OrganizationRequest.m b/launchers/darwin/src/OrganizationRequest.m new file mode 100644 index 0000000000..b51de8a19e --- /dev/null +++ b/launchers/darwin/src/OrganizationRequest.m @@ -0,0 +1,96 @@ +#import "OrganizationRequest.h" +#include +#include +#import "Launcher.h" + + +static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/huffman/organizations/"; + +#define str(s) #s +#define LAUNCHER_HMAC_SECRET_STRING str(LAUNCHER_HMAC_SECRET) + +@implementation OrganizationRequest + +- (void) confirmOrganization:(NSString*)aOrganization :(NSString*)aUsername { + self.username = aUsername; + + const char *cKey = LAUNCHER_HMAC_SECRET_STRING; + const char *cData = [aOrganization cStringUsingEncoding:NSASCIIStringEncoding]; + unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH]; + CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC); + NSData *HMACData = [NSData dataWithBytes:cHMAC length:sizeof(cHMAC)]; + const unsigned char *buffer = (const unsigned char *)[HMACData bytes]; + NSMutableString *hash = [NSMutableString stringWithCapacity:HMACData.length * 2]; + for (int i = 0; i < HMACData.length; ++i){ + [hash appendFormat:@"%02x", buffer[i]]; + } + + NSString* jsonFile = [hash stringByAppendingString:@".json"]; + NSError *error; + NSData *data = [NSData dataWithContentsOfURL: [NSURL URLWithString:[organizationURL stringByAppendingString:jsonFile]]]; + + Launcher* sharedLauncher = [Launcher sharedLauncher]; + if (data) { + NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; + [sharedLauncher setDomainURLInfo:[json valueForKey:@"domain"] :[json valueForKey:@"content_set_url"] :[json valueForKey:@"scripts_url"]]; + [sharedLauncher setLoginErrorState: NONE]; + return [sharedLauncher organizationRequestFinished:TRUE]; + } + NSLog(@"FAAAAILLLLLLLEEEEEEEDDDDDD"); + [sharedLauncher setLoginErrorState: ORGANIZATION]; + return [sharedLauncher organizationRequestFinished:FALSE]; + /*NSLog(@"URL: %@", [organizationURL stringByAppendingString:jsonFile]); + NSMutableURLRequest *request = [NSMutableURLRequest new]; + [request setURL:[NSURL URLWithString: [organizationURL stringByAppendingString:@"High%20Fidelity"]]]; + [request setHTTPMethod:@"GET"]; + [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; + + NSURLConnection *theConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self]; + + if(theConnection) { + self.webData = [NSMutableData data]; + NSLog(@"connection initiated"); + }*/ +} + +- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { + [self.webData appendData:data]; +} + +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; + if([ne statusCode] == 200) { + NSLog(@"connection state is 200 - all okay"); + } else { + NSLog(@"connection state is NOT 200"); + } +} + +-(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { + NSLog(@"Conn Err: %@", [error localizedDescription]); +} + +- (void)connectionDidFinishLoading:(NSURLConnection *)connection { + /*NSString* jsonString = [[NSString alloc] initWithBytes: [self.webData mutableBytes] length:[self.webData length] encoding:NSUTF8StringEncoding]; + NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];*/ + + /*Launcher* sharedLauncher = [Launcher sharedLauncher]; + if (json[@"error"] != nil) { + NSLog(@"Login in failed"); + NSString* accessToken = [json objectForKey:@"access_token"]; + NSLog(@"access token %@", accessToken); + [sharedLauncher credentialsAccepted:FALSE]; + } else { + NSLog(@"Login successful"); + NSString* accessToken = [json objectForKey:@"access_token"]; + NSLog(@"access token %@", accessToken); + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + [defaults setValue:accessToken forKey:@"access_token"]; + [defaults synchronize]; + [sharedLauncher credentialsAccepted:TRUE]; + }*/ + //NSLog(@"OUTPUT:: %@", self.jsonString); +} + +@end diff --git a/launchers/darwin/src/ProcessScreen.h b/launchers/darwin/src/ProcessScreen.h new file mode 100644 index 0000000000..156f5428d8 --- /dev/null +++ b/launchers/darwin/src/ProcessScreen.h @@ -0,0 +1,7 @@ +#import + +@interface ProcessScreen : NSViewController { +} + +@property (nonatomic, assign) NSInteger imageRotation; +@end diff --git a/launchers/darwin/src/ProcessScreen.m b/launchers/darwin/src/ProcessScreen.m new file mode 100644 index 0000000000..0a9d6017d1 --- /dev/null +++ b/launchers/darwin/src/ProcessScreen.m @@ -0,0 +1,55 @@ +#import "ProcessScreen.h" +#import "Launcher.h" +#import "CustomUI.h" + +@interface ProcessScreen () +@property (nonatomic, assign) IBOutlet NSImageView* background; +@property (nonatomic, assign) IBOutlet NSImageView* smallLogo; +@property (nonatomic, assign) IBOutlet NSImageView* voxelImage; +@property (nonatomic, assign) IBOutlet NSTextField* boldStatus; +@property (nonatomic, assign) IBOutlet NSTextField* smallStatus; +@end + +@implementation ProcessScreen + +- (void) awakeFromNib { + Launcher* sharedLauncher = [Launcher sharedLauncher]; + switch ([sharedLauncher currentProccessState]) { + case DOWNLOADING_INTERFACE: + [self.boldStatus setStringValue:@"We're building your virtual HQ"]; + [self.smallStatus setStringValue:@"Set up may take several minutes."]; + break; + case RUNNING_INTERFACE_AFTER_DOWNLOAD: + [self.boldStatus setStringValue:@"Your new HQ is all setup"]; + [self.smallStatus setStringValue:@"Thanks for being patient."]; + break; + case CHECKING_UPDATE: + [self.boldStatus setStringValue:@"Getting updates..."]; + [self.smallStatus setStringValue:@"We're getting the lastest and greatest for you, one sec."]; + break; + case RUNNING_INTERFACE_AFTER_UPDATE: + [self.boldStatus setStringValue:@"You're good to go!"]; + [self.smallStatus setStringValue:@"Thanks for being patient."]; + break; + default: + break; + } + [self.background setImage: [NSImage imageNamed:hifiBackgroundFilename]]; + [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]]; + [self.voxelImage setImage: [NSImage imageNamed:hifiVoxelFilename]]; + + self.imageRotation = 0; + //[self.voxelImage setFrameCenterRotation:90]; + + [NSTimer scheduledTimerWithTimeInterval:0.016 + target:self + selector:@selector(rotateView:) + userInfo:nil + repeats:YES]; +} + +- (void) rotateView:(NSTimer *)timer{ + self.imageRotation += 1; + [self.voxelImage setFrameCenterRotation:self.imageRotation]; +} +@end diff --git a/launchers/darwin/src/Settings.h b/launchers/darwin/src/Settings.h new file mode 100644 index 0000000000..6a036ca1b1 --- /dev/null +++ b/launchers/darwin/src/Settings.h @@ -0,0 +1,20 @@ +#import + + +@interface Settings : NSObject { +} +@property (nonatomic, assign) NSInteger build; +@property (nonatomic, assign) BOOL loggedIn; +@property (nonatomic, assign) NSString* domain; +@property (nonatomic, assign) NSString* launcher; +- (NSInteger) latestBuildVersion; +- (BOOL) isLoggedIn; +- (void) login:(BOOL)aLoggedIn; +- (void) buildVersion:(NSInteger) aBuildVersion; +- (void) setLauncherPath:(NSString*) aLauncherPath; +- (NSString*) getLaucnherPath; +- (void) setDomainUrl:(NSString*) aDomainUrl; +- (NSString*) getDomainUrl; +- (void) save; ++ (id) sharedSettings; +@end diff --git a/launchers/darwin/src/Settings.m b/launchers/darwin/src/Settings.m new file mode 100644 index 0000000000..407f869af9 --- /dev/null +++ b/launchers/darwin/src/Settings.m @@ -0,0 +1,127 @@ +#import "Settings.h" +#import "Launcher.h" + + +@implementation Settings + ++ (id) sharedSettings +{ + static Settings* sharedSettings = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedSettings = [[self alloc]init]; + }); + return sharedSettings; +} + +- (NSString*) getFilePath +{ + Launcher* sharedLauncher = [Launcher sharedLauncher]; + NSString* appPath = [sharedLauncher getAppPath]; + NSString* filePath = [appPath stringByAppendingString:@"interface.app/Contents/MacOS/"]; + + return filePath; +} + +- (void) readDataFromJsonFile +{ + NSString* filePath = [self getFilePath]; + NSString* fileAtPath = [filePath stringByAppendingString:@"config.json"]; + if ([[NSFileManager defaultManager] fileExistsAtPath:fileAtPath]) { + NSString* jsonString = [[NSString alloc] initWithData:[NSData dataWithContentsOfFile:fileAtPath] encoding:NSUTF8StringEncoding]; + NSError * err; + NSData *data =[jsonString dataUsingEncoding:NSUTF8StringEncoding]; + NSDictionary * json; + if(data!=nil){ + json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&err]; + + self.loggedIn = [[json valueForKey:@"loggedIn"] boolValue]; + self.build = [[json valueForKey:@"build_version"] integerValue]; + self.launcher = [json valueForKey:@"luancherPath"]; + self.domain = [json valueForKey:@"domain"]; + return; + } + } + self.loggedIn = false; + self.build = 0; + self.launcher = nil; + self.domain = nil; +} + +- (void) writeDataToFile { + NSDictionary* json = [[NSDictionary alloc] initWithObjectsAndKeys: + [NSString stringWithFormat:@"%ld", self.build], @"build_version", + self.loggedIn ? @"TRUE" : @"FALSE", @"loggedIn", + self.domain, @"domain", + self.launcher, @"launcherPath", nil]; + NSError * err; + NSData * jsonData = [NSJSONSerialization dataWithJSONObject:json options:0 error:&err]; + NSString * jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + + NSString* filePath = [self getFilePath]; + NSString* fileAtPath = [filePath stringByAppendingString:@"config.json"]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:fileAtPath]) { + NSError * error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:filePath withIntermediateDirectories:FALSE attributes:nil error:&error]; + [[NSFileManager defaultManager] createFileAtPath:fileAtPath contents:nil attributes:nil]; + + } + [[jsonString dataUsingEncoding:NSUTF8StringEncoding] writeToFile:fileAtPath atomically:NO]; + +} + +-(id)init +{ + if (self = [super init]) { + [self readDataFromJsonFile]; + } + return self; +} + +- (BOOL) isLoggedIn +{ + return self.loggedIn; +} + +- (NSInteger) latestBuildVersion +{ + return self.build; +} + +- (void) buildVersion:(NSInteger)aBuildVersion +{ + self.build = aBuildVersion; +} + +- (void) login:(BOOL)aLoggedIn +{ + self.loggedIn = aLoggedIn; +} + +- (void) setLauncherPath:(NSString *)aLauncherPath +{ + self.launcher = aLauncherPath; +} + +- (void) setDomainUrl:(NSString *)aDomainUrl +{ + self.domain = aDomainUrl; +} + +- (NSString*) getDomainUrl +{ + return self.domain; +} + +- (NSString*) getLaucnherPath +{ + return self.launcher; +} + +- (void) save +{ + [self writeDataToFile]; +} + +@end diff --git a/launchers/darwin/src/SplashScreen.h b/launchers/darwin/src/SplashScreen.h new file mode 100644 index 0000000000..a2e2356682 --- /dev/null +++ b/launchers/darwin/src/SplashScreen.h @@ -0,0 +1,6 @@ +#import +#import "LoginScreen.h" +@interface SplashScreen: NSViewController { +} + +@end diff --git a/launchers/darwin/src/SplashScreen.m b/launchers/darwin/src/SplashScreen.m new file mode 100644 index 0000000000..a1f726c1df --- /dev/null +++ b/launchers/darwin/src/SplashScreen.m @@ -0,0 +1,19 @@ +#import "SplashScreen.h" +#import "Launcher.h" +#import "CustomUI.h" + +@interface SplashScreen () +@property (nonatomic, assign) IBOutlet NSImageView* imageView; +@property (nonatomic, assign) IBOutlet NSImageView* logoImage; +@property (nonatomic, assign) IBOutlet NSButton* button; +@end + +@implementation SplashScreen +- (void) viewDidLoad { +} + +-(void)awakeFromNib { + [self.imageView setImage:[NSImage imageNamed:hifiBackgroundFilename]]; + [self.logoImage setImage:[NSImage imageNamed:hifiLargeLogoFilename]]; +} +@end diff --git a/launchers/darwin/src/Window.h b/launchers/darwin/src/Window.h new file mode 100644 index 0000000000..05e1a7e09e --- /dev/null +++ b/launchers/darwin/src/Window.h @@ -0,0 +1,6 @@ +#import + +@interface Window : NSWindow { + +} +@end diff --git a/launchers/darwin/src/Window.m b/launchers/darwin/src/Window.m new file mode 100644 index 0000000000..fc54e095e7 --- /dev/null +++ b/launchers/darwin/src/Window.m @@ -0,0 +1,7 @@ +#import "Window.h" + +@implementation Window +-(BOOL)canBecomeKeyWindow { + return YES; +} +@end diff --git a/launchers/darwin/src/main.mm b/launchers/darwin/src/main.mm new file mode 100644 index 0000000000..41e2986af7 --- /dev/null +++ b/launchers/darwin/src/main.mm @@ -0,0 +1,45 @@ +#import "Launcher.h" +#import "Settings.h" + +void redirectLogToDocuments() +{ + NSString* filePath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0] + stringByAppendingString:@"/Launcher/"]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) { + NSError * error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:filePath withIntermediateDirectories:TRUE attributes:nil error:&error]; + } + NSString *pathForLog = [filePath stringByAppendingPathComponent:@"log.txt"]; + + freopen([pathForLog cStringUsingEncoding:NSASCIIStringEncoding],"a+",stderr); +} + +int main(int argc, const char* argv[]) { + //NSApp.appearance = [NSAppearance appearanceNamed: NSAppearanceNameAqua]; + //redirectLogToDocuments(); + NSArray* apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.highfidelity.launcher"]; + if ([apps count] > 1) { + NSLog(@"launcher is already running"); + return 0; + } + + [NSApplication sharedApplication]; + Launcher* sharedLauncher = [Launcher sharedLauncher]; + [Settings sharedSettings]; + [NSApp setDelegate: sharedLauncher]; + + // Referenced from https://stackoverflow.com/questions/9155015/handle-cmd-q-in-cocoa-application-and-menu-item-quit-application-programmatic + id menubar = [[NSMenu new] autorelease]; + id appMenuItem = [[NSMenuItem new] autorelease]; + [menubar addItem:appMenuItem]; + [NSApp setMainMenu:menubar]; + id appMenu = [[NSMenu new] autorelease]; + id appName = [[NSProcessInfo processInfo] processName]; + id quitTitle = [@"Quit " stringByAppendingString:appName]; + id quitMenuItem = [[[NSMenuItem alloc] initWithTitle:quitTitle action:@selector(terminate:) keyEquivalent:@"q"] autorelease]; + [appMenu addItem:quitMenuItem]; + [appMenuItem setSubmenu:appMenu]; + + return NSApplicationMain(argc, argv); +} diff --git a/launchers/win32/BUILD.md b/launchers/win32/BUILD.md new file mode 100644 index 0000000000..dbaa407dfd --- /dev/null +++ b/launchers/win32/BUILD.md @@ -0,0 +1,33 @@ +## Windows Build Guide + +To build the launcher we need: + +- Visual Studio Community 2017. +- CMake. + + +### Installing Visual Studio 2017 + +If you don’t have Community or Professional edition of Visual Studio 2017, download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/). + +When selecting components, check "Desktop development with C++". Also on the right on the Summary toolbar, check "Windows 8.1 SDK and UCRT SDK" and "VC++ 2015.3 v140 toolset (x86,x64)". + +If you already have Visual Studio installed and need to add python, open the "Add or remove programs" control panel and find the "Microsoft Visual Studio Installer". + +### Installing CMake + +Download and install the latest version of CMake 3.9. + +Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.9 Version page](https://cmake.org/files/v3.9/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted. + +### Running CMake to Generate Build Files + +Run Command Prompt from Start and run the following commands: +``` +cd "%LAUNCHER_DIR%" +mkdir build +cd build +cmake .. -G "Visual Studio 15 Win64" -T v140 +``` + +Where `%LAUNCHER_DIR%` is the directory for the PC light launcher repository. diff --git a/launchers/win32/CMakeLists.txt b/launchers/win32/CMakeLists.txt new file mode 100644 index 0000000000..4d2618c9bf --- /dev/null +++ b/launchers/win32/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 3.9.2) + +project(HQLauncher) + +set(CMAKE_CONFIGURATION_TYPES "Debug;Release" + CACHE STRING "Configuration types" FORCE) + +# Use of MFC +set(CMAKE_MFC_FLAG 1) + +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") + +add_executable(HQLauncher + WIN32 + libs/json/json.h + libs/json/json-forwards.h + libs/jsoncpp.cpp + LauncherApp.cpp + LauncherApp.h + Launcher.rc + LauncherDlg.cpp + LauncherDlg.h + LauncherManager.cpp + LauncherManager.h + LauncherUtils.cpp + LauncherUtils.h + libs/miniz.cpp + libs/miniz.h + res/HiFi_Logo_Large.png + res/HiFi_Logo_Small.png + res/HiFi_Voxel.png + res/HiFi_Window.png + res/interface.ico + res/Launcher.rc2 + Resource.h + stdafx.cpp + stdafx.h + targetver.h +) + +target_compile_definitions(HQLauncher PRIVATE LAUNCHER_HMAC_SECRET=$ENV{LAUNCHER_HMAC_SECRET}) + +# Preprocessor definitions +target_compile_definitions(HQLauncher PRIVATE + $<$:_UNICODE;_WINDOWS;_DEBUG> + $<$:_UNICODE;_WINDOWS;NDEBUG> +) + +# Minimal rebuild +if (MSVC) + target_compile_options(HQLauncher PRIVATE + "$<$:/Gm->" + "$<$:/Gm->" + ) +endif () + +# Precompiled header files +if (MSVC) + target_compile_options(HQLauncher PRIVATE + "$<$:/Yu>" + "$<$:/Yu>" + ) + set_property(SOURCE stdafx.cpp + APPEND_STRING PROPERTY COMPILE_FLAGS + "$<$:/Yc> \ + $<$:/Yc>") +endif () diff --git a/launchers/win32/Launcher.rc b/launchers/win32/Launcher.rc new file mode 100644 index 0000000000..49f3ca53c5 --- /dev/null +++ b/launchers/win32/Launcher.rc @@ -0,0 +1,214 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#ifndef APSTUDIO_INVOKED +#include "targetver.h" +#endif +#include "afxres.h" +#include "verrsrc.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#ifndef APSTUDIO_INVOKED\r\n" + "#include ""targetver.h""\r\n" + "#endif\r\n" + "#include ""afxres.h""\r\n" + "#include ""verrsrc.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "LANGUAGE 9, 1\r\n" + "#include ""res\\Launcher.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON "res\\interface.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// BINARY +// + +IDR_FONT_REGULAR BINARY "res\\Graphikregular.ttf" + +IDR_FONT_BOLD BINARY "res\\Graphikbold.ttf" + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_LAUNCHER_DIALOG DIALOGEX 0, 0, 300, 196 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION +EXSTYLE WS_EX_APPWINDOW +FONT 10, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + CONTROL "",IDC_VOXEL,"Static",SS_BLACKRECT,65,27,174,123 + EDITTEXT IDC_ORGNAME,44,68,219,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | NOT WS_BORDER + EDITTEXT IDC_USERNAME,44,95,219,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | NOT WS_BORDER + EDITTEXT IDC_PASSWORD,44,122,219,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE | NOT WS_BORDER + LTEXT "Organization name",IDC_ORGNAME_BANNER,48,68,219,12,NOT WS_VISIBLE + LTEXT "Username",IDC_USERNAME_BANNER,48,95,219,12,NOT WS_VISIBLE + LTEXT "Password",IDC_PASSWORD_BANNER,48,122,219,12,NOT WS_VISIBLE + CTEXT "",IDC_MESSAGE_LABEL,5,39,299,23,NOT WS_VISIBLE + CTEXT "",IDC_ACTION_LABEL,10,15,286,25,NOT WS_VISIBLE + CTEXT "",IDC_MESSAGE2_LABEL,35,172,239,15,NOT WS_VISIBLE + CTEXT "",IDC_ACTION2_LABEL,15,147,278,25,NOT WS_VISIBLE + RTEXT "",IDC_TERMS,15,172,180,15,NOT WS_VISIBLE + LTEXT "",IDC_TERMS2,197,172,80,15,NOT WS_VISIBLE + CTEXT "",IDC_TROUBLE,65,203,174,15,NOT WS_VISIBLE + CONTROL "NEXT",IDC_BUTTON_NEXT,"Button",BS_OWNERDRAW | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,107,158,94,16 + CONTROL "Having Trouble?",IDC_TROUBLE_LINK,"Button",BS_OWNERDRAW | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,126,203,56,11 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "High Fidelity Inc." + VALUE "FileDescription", "HQ Launcher" + VALUE "FileVersion", "1.0.0.1" + VALUE "InternalName", "HQ Launcher" + VALUE "LegalCopyright", "High Fidelity Inc. All rights reserved." + VALUE "OriginalFilename", "HQ Launcher.exe" + VALUE "ProductName", "HQ Launcher" + VALUE "ProductVersion", "0.0.8.5" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_LAUNCHER_DIALOG, DIALOG + BEGIN + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// AFX_DIALOG_LAYOUT +// + +IDD_LAUNCHER_DIALOG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// PNG +// + +IDB_PNG1 PNG "res\\HiFi_Window.png" + +IDB_PNG2 PNG "res\\HiFi_Logo_Large.png" + +IDB_PNG4 PNG "res\\HiFi_Voxel.png" + +IDB_PNG5 PNG "res\\HiFi_Logo_Small.png" + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE 9, 1 +#include "res\Launcher.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/launchers/win32/LauncherApp.cpp b/launchers/win32/LauncherApp.cpp new file mode 100644 index 0000000000..a8c69de166 --- /dev/null +++ b/launchers/win32/LauncherApp.cpp @@ -0,0 +1,91 @@ +// +// LauncherApp.cpp +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "stdafx.h" +#include "LauncherApp.h" +#include "LauncherDlg.h" +#include "LauncherManager.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + +// CLauncherApp + +BEGIN_MESSAGE_MAP(CLauncherApp, CWinApp) + ON_COMMAND(ID_HELP, &CWinApp::OnHelp) +END_MESSAGE_MAP() + +CLauncherApp::CLauncherApp(){} + +// The one and only CLauncherApp object + +CLauncherApp theApp; + +// CLauncherApp initialization + +BOOL CLauncherApp::InitInstance() { + // don't launch if already running + CreateMutex(NULL, TRUE, _T("HQ_Launcher_Mutex")); + if (GetLastError() == ERROR_ALREADY_EXISTS) { + return FALSE; + } + int iNumOfArgs; + LPWSTR* pArgs = CommandLineToArgvW(GetCommandLine(), &iNumOfArgs); + if (iNumOfArgs > 1 && CString(pArgs[1]).Compare(_T("--uninstall")) == 0) { + _manager.uninstall(); + } else { + _manager.init(); + } + if (!_manager.installLauncher()) { + return FALSE; + } + installFont(IDR_FONT_REGULAR); + installFont(IDR_FONT_BOLD); + CWinApp::InitInstance(); + + SetRegistryKey(_T("HQ High Fidelity")); + + CLauncherDlg dlg; + m_pMainWnd = &dlg; + INT_PTR nResponse = dlg.DoModal(); + +#if !defined(_AFXDLL) && !defined(_AFX_NO_MFC_CONTROLS_IN_DIALOGS) + ControlBarCleanUp(); +#endif + + // Since the dialog has been closed, return FALSE so that we exit the + // application, rather than start the application's message pump. + return FALSE; +} + + + +BOOL CLauncherApp::installFont(int fontID) { + HINSTANCE hResInstance = AfxGetResourceHandle(); + HRSRC res = FindResource(hResInstance, + MAKEINTRESOURCE(fontID), L"BINARY"); + if (res) { + HGLOBAL mem = LoadResource(hResInstance, res); + void *data = LockResource(mem); + DWORD len = (DWORD)SizeofResource(hResInstance, res); + + DWORD nFonts; + auto m_fonthandle = AddFontMemResourceEx( + data, // font resource + len, // number of bytes in font resource + NULL, // Reserved. Must be 0. + &nFonts // number of fonts installed + ); + + return (m_fonthandle != 0); + } + return FALSE; +} diff --git a/launchers/win32/LauncherApp.h b/launchers/win32/LauncherApp.h new file mode 100644 index 0000000000..8232acb249 --- /dev/null +++ b/launchers/win32/LauncherApp.h @@ -0,0 +1,32 @@ +// +// LauncherApp.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +#ifndef __AFXWIN_H__ + #error "include 'stdafx.h' before including this file for PCH" +#endif + +#include "resource.h" // main symbols +#include "LauncherManager.h" + +class CLauncherApp : public CWinApp +{ +public: + CLauncherApp(); + virtual BOOL InitInstance(); + void setDialogOnFront() { SetWindowPos(m_pMainWnd->GetSafeHwnd(), HWND_TOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); } + LauncherManager _manager; +private: + BOOL installFont(int fontID); + DECLARE_MESSAGE_MAP() +}; + +extern CLauncherApp theApp; diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp new file mode 100644 index 0000000000..f6acbce014 --- /dev/null +++ b/launchers/win32/LauncherDlg.cpp @@ -0,0 +1,624 @@ +// +// LauncherDlg.cpp +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "stdafx.h" +#include "LauncherApp.h" +#include "LauncherDlg.h" + +#include +#pragma comment(lib, "d2d1") + +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + +static int ACTION_FONT_SIZE = 40; +static int MESSAGE_FONT_SIZE = 19; +static int FIELDS_FONT_SIZE = 24; +static int BUTTON_FONT_SIZE = 25; +static int TERMS_FONT_SIZE = 17; +static int TROUBLE_FONT_SIZE = 14; + +static COLORREF COLOR_GREY = RGB(120, 120, 120); +static COLORREF COLOR_BLACK= RGB(0, 0, 0); +static COLORREF COLOR_WHITE = RGB(255, 255, 255); +static COLORREF COLOR_LIGHTER_GREY = RGB(230, 230, 230); +static COLORREF COLOR_LIGHT_GREY = RGB(200, 200, 200); +static COLORREF COLOR_BLUE = RGB(50, 160, 200); + +static CString GRAPHIK_REGULAR = _T("Graphik-Regular"); +static CString GRAPHIK_SEMIBOLD = _T("Graphik-Semibold"); + +static CString TROUBLE_URL = _T("https://www.highfidelity.com/hq-support"); + + +CLauncherDlg::CLauncherDlg(CWnd* pParent) + : CDialog(IDD_LAUNCHER_DIALOG, pParent) +{ + m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); + EnableD2DSupport(); +} + +void CLauncherDlg::DoDataExchange(CDataExchange* pDX) +{ + DDX_Control(pDX, IDC_BUTTON_NEXT, m_btnNext); + DDX_Control(pDX, IDC_TROUBLE_LINK, m_trouble_link); + DDX_Control(pDX, IDC_ORGNAME, m_orgname); + DDX_Control(pDX, IDC_USERNAME, m_username); + DDX_Control(pDX, IDC_PASSWORD, m_password); + CDialog::DoDataExchange(pDX); +} + +BEGIN_MESSAGE_MAP(CLauncherDlg, CDialog) + ON_WM_PAINT() + ON_WM_QUERYDRAGICON() + ON_WM_TIMER() + ON_EN_SETFOCUS(IDC_ORGNAME, &CLauncherDlg::OnOrgEditChangeFocus) + ON_EN_SETFOCUS(IDC_USERNAME, &CLauncherDlg::OnUserEditChangeFocus) + ON_EN_SETFOCUS(IDC_PASSWORD, &CLauncherDlg::OnPassEditChangeFocus) + ON_BN_CLICKED(IDC_BUTTON_NEXT, &CLauncherDlg::OnNextClicked) + ON_BN_CLICKED(IDC_TROUBLE_LINK, &CLauncherDlg::OnTroubleClicked) + ON_WM_CTLCOLOR() + ON_WM_DRAWITEM() + ON_WM_SETCURSOR() +END_MESSAGE_MAP() + +// CLauncherDlg message handlers + +BOOL CLauncherDlg::OnInitDialog() { + CDialog::OnInitDialog(); + + SetIcon(m_hIcon, TRUE); // Set big icon + SetIcon(m_hIcon, FALSE); // Set small icon + + CFont editFont; + if (LauncherUtils::getFont(GRAPHIK_REGULAR, FIELDS_FONT_SIZE, true, editFont)) { + m_orgname.SetFont(&editFont); + m_username.SetFont(&editFont); + m_password.SetFont(&editFont); + } + CFont buttonFont; + if (LauncherUtils::getFont(_T("Graphik-Bold"), BUTTON_FONT_SIZE, true, buttonFont)) { + m_btnNext.SetFont(&editFont); + } + + m_message_label = (CStatic *)GetDlgItem(IDC_MESSAGE_LABEL); + m_action_label = (CStatic *)GetDlgItem(IDC_ACTION_LABEL); + m_message2_label = (CStatic *)GetDlgItem(IDC_MESSAGE2_LABEL); + m_action2_label = (CStatic *)GetDlgItem(IDC_ACTION2_LABEL); + + m_orgname_banner = (CStatic *)GetDlgItem(IDC_ORGNAME_BANNER); + m_username_banner = (CStatic *)GetDlgItem(IDC_USERNAME_BANNER); + m_password_banner = (CStatic *)GetDlgItem(IDC_PASSWORD_BANNER); + + m_terms = (CStatic *)GetDlgItem(IDC_TERMS); + m_terms2 = (CStatic *)GetDlgItem(IDC_TERMS2); + m_trouble = (CStatic *)GetDlgItem(IDC_TROUBLE); + + m_voxel = (CStatic *)GetDlgItem(IDC_VOXEL); + + m_voxel->EnableD2DSupport(); + + m_pRenderTarget = GetRenderTarget(); + + SetTimer(1, 2, NULL); + + return TRUE; +} + +BOOL CLauncherDlg::PreTranslateMessage(MSG* pMsg) { + if ((pMsg->message == WM_KEYDOWN)) + { + if (pMsg->wParam == VK_RETURN) + { + OnNextClicked(); + return TRUE; + } + } + return CDialog::PreTranslateMessage(pMsg); +} + +void CLauncherDlg::setCustomDialog() { + + LONG lStyle = GetWindowLong(GetSafeHwnd(), GWL_STYLE); + lStyle &= ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU); + SetWindowLong(GetSafeHwnd(), GWL_STYLE, lStyle); + + LONG lExStyle = GetWindowLong(GetSafeHwnd(), GWL_EXSTYLE); + lExStyle &= ~(WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE); + SetWindowLong(GetSafeHwnd(), GWL_EXSTYLE, lExStyle); + + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + // theApp.setDialogOnFront(); +} + +void CLauncherDlg::OnPaint() +{ + CPaintDC dc(this); + setCustomDialog(); + CDialog::OnPaint(); +} + +// The system calls this function to obtain the cursor to display while the user drags +// the minimized window. +HCURSOR CLauncherDlg::OnQueryDragIcon() +{ + return static_cast(m_hIcon); +} + +void CLauncherDlg::startProcess() { + if (theApp._manager.needsUpdate()) { + setDrawDialog(DrawStep::DrawProcessUpdate); + } else { + setDrawDialog(DrawStep::DrawProcessSetup); + } + + CString installDir; + theApp._manager.getAndCreatePaths(LauncherManager::PathType::Interface_Directory, installDir); + CString interfaceExe = installDir += "\\interface.exe"; + if (!theApp._manager.isLoggedIn()) { + theApp._manager.downloadContent(); + } else { + theApp._manager.downloadApplication(); + } +} + +#define str(s) #s +#define LAUNCHER_HMAC_SECRET_STRING str(LAUNCHER_HMAC_SECRET) + +BOOL CLauncherDlg::getHQInfo(const CString& orgname) { + CString hash; + LauncherUtils::hMac256(orgname, LAUNCHER_HMAC_SECRET_STRING, hash); + return theApp._manager.readOrganizationJSON(hash) == LauncherUtils::ResponseError::NoError; +} + +afx_msg void CLauncherDlg::OnTroubleClicked() { + ShellExecute(0, NULL, TROUBLE_URL, NULL, NULL, SW_SHOWDEFAULT); +} + +afx_msg void CLauncherDlg::OnNextClicked() { + if (_drawStep != DrawStep::DrawChoose) { + CString token; + CString username, password, orgname; + m_orgname.GetWindowTextW(orgname); + m_username.GetWindowTextW(username); + m_password.GetWindowTextW(password); + LauncherUtils::ResponseError error; + if (orgname.GetLength() > 0 && username.GetLength() > 0 && password.GetLength() > 0) { + if (getHQInfo(orgname)) { + error = theApp._manager.getAccessTokenForCredentials(username, password); + if (error == LauncherUtils::ResponseError::NoError) { + setDrawDialog(DrawStep::DrawChoose); + } else if (error == LauncherUtils::ResponseError::BadCredentials) { + setDrawDialog(DrawStep::DrawLoginErrorCred); + } else { + MessageBox(L"Error Reading or retreaving response.", L"Network Error", MB_OK | MB_ICONERROR); + } + } else { + setDrawDialog(DrawStep::DrawLoginErrorOrg); + } + } + } else { + CString displayName; + m_username.GetWindowTextW(displayName); + theApp._manager.setDisplayName(displayName); + startProcess(); + } +} + +void CLauncherDlg::drawBackground(CHwndRenderTarget* pRenderTarget) { + CD2DBitmap m_pBitmamBackground(pRenderTarget, IDB_PNG1, _T("PNG")); + auto size = pRenderTarget->GetSize(); + CD2DRectF backRec(0.0f, 0.0f, size.width, size.height); + pRenderTarget->DrawBitmap(&m_pBitmamBackground, backRec); +} + +void CLauncherDlg::drawLogo(CHwndRenderTarget* pRenderTarget) { + CD2DBitmap m_pBitmamLogo(pRenderTarget, IDB_PNG2, _T("PNG")); + auto size = pRenderTarget->GetSize(); + int logoWidth = 231; + int logoHeight = 181; + float logoPosX = 0.5f * (size.width - logoWidth); + float logoPosY = 0.95f * (size.height - logoHeight); + CD2DRectF logoRec(logoPosX, logoPosY, logoPosX + logoWidth, logoPosY + logoHeight); + pRenderTarget->DrawBitmap(&m_pBitmamLogo, logoRec); +} + +void CLauncherDlg::drawSmallLogo(CHwndRenderTarget* pRenderTarget) { + CD2DBitmap m_pBitmamLogo(pRenderTarget, IDB_PNG5, _T("PNG")); + auto size = pRenderTarget->GetSize(); + int padding = 6; + int logoWidth = 100; + int logoHeight = 18; + float logoPosX = size.width - logoWidth - padding; + float logoPosY = size.height - logoHeight - padding; + CD2DRectF logoRec(logoPosX, logoPosY, logoPosX + logoWidth, logoPosY + logoHeight); + pRenderTarget->DrawBitmap(&m_pBitmamLogo, logoRec); +} + +void CLauncherDlg::drawVoxel(CHwndRenderTarget* pRenderTarget) { + CD2DBitmap m_pBitmamVoxel(pRenderTarget, IDB_PNG4, _T("PNG")); + auto size = pRenderTarget->GetSize(); + int logoWidth = 132; + int logoHeight = 134; + float voxelPosX = 0.5f * (size.width - logoWidth); + float voxelPosY = 0.5f * (size.height - logoHeight); + CD2DRectF voxelRec(voxelPosX, voxelPosY, voxelPosX + logoWidth, voxelPosY + logoHeight); + auto midPoint = D2D1::Point2F(0.5f * size.width, 0.5f * size.height); + _logoRotation += 2.0f; + CD2DSolidColorBrush brush(pRenderTarget, D2D1::ColorF(0.0f, 0.0f, 0.0f)); + pRenderTarget->SetTransform(D2D1::Matrix3x2F::Rotation(_logoRotation - 2.0f, midPoint)); + pRenderTarget->FillRectangle(voxelRec, &brush); + pRenderTarget->SetTransform(D2D1::Matrix3x2F::Rotation(_logoRotation, midPoint)); + pRenderTarget->DrawBitmap(&m_pBitmamVoxel, voxelRec); + pRenderTarget->SetTransform(D2D1::Matrix3x2F::Identity()); +} + + +void CLauncherDlg::showWindows(std::vector windows, bool show) { + for (auto window : windows) { + window->ShowWindow(show ? SW_SHOW : SW_HIDE); + } +} + +void CLauncherDlg::prepareLogin(DrawStep step) { + m_voxel->ShowWindow(SW_HIDE); + m_orgname_banner->SetWindowTextW(_T("Organization Name")); + m_username_banner->SetWindowTextW(_T("Username")); + m_password_banner->SetWindowTextW(_T("Password")); + CString editText; + m_orgname.GetWindowTextW(editText); + m_orgname_banner->ShowWindow(editText.GetLength() == 0 ? SW_SHOW : SW_HIDE); + m_username.GetWindowTextW(editText); + m_username_banner->ShowWindow(editText.GetLength() == 0 ? SW_SHOW : SW_HIDE); + m_password.GetWindowTextW(editText); + m_password_banner->ShowWindow(editText.GetLength() == 0 ? SW_SHOW : SW_HIDE); + m_orgname.ShowWindow(SW_SHOW); + m_username.ShowWindow(SW_SHOW); + m_password.ShowWindow(SW_SHOW); + CString actionText = step == DrawStep::DrawLoginLogin ? _T("Please log in") : _T("Uh-oh, we have a problem"); + CString messageText = step == DrawStep::DrawLoginLogin ? _T("Be sure you've uploaded your Avatar before signing in.") : + step == DrawStep::DrawLoginErrorCred ? _T("There is a problem with your credentials\n please try again.") : _T("There is a problem with your Organization name\n please try again."); + m_action_label->SetWindowTextW(actionText); + m_message_label->SetWindowTextW(messageText); + m_action_label->ShowWindow(SW_SHOW); + m_message_label->ShowWindow(SW_SHOW); + m_btnNext.ShowWindow(SW_SHOW); + m_trouble->SetWindowTextW(_T("Having Trouble?")); + m_trouble->ShowWindow(SW_SHOW); + m_trouble_link.ShowWindow(SW_SHOW); + +} + + +void CLauncherDlg::prepareChoose() { + m_orgname.ShowWindow(SW_HIDE); + m_username.SetWindowTextW(_T("")); + m_username_banner->SetWindowTextW(_T("Display Name")); + CString editText; + m_username.GetWindowTextW(editText); + m_username_banner->ShowWindow(editText.GetLength() == 0 ? SW_SHOW : SW_HIDE); + m_password.ShowWindow(SW_HIDE); + m_orgname_banner->ShowWindow(SW_HIDE); + m_password_banner->ShowWindow(SW_HIDE); + m_action_label->SetWindowTextW(_T("Choose a display name")); + m_message_label->SetWindowTextW(_T("This is the name that your teammates will see.")); + m_terms->ShowWindow(SW_SHOW); + m_terms2->ShowWindow(SW_SHOW); + m_terms->SetWindowTextW(_T("By signing in, you agree to the High Fidelity")); + m_terms2->SetWindowTextW(_T("Terms of Service")); + CRect rec; + m_btnNext.GetWindowRect(&rec); + ScreenToClient(&rec); + if (rec.top > 281) { + rec.bottom -= 35; + rec.top -= 35; + m_btnNext.MoveWindow(rec, FALSE); + } + m_btnNext.ShowWindow(SW_SHOW); +} + +void CLauncherDlg::prepareProcess(DrawStep step) { + m_trouble->ShowWindow(SW_HIDE); + m_trouble_link.ShowWindow(SW_HIDE); + m_terms->ShowWindow(SW_HIDE); + m_terms2->ShowWindow(SW_HIDE); + m_orgname_banner->ShowWindow(SW_HIDE); + m_username_banner->ShowWindow(SW_HIDE); + m_password_banner->ShowWindow(SW_HIDE); + m_orgname.ShowWindow(SW_HIDE); + m_username.ShowWindow(SW_HIDE); + m_password.ShowWindow(SW_HIDE); + m_action_label->SetWindowTextW(_T("")); + m_message_label->SetWindowTextW(_T("")); + m_btnNext.ShowWindow(SW_HIDE); + m_action_label->ShowWindow(SW_HIDE); + m_message_label->ShowWindow(SW_HIDE); + m_voxel->ShowWindow(SW_SHOW); + CString actionText = _T(""); + CString messageText = _T(""); + switch (step) { + case DrawStep::DrawProcessSetup: + actionText = _T("We're building your virtual HQ"); + messageText = _T("Set up may take several minutes."); + break; + case DrawStep::DrawProcessUpdate: + actionText = _T("Getting updates..."); + messageText = _T("We're getting the latest and greatest for you, one sec."); + break; + case DrawStep::DrawProcessFinishHq: + actionText = _T("Your new HQ is all setup"); + messageText = _T("Thanks for being patient."); + break; + case DrawStep::DrawProcessFinishUpdate: + actionText = _T("You're good to go!"); + messageText = _T("Thanks for being patient."); + break; + case DrawStep::DrawProcessUninstall: + actionText = _T("Uninstalling..."); + messageText = _T("It'll take one sec."); + break; + } + m_action2_label->SetWindowTextW(actionText); + m_message2_label->SetWindowTextW(messageText); + m_action2_label->ShowWindow(SW_SHOW); + m_message2_label->ShowWindow(SW_SHOW); +} + +void CLauncherDlg::prepareError() { +} + +BOOL CLauncherDlg::getTextFormat(int resID, TextFormat& formatOut) { + // Set default values for message + BOOL isText = TRUE; + formatOut.color = COLOR_LIGHT_GREY; + formatOut.isBold = false; + formatOut.isButton = false; + formatOut.size = MESSAGE_FONT_SIZE; + formatOut.underlined = false; + + switch (resID) { + case IDC_VOXEL: + case IDD_LAUNCHER_DIALOG: + isText = FALSE; + case IDC_MESSAGE_LABEL: + case IDC_MESSAGE2_LABEL: + // Default values + break; + case IDC_ACTION_LABEL: + case IDC_ACTION2_LABEL: + formatOut.size = ACTION_FONT_SIZE; + formatOut.isBold = true; + formatOut.color = COLOR_LIGHTER_GREY; + break; + case IDC_USERNAME: + case IDC_PASSWORD: + case IDC_ORGNAME: + formatOut.color = COLOR_WHITE; + formatOut.size = FIELDS_FONT_SIZE; + formatOut.underlined = true; + break; + case IDC_USERNAME_BANNER: + case IDC_PASSWORD_BANNER: + case IDC_ORGNAME_BANNER: + formatOut.size = FIELDS_FONT_SIZE; + formatOut.color = COLOR_GREY; + break; + case IDC_TERMS: + formatOut.size = TERMS_FONT_SIZE; + break; + case IDC_TERMS2: + formatOut.size = TERMS_FONT_SIZE; + formatOut.isBold = true; + break; + case IDC_TROUBLE: + formatOut.size = TROUBLE_FONT_SIZE; + formatOut.color = COLOR_BLUE; + break; + } + return isText; +} + +HBRUSH CLauncherDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) +{ + + HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); + TextFormat textFormat; + int resId = pWnd->GetDlgCtrlID(); + if (getTextFormat(resId, textFormat)) { + pDC->SetTextColor(textFormat.color); + pDC->SetBkMode(TRANSPARENT); + CFont textFont; + CString fontFamily = textFormat.isBold ? GRAPHIK_SEMIBOLD : GRAPHIK_REGULAR; + if (LauncherUtils::getFont(fontFamily, textFormat.size, textFormat.isBold, textFont)) { + pDC->SelectObject(&textFont); + } + if (textFormat.underlined) { + CRect rect; + pWnd->GetClientRect(&rect); + int borderThick = 1; + int padding = 4; + CRect lineRect = CRect(rect.left + padding, rect.bottom, rect.right - padding, rect.bottom + borderThick); + lineRect.MoveToY(lineRect.bottom + 1); + pDC->FillSolidRect(lineRect, COLOR_GREY); + } + } + return (HBRUSH)GetStockObject(BLACK_BRUSH); +} + +void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct) +{ + CDC dc; + dc.Attach(lpDrawItemStruct->hDC); + CRect rect = lpDrawItemStruct->rcItem; + CRect defrect = rect; + CString btnName = _T(""); + int xpan = 0; + if (nIDCtl == IDC_BUTTON_NEXT) { + if (_drawStep == DrawStep::DrawChoose || _drawStep == DrawStep::DrawLoginLogin) { + btnName += _drawStep == DrawStep::DrawLoginLogin ? _T("NEXT") : _T("LOG IN"); + int xpan = -20; + defrect = CRect(rect.left - xpan, rect.top, rect.right + xpan, rect.bottom); + } else { + btnName += _T("TRY AGAIN"); + } + int borderThick = 2; + dc.FillSolidRect(rect, COLOR_BLACK); + dc.FillSolidRect(defrect, COLOR_WHITE); + defrect.DeflateRect(borderThick, borderThick, borderThick, borderThick); + dc.FillSolidRect(defrect, COLOR_BLACK); + UINT state = lpDrawItemStruct->itemState; + dc.SetTextColor(COLOR_WHITE); + + CFont buttonFont; + if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, BUTTON_FONT_SIZE, true, buttonFont)) { + dc.SelectObject(buttonFont); + } + dc.DrawText(btnName, CRect(rect.left, rect.top + 4, rect.right, rect.bottom - 8), DT_CENTER | DT_VCENTER | DT_SINGLELINE); + dc.Detach(); + } else if (nIDCtl == IDC_TROUBLE_LINK) { + dc.FillSolidRect(rect, COLOR_BLACK); + dc.SetTextColor(COLOR_BLUE); + CFont buttonFont; + if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, TROUBLE_FONT_SIZE, true, buttonFont)) { + dc.SelectObject(buttonFont); + } + dc.DrawText(_T("Having Trouble"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_CENTER | DT_VCENTER | DT_SINGLELINE); + } + +} + +void CLauncherDlg::redrawBanner(const CEdit& edit, CStatic* banner) { + CString editText; + edit.GetWindowTextW(editText); + if (editText.GetLength() == 0) { + banner->Invalidate(); + } +} + +void CLauncherDlg::OnOrgEditChangeFocus() { + redrawBanner(m_username, m_username_banner); + redrawBanner(m_password, m_password_banner); +} + +void CLauncherDlg::OnUserEditChangeFocus() { + redrawBanner(m_orgname, m_orgname_banner); + redrawBanner(m_password, m_password_banner); +} + +void CLauncherDlg::OnPassEditChangeFocus() { + redrawBanner(m_orgname, m_orgname_banner); + redrawBanner(m_username, m_username_banner); +} +BOOL CLauncherDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) +{ + if (pWnd->IsKindOf(RUNTIME_CLASS(CButton))) { + ::SetCursor(AfxGetApp()->LoadStandardCursor(IDC_HAND)); + return TRUE; + } + return CDialog::OnSetCursor(pWnd, nHitTest, message); +} + +void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) { + const int CONSOLE_MAX_SHUTDOWN_TRY_COUNT = 10; + const int CONSOLE_DELTATIME_BETWEEN_TRYS = 10; + if (_drawStep == DrawStep::DrawProcessSetup || + _drawStep == DrawStep::DrawProcessUpdate || + _drawStep == DrawStep::DrawProcessUninstall) { + // Refresh + setDrawDialog(_drawStep, true); + } + if (_showSplash) { + if (_splashStep == 0){ + if (theApp._manager.needsUninstall()) { + setDrawDialog(DrawStep::DrawProcessUninstall); + } else { + setDrawDialog(DrawStep::DrawLogo); + } + } else if (_splashStep > 100) { + _showSplash = false; + if (theApp._manager.shouldShutDown()) { + if (LauncherUtils::IsProcessRunning(L"interface.exe")) { + exit(0); + } + } else if (theApp._manager.needsUpdate()) { + startProcess(); + } else if (theApp._manager.needsUninstall()) { + theApp._manager.uninstallApplication(); + exit(0); + } else { + setDrawDialog(DrawStep::DrawLoginLogin); + } + } + _splashStep++; + } else if (theApp._manager.shouldShutDown()) { + if (LauncherUtils::IsProcessRunning(L"interface.exe")) { + exit(0); + } + } +} + +void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) { + _drawStep = step; + auto m_pRenderTarget = GetRenderTarget(); + auto m_voxelRenderTarget = m_voxel->GetRenderTarget(); + switch (_drawStep) { + case DrawStep::DrawLogo: + m_pRenderTarget->BeginDraw(); + drawBackground(m_pRenderTarget); + m_pRenderTarget->EndDraw(); + m_voxelRenderTarget->BeginDraw(); + drawLogo(m_voxelRenderTarget); + m_voxelRenderTarget->EndDraw(); + break; + case DrawStep::DrawLoginLogin: + case DrawStep::DrawLoginErrorOrg: + case DrawStep::DrawLoginErrorCred: + prepareLogin(_drawStep); + m_pRenderTarget->BeginDraw(); + drawBackground(m_pRenderTarget); + drawSmallLogo(m_pRenderTarget); + m_pRenderTarget->EndDraw(); + RedrawWindow(); + break; + case DrawStep::DrawChoose: + prepareChoose(); + m_pRenderTarget->BeginDraw(); + drawBackground(m_pRenderTarget); + drawSmallLogo(m_pRenderTarget); + m_pRenderTarget->EndDraw(); + RedrawWindow(); + break; + case DrawStep::DrawProcessFinishHq: + case DrawStep::DrawProcessFinishUpdate: + case DrawStep::DrawProcessUpdate: + case DrawStep::DrawProcessUninstall: + case DrawStep::DrawProcessSetup: + if (!isUpdate) { + m_voxelRenderTarget->BeginDraw(); + m_voxelRenderTarget->Clear(D2D1::ColorF(0.0f, 0.0f, 0.0f, 1.0f)); + m_voxelRenderTarget->EndDraw(); + m_pRenderTarget->BeginDraw(); + prepareProcess(_drawStep); + drawBackground(m_pRenderTarget); + drawSmallLogo(m_pRenderTarget); + m_pRenderTarget->EndDraw(); + RedrawWindow(); + } + m_voxelRenderTarget->BeginDraw(); + drawVoxel(m_voxelRenderTarget); + m_voxelRenderTarget->EndDraw(); + break; + default: + break; + } +} + + diff --git a/launchers/win32/LauncherDlg.h b/launchers/win32/LauncherDlg.h new file mode 100644 index 0000000000..55bc97f205 --- /dev/null +++ b/launchers/win32/LauncherDlg.h @@ -0,0 +1,120 @@ +// +// LauncherDlg.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +// CLauncherDlg dialog +class CLauncherDlg : public CDialog +{ + // Construction +public: + enum DrawStep { + DrawLogo = 0, + DrawLoginLogin, + DrawLoginErrorOrg, + DrawLoginErrorCred, + DrawChoose, + DrawProcessSetup, + DrawProcessUpdate, + DrawProcessFinishHq, + DrawProcessFinishUpdate, + DrawProcessUninstall, + DrawError + }; + + struct TextFormat { + int size; + COLORREF color; + bool isButton; + bool isBold; + bool underlined; + }; + + CLauncherDlg(CWnd* pParent = nullptr); + virtual BOOL PreTranslateMessage(MSG* pMsg); + + void setDrawDialog(DrawStep step, BOOL isUpdate = FALSE); + + +// Dialog Data +#ifdef AFX_DESIGN_TIME + enum { IDD = IDD_LAUNCHER_DIALOG }; +#endif + + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + void startProcess(); + void setCustomDialog(); + +// Implementation +protected: + + BOOL getHQInfo(const CString& orgname); + DrawStep _drawStep { DrawStep::DrawLogo }; + BOOL getTextFormat(int ResID, TextFormat& formatOut); + void showWindows(std::vector windows, bool show); + + bool _isConsoleRunning{ false }; + bool _isInstalling{ false }; + bool _isFirstDraw{ false }; + bool _showSplash{ true }; + int _splashStep{ 0 }; + float _logoRotation { 0.0f }; + + HICON m_hIcon; + CButton m_btnNext; + CButton m_trouble_link; + + CStatic* m_message_label; + CStatic* m_action_label; + CStatic* m_message2_label; + CStatic* m_action2_label; + CStatic* m_terms; + CStatic* m_terms2; + CStatic* m_trouble; + CStatic* m_voxel; + + CEdit m_orgname; + CEdit m_username; + CEdit m_password; + + CStatic* m_orgname_banner; + CStatic* m_username_banner; + CStatic* m_password_banner; + + void drawBackground(CHwndRenderTarget* pRenderTarget); + void drawLogo(CHwndRenderTarget* pRenderTarget); + void drawSmallLogo(CHwndRenderTarget* pRenderTarget); + void drawVoxel(CHwndRenderTarget* pRenderTarget); + + void prepareLogin(DrawStep step); + void prepareProcess(DrawStep step); + void prepareChoose(); + void prepareError(); + + void redrawBanner(const CEdit& edit, CStatic* banner); + + // Generated message map functions + virtual BOOL OnInitDialog(); + afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); + afx_msg void OnPaint(); + afx_msg HCURSOR OnQueryDragIcon(); + afx_msg void OnNextClicked(); + afx_msg void OnTroubleClicked(); + afx_msg void OnOrgEditChangeFocus(); + afx_msg void OnUserEditChangeFocus(); + afx_msg void OnPassEditChangeFocus(); + afx_msg void OnTimer(UINT_PTR nIDEvent); + DECLARE_MESSAGE_MAP() + +public: + afx_msg void OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct); + afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); +}; diff --git a/launchers/win32/LauncherManager.cpp b/launchers/win32/LauncherManager.cpp new file mode 100644 index 0000000000..94a659a4d7 --- /dev/null +++ b/launchers/win32/LauncherManager.cpp @@ -0,0 +1,422 @@ +// +// LauncherManager.cpp +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "stdafx.h" +#include + +#include "LauncherManager.h" + + +LauncherManager::LauncherManager() +{ +} + + +LauncherManager::~LauncherManager() +{ +} + +void LauncherManager::init() { + getMostRecentBuild(_latestApplicationURL, _latestVersion); + CString currentVersion; + if (isApplicationInstalled(currentVersion, _domainURL, _contentURL, _loggedIn) && _loggedIn) { + if (_latestVersion.Compare(currentVersion) == 0) { + launchApplication(); + _shouldShutdown = TRUE; + } else { + _shouldUpdate = TRUE; + } + } +} + +BOOL LauncherManager::installLauncher() { + CString appPath; + BOOL result = getAndCreatePaths(PathType::Running_Path, appPath); + if (!result) { + MessageBox(NULL, L"Error getting app directory", L"Path Error", MB_OK | MB_ICONERROR); + } + CString installDirectory; + CString appDirectory = appPath.Left(appPath.ReverseFind('\\') + 1); + result = getAndCreatePaths(PathType::Launcher_Directory, installDirectory); + if (!result) { + MessageBox(NULL, L"Error getting app desired directory", L"Path Error", MB_OK | MB_ICONERROR); + } + + CString instalationPath = installDirectory + LAUNCHER_EXE_FILENAME; + if (!installDirectory.Compare(appDirectory) == 0) { + if (!_shouldUninstall) { + // The installer is not running on the desired location and has to be installed + // Kill of running before self-copy + if (LauncherUtils::IsProcessRunning(LAUNCHER_EXE_FILENAME)) { + ::ShellExecute(NULL, NULL, L"taskkill", L"/F /T /IM " + LAUNCHER_EXE_FILENAME, NULL, SW_HIDE); + } + CopyFile(appPath, instalationPath, FALSE); + } + } else if (_shouldUninstall) { + CString tempPath; + if (getAndCreatePaths(PathType::Temp_Directory, tempPath)) { + tempPath += _T("\\HQ_uninstaller_tmp.exe"); + CopyFile(instalationPath, tempPath, false); + LauncherUtils::launchApplication(tempPath, _T(" --uninstall")); + exit(0); + } + } + return TRUE; +} + +BOOL LauncherManager::createShortcuts() { + CString desktopLnkPath; + getAndCreatePaths(PathType::Desktop_Directory, desktopLnkPath); + desktopLnkPath += _T("\\HQ Launcher.lnk"); + CString installDir; + getAndCreatePaths(PathType::Launcher_Directory, installDir); + CString installPath = installDir + LAUNCHER_EXE_FILENAME; + if (!LauncherUtils::CreateLink(installPath, (LPCSTR)CStringA(desktopLnkPath), _T("CLick to Setup and Launch HQ."))) { + return FALSE; + } + CString startLinkPath; + getAndCreatePaths(PathType::StartMenu_Directory, startLinkPath); + CString appStartLinkPath = startLinkPath + _T("HQ Launcher.lnk"); + CString uniStartLinkPath = startLinkPath + _T("Uninstall HQ.lnk"); + CString uniLinkPath = installDir + _T("Uninstall HQ.lnk"); + if (!LauncherUtils::CreateLink(installPath, (LPCSTR)CStringA(appStartLinkPath), _T("CLick to Setup and Launch HQ."))) { + return FALSE; + } + if (!LauncherUtils::CreateLink(installPath, (LPCSTR)CStringA(uniStartLinkPath), _T("CLick to Uninstall HQ."), _T("--uninstall"))) { + return FALSE; + } + if (!LauncherUtils::CreateLink(installPath, (LPCSTR)CStringA(uniLinkPath), _T("CLick to Uninstall HQ."), _T("--uninstall"))) { + return FALSE; + } + return TRUE; +} + +BOOL LauncherManager::deleteShortcuts() { + CString desktopLnkPath; + getAndCreatePaths(PathType::Desktop_Directory, desktopLnkPath); + desktopLnkPath += _T("\\HQ Launcher.lnk"); + BOOL success = LauncherUtils::deleteFileOrDirectory(desktopLnkPath); + CString startLinkPath; + getAndCreatePaths(PathType::StartMenu_Directory, startLinkPath); + return success && LauncherUtils::deleteFileOrDirectory(startLinkPath); +} + +BOOL LauncherManager::isApplicationInstalled(CString& version, CString& domain, + CString& content, bool& loggedIn) { + CString applicationDir; + getAndCreatePaths(PathType::Launcher_Directory, applicationDir); + CString applicationPath = applicationDir + "interface\\interface.exe"; + BOOL isApplicationInstalled = PathFileExistsW(applicationPath); + BOOL configFileExist = PathFileExistsW(applicationDir + _T("interface\\config.json")); + if (isApplicationInstalled && configFileExist) { + LauncherUtils::ResponseError status = readConfigJSON(version, domain, content, loggedIn); + return status == LauncherUtils::ResponseError::NoError; + } + return FALSE; +} + +BOOL LauncherManager::getAndCreatePaths(PathType type, CString& outPath) { + + if (type == PathType::Running_Path) { + char appPath[MAX_PATH]; + DWORD size = GetModuleFileNameA(NULL, appPath, MAX_PATH); + if (size) { + outPath = CString(appPath); + return TRUE; + } + } else if (type == PathType::Desktop_Directory) { + TCHAR desktopPath[MAX_PATH]; + auto success = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, desktopPath)); + outPath = CString(desktopPath); + return success; + } else if (type == PathType::Temp_Directory) { + TCHAR tempPath[MAX_PATH]; + auto success = GetTempPath(MAX_PATH, tempPath); + outPath = CString(tempPath); + return success; + } else { + TCHAR localDataPath[MAX_PATH]; + if (type == PathType::StartMenu_Directory) { + TCHAR startMenuPath[MAX_PATH]; + auto success = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_STARTMENU, NULL, 0, startMenuPath)); + outPath = CString(startMenuPath) + _T("\\Programs\\HQ\\"); + success = SHCreateDirectoryEx(NULL, outPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError(); + return success; + } else if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, localDataPath))) { + _tcscat_s(localDataPath, _T("\\") + DIRECTORY_NAME_APP + _T("\\")); + outPath = CString(localDataPath); + if (type == PathType::Download_Directory) { + outPath += DIRECTORY_NAME_DOWNLOADS + _T("\\"); + } else if (type == PathType::Interface_Directory) { + outPath += DIRECTORY_NAME_INTERFACE; + } else if (type == PathType::Content_Directory) { + outPath += DIRECTORY_NAME_CONTENT; + } + return (CreateDirectory(outPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError()); + } + } + return FALSE; +} + +BOOL LauncherManager::getInstalledVersion(const CString& path, CString& version) { + CStdioFile cfile; + BOOL success = cfile.Open(path, CFile::modeRead); + if (success) { + cfile.ReadString(version); + cfile.Close(); + } + return success; +} + + +BOOL LauncherManager::launchApplication(const CString& tokensJSON) { + CString installDir; + LauncherManager::getAndCreatePaths(PathType::Interface_Directory, installDir); + CString interfaceExe = installDir + _T("\\interface.exe"); + CString params1 = _T("--url \"") + _domainURL + ("\" "); + CString cacheDir; + LauncherManager::getAndCreatePaths(PathType::Content_Directory, cacheDir); + CString params3 = _T("--cache \"") + cacheDir + ("\" "); + CString params4 = !_displayName.IsEmpty() ? _T("--displayName \"") + _displayName + ("\" ") : _T(""); + CString parsedTokens = tokensJSON; + parsedTokens.Replace(_T("\""), _T("\\\"")); + CString params5 = !tokensJSON.IsEmpty() ? _T("--tokens \"") + parsedTokens + ("\"") : _T(""); + CString params = params1 + params3 + params4 + params5 + EXTRA_PARAMETERS; + auto rs = ShellExecute(NULL, L"open", interfaceExe, params, NULL, SW_SHOW); + return (rs != NULL); +} + +BOOL LauncherManager::createConfigJSON() { + CString configPath; + LauncherManager::getAndCreatePaths(PathType::Interface_Directory, configPath); + configPath += "\\config.json"; + std::ofstream configFile(configPath, std::ofstream::binary); + if (configFile.fail()) { + return FALSE; + } + Json::Value config; + CString applicationPath; + LauncherManager::getAndCreatePaths(PathType::Launcher_Directory, applicationPath); + applicationPath += LAUNCHER_EXE_FILENAME; + config["loggedIn"] = _loggedIn; + config["launcherPath"] = LauncherUtils::cStringToStd(applicationPath); + config["version"] = LauncherUtils::cStringToStd(_latestVersion); + config["domain"] = LauncherUtils::cStringToStd(_domainURL); + CString content; + getAndCreatePaths(PathType::Content_Directory, content); + config["content"] = LauncherUtils::cStringToStd(content); + configFile << config; + configFile.close(); + return TRUE; +} + +LauncherUtils::ResponseError LauncherManager::readConfigJSON(CString& version, CString& domain, CString& content, bool& loggedIn) { + CString configPath; + getAndCreatePaths(PathType::Interface_Directory, configPath); + configPath += "\\config.json"; + std::ifstream configFile(configPath, std::ifstream::binary); + if (configFile.fail()) { + return LauncherUtils::ResponseError::Open; + } + Json::Value config; + configFile >> config; + if (config["version"].isString() && config["domain"].isString() && + config["content"].isString()) { + loggedIn = config["loggedIn"].asBool(); + version = config["version"].asCString(); + domain = config["domain"].asCString(); + content = config["content"].asCString(); + configFile.close(); + return LauncherUtils::ResponseError::NoError; + } + configFile.close(); + return LauncherUtils::ResponseError::ParsingJSON; +} + +LauncherUtils::ResponseError LauncherManager::readOrganizationJSON(const CString& hash) { + CString contentTypeJson = L"content-type:application/json"; + CString response; + CString url = _T("/hifi-public/huffman/organizations/") + hash + _T(".json"); + LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(L"HQ Launcher", L"s3.amazonaws.com", url, + contentTypeJson, CStringA(), response, false); + if (error != LauncherUtils::ResponseError::NoError) { + return error; + } + Json::Value json; + if (LauncherUtils::parseJSON(response, json)) { + if (json["content_set_url"].isString() && json["domain"].isString()) { + _contentURL = json["content_set_url"].asCString(); + _domainURL = json["domain"].asCString(); + return LauncherUtils::ResponseError::NoError; + } + } + return LauncherUtils::ResponseError::ParsingJSON; +} + +LauncherUtils::ResponseError LauncherManager::getMostRecentBuild(CString& urlOut, CString& versionOut) { + CString contentTypeJson = L"content-type:application/json"; + CString response; + LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(L"HQ Launcher", L"thunder.highfidelity.com", L"/builds/api/tags/latest?format=json", + contentTypeJson, CStringA(), response, false); + if (error != LauncherUtils::ResponseError::NoError) { + return error; + } + Json::Value json; + if (LauncherUtils::parseJSON(response, json)) { + int count = json["count"].isInt() ? json["count"].asInt() : 0; + if (count > 0 && json["results"].isArray()) { + for (int i = 0; i < count; i++) { + if (json["results"][i].isObject()) { + Json::Value result = json["results"][i]; + if (result["latest_version"].isInt()) { + std::string version = std::to_string(result["latest_version"].asInt()); + versionOut = CString(version.c_str()); + } + if (result["installers"].isObject() && + result["installers"]["windows"].isObject() && + result["installers"]["windows"]["zip_url"].isString()) { + urlOut = result["installers"]["windows"]["zip_url"].asCString(); + return LauncherUtils::ResponseError::NoError; + } + } + } + } + } + return LauncherUtils::ResponseError::ParsingJSON; +} + +LauncherUtils::ResponseError LauncherManager::getAccessTokenForCredentials(const CString& username, const CString& password) { + CStringA post = "grant_type=password&username="; + post += username; + post += "&password="; + post += password; + post += "&scope=owner"; + + CString contentTypeText = L"content-type:application/x-www-form-urlencoded"; + CString response; + LauncherUtils::ResponseError error = LauncherUtils::makeHTTPCall(L"HQ Launcher", L"metaverse.highfidelity.com", L"/oauth/token", + contentTypeText, post, response, true); + if (error != LauncherUtils::ResponseError::NoError) { + return error; + } + Json::Value json; + if (LauncherUtils::parseJSON(response, json)) { + if (json["error"].isString()) { + return LauncherUtils::ResponseError::BadCredentials; + } else if (json["access_token"].isString()) { + _tokensJSON = response; + return LauncherUtils::ResponseError::NoError; + } + } + return LauncherUtils::ResponseError::ParsingJSON; +} + +BOOL LauncherManager::createApplicationRegistryKeys(int size) { + const std::string REGISTRY_PATH = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\HQ"; + BOOL success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayName", "HQ"); + CString installDir; + getAndCreatePaths(PathType::Launcher_Directory, installDir); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallLocation", LauncherUtils::cStringToStd(installDir)); + std::string applicationExe = LauncherUtils::cStringToStd(installDir + LAUNCHER_EXE_FILENAME); + std::string uninstallPath = '"' + applicationExe + '"' + " --uninstall"; + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayVersion", LauncherUtils::cStringToStd(_latestVersion)); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "High Fidelity"); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallDate", LauncherUtils::cStringToStd(CTime::GetCurrentTime().Format("%Y%m%d"))); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1); + success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoRepair", (DWORD)1); + return success; +} + +BOOL LauncherManager::deleteApplicationRegistryKeys() { + const CString REGISTRY_PATH = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\HQ"); + return LauncherUtils::deleteRegistryKey(REGISTRY_PATH); +} + +BOOL LauncherManager::uninstallApplication() { + CString installDir; + getAndCreatePaths(PathType::Launcher_Directory, installDir); + BOOL success = LauncherUtils::deleteFileOrDirectory(installDir); + success = success && (deleteShortcuts()); + success = success && (deleteApplicationRegistryKeys()); + return success; +} + +void LauncherManager::onZipExtracted(ZipType type, int size) { + if (type == ZipType::ZipContent) { + downloadApplication(); + } else if (type == ZipType::ZipApplication) { + createShortcuts(); + CString versionPath; + getAndCreatePaths(LauncherManager::PathType::Launcher_Directory, versionPath); + createConfigJSON(); + launchApplication(_tokensJSON); + createApplicationRegistryKeys(size); + _shouldShutdown = TRUE; + } +} + +BOOL LauncherManager::extractApplication() { + CString installPath; + getAndCreatePaths(LauncherManager::PathType::Interface_Directory, installPath); + BOOL success = LauncherUtils::unzipFileOnThread(ZipType::ZipApplication, LauncherUtils::cStringToStd(_applicationZipPath), + LauncherUtils::cStringToStd(installPath), [&](int type, int size) { + onZipExtracted((ZipType)type, size); + }); + return success; +} + +void LauncherManager::onFileDownloaded(DownloadType type) { + if (type == DownloadType::DownloadContent) { + installContent(); + } else if (type == DownloadType::DownloadApplication) { + extractApplication(); + } +} + + +BOOL LauncherManager::installContent() { + std::string contentZipFile = LauncherUtils::cStringToStd(_contentZipPath); + CString contentPath; + getAndCreatePaths(LauncherManager::PathType::Content_Directory, contentPath); + BOOL success = LauncherUtils::unzipFileOnThread(ZipType::ZipContent, contentZipFile, + LauncherUtils::cStringToStd(contentPath), [&](int type, int size) { + onZipExtracted((ZipType)type, size); + }); + return success; +} + + +BOOL LauncherManager::downloadFile(DownloadType type, const CString& url, CString& outPath) { + CString fileName = url.Mid(url.ReverseFind('/') + 1); + CString downloadDirectory; + BOOL success = getAndCreatePaths(LauncherManager::PathType::Download_Directory, downloadDirectory); + outPath = downloadDirectory + fileName; + if (success) { + if (!LauncherUtils::downloadFileOnThread(type, url, outPath, [&](int type) { + onFileDownloaded((DownloadType)type); + })) { + success = FALSE; + } + } + return success; +} + +BOOL LauncherManager::downloadContent() { + CString contentURL = getContentURL(); + return downloadFile(DownloadType::DownloadContent, contentURL, _contentZipPath); +} + +BOOL LauncherManager::downloadApplication() { + CString applicationURL = getLatestInterfaceURL(); + return downloadFile(DownloadType::DownloadApplication, applicationURL, _applicationZipPath); +} diff --git a/launchers/win32/LauncherManager.h b/launchers/win32/LauncherManager.h new file mode 100644 index 0000000000..3ad21694f6 --- /dev/null +++ b/launchers/win32/LauncherManager.h @@ -0,0 +1,109 @@ +// +// LauncherManager.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +#include "LauncherUtils.h" + +const CString DIRECTORY_NAME_APP = _T("HQ"); +const CString DIRECTORY_NAME_DOWNLOADS = _T("downloads"); +const CString DIRECTORY_NAME_INTERFACE = _T("interface"); +const CString DIRECTORY_NAME_CONTENT = _T("content"); +const CString EXTRA_PARAMETERS = _T(" --suppress-settings-reset --no-launcher --no-updater"); +const CString LAUNCHER_EXE_FILENAME = _T("HQ Launcher.exe"); +const bool INSTALL_ZIP = true; + +class LauncherManager +{ +public: + enum PathType { + Running_Path = 0, + Launcher_Directory, + Download_Directory, + Interface_Directory, + Desktop_Directory, + Content_Directory, + StartMenu_Directory, + Temp_Directory + }; + enum ZipType { + ZipContent = 0, + ZipApplication + }; + enum DownloadType { + DownloadContent = 0, + DownloadApplication + }; + enum ErrorType { + ErrorNetworkAuth, + ErrorNetworkUpdate, + ErrorNetworkHq, + ErrorDownloading, + ErrorUpdating, + ErrorInstall, + ErrorIOFiles + }; + LauncherManager(); + ~LauncherManager(); + void init(); + BOOL getAndCreatePaths(PathType type, CString& outPath); + BOOL getInstalledVersion(const CString& path, CString& version); + BOOL isApplicationInstalled(CString& version, CString& domain, + CString& content, bool& loggedIn); + LauncherUtils::ResponseError getAccessTokenForCredentials(const CString& username, const CString& password); + LauncherUtils::ResponseError getMostRecentBuild(CString& urlOut, CString& versionOut); + LauncherUtils::ResponseError readOrganizationJSON(const CString& hash); + LauncherUtils::ResponseError readConfigJSON(CString& version, CString& domain, + CString& content, bool& loggedIn); + BOOL createConfigJSON(); + BOOL createApplicationRegistryKeys(int size); + BOOL deleteApplicationRegistryKeys(); + BOOL createShortcuts(); + BOOL deleteShortcuts(); + BOOL launchApplication(const CString& tokensJSON = _T("")); + BOOL uninstallApplication(); + BOOL installLauncher(); + + // getters + const CString& getContentURL() const { return _contentURL; } + const CString& getdomainURL() const { return _domainURL; } + const CString& getVersion() const { return _version; } + BOOL shouldShutDown() const { return _shouldShutdown; } + BOOL needsUpdate() { return _shouldUpdate; } + BOOL needsUninstall() { return _shouldUninstall; } + void setDisplayName(const CString& displayName) { _displayName = displayName; } + bool isLoggedIn() { return _loggedIn; } + const CString& getLatestInterfaceURL() const { return _latestApplicationURL; } + void uninstall() { _shouldUninstall = true; }; + + BOOL downloadFile(DownloadType type, const CString& url, CString& localPath); + BOOL downloadContent(); + BOOL downloadApplication(); + BOOL installContent(); + BOOL extractApplication(); + void onZipExtracted(ZipType type, int size); + void onFileDownloaded(DownloadType type); + +private: + CString _latestApplicationURL; + CString _latestVersion; + CString _contentURL; + CString _domainURL; + CString _version; + CString _displayName; + CString _tokensJSON; + CString _applicationZipPath; + CString _contentZipPath; + bool _loggedIn{ false }; + BOOL _shouldUpdate{ FALSE }; + BOOL _shouldUninstall{ FALSE }; + BOOL _shouldShutdown{ FALSE }; +}; + diff --git a/launchers/win32/LauncherUtils.cpp b/launchers/win32/LauncherUtils.cpp new file mode 100644 index 0000000000..8a75747e9b --- /dev/null +++ b/launchers/win32/LauncherUtils.cpp @@ -0,0 +1,405 @@ +// +// LauncherUtils.cpp +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "stdafx.h" +#include +#include +#include +#include +#pragma comment(lib, "winhttp") + +#include "LauncherUtils.h" + +BOOL LauncherUtils::IsProcessRunning(const wchar_t *processName) { + bool exists = false; + PROCESSENTRY32 entry; + entry.dwSize = sizeof(PROCESSENTRY32); + + HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL); + + if (Process32First(snapshot, &entry)) { + while (Process32Next(snapshot, &entry)) { + if (!_wcsicmp(entry.szExeFile, processName)) { + exists = true; + break; + } + } + } + CloseHandle(snapshot); + return exists; +} + +HRESULT LauncherUtils::CreateLink(LPCWSTR lpszPathObj, LPCSTR lpszPathLink, LPCWSTR lpszDesc, LPCWSTR lpszArgs) { + IShellLink* psl; + + // Get a pointer to the IShellLink interface. It is assumed that CoInitialize + // has already been called. + CoInitialize(NULL); + HRESULT hres = E_INVALIDARG; + if ((lpszPathObj != NULL) && (wcslen(lpszPathObj) > 0) && + (lpszDesc != NULL) && + (lpszPathLink != NULL) && (strlen(lpszPathLink) > 0)) { + hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&psl); + if (SUCCEEDED(hres)) { + IPersistFile* ppf; + + // Set the path to the shortcut target and add the description. + psl->SetPath(lpszPathObj); + psl->SetDescription(lpszDesc); + psl->SetArguments(lpszArgs); + + // Query IShellLink for the IPersistFile interface, used for saving the + // shortcut in persistent storage. + hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf); + + if (SUCCEEDED(hres)) { + WCHAR wsz[MAX_PATH]; + + // Ensure that the string is Unicode. + MultiByteToWideChar(CP_ACP, 0, lpszPathLink, -1, wsz, MAX_PATH); + + // Add code here to check return value from MultiByteWideChar + // for success. + + // Save the link by calling IPersistFile::Save. + hres = ppf->Save(wsz, TRUE); + ppf->Release(); + } + psl->Release(); + } + } + CoUninitialize(); + return SUCCEEDED(hres); +} + +std::string LauncherUtils::cStringToStd(CString cstring) { + CT2CA convertedString(cstring); + std::string strStd(convertedString); + return strStd; +} + +BOOL LauncherUtils::launchApplication(LPCWSTR lpApplicationName, LPTSTR cmdArgs) { + // additional information + STARTUPINFO si; + PROCESS_INFORMATION pi; + + // set the size of the structures + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + ZeroMemory(&pi, sizeof(pi)); + + // start the program up + BOOL success = CreateProcess( + lpApplicationName, // the path + cmdArgs, // Command line + NULL, // Process handle not inheritable + NULL, // Thread handle not inheritable + FALSE, // Set handle inheritance to FALSE + CREATE_NEW_CONSOLE, // Opens file in a separate console + NULL, // Use parent's environment block + NULL, // Use parent's starting directory + &si, // Pointer to STARTUPINFO structure + &pi // Pointer to PROCESS_INFORMATION structure + ); + // Close process and thread handles. + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return success; +} + +BOOL LauncherUtils::deleteRegistryKey(const CString& registryPath) { + TCHAR szDelKey[MAX_PATH * 2]; + StringCchCopy(szDelKey, MAX_PATH * 2, registryPath); + auto status = RegDeleteKey(HKEY_CURRENT_USER, szDelKey); + if (status == ERROR_SUCCESS) { + return TRUE; + } + return FALSE; +} + +LauncherUtils::ResponseError LauncherUtils::makeHTTPCall(const CString& callerName, + const CString& mainUrl, const CString& dirUrl, + const CString& contentType, CStringA& postData, + CString& response, bool isPost = false) { + + HINTERNET hopen = WinHttpOpen(callerName, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + if (!hopen) { + return ResponseError::Open; + } + HINTERNET hconnect = WinHttpConnect(hopen, mainUrl, INTERNET_DEFAULT_HTTPS_PORT, 0); + if (!hconnect) { + return ResponseError::Connect; + } + HINTERNET hrequest = WinHttpOpenRequest(hconnect, isPost ? L"POST" : L"GET", dirUrl, + NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_SECURE); + if (!hrequest) { + return ResponseError::OpenRequest; + } + if (isPost) { + if (!WinHttpSendRequest(hrequest, contentType, -1, + postData.GetBuffer(postData.GetLength()), (DWORD)strlen(postData), (DWORD)strlen(postData), NULL)) { + return ResponseError::SendRequest; + } + } else { + if (!WinHttpSendRequest(hrequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0)) { + return ResponseError::SendRequest; + } + } + if (!WinHttpReceiveResponse(hrequest, 0)) { + return ResponseError::ReceiveRequest; + } + // query remote file size, set haveContentLength on success and dwContentLength to the length + wchar_t szContentLength[32]; + DWORD bufferBytes = 4096; + DWORD dwHeaderIndex = WINHTTP_NO_HEADER_INDEX; + + BOOL haveContentLength = WinHttpQueryHeaders(hrequest, WINHTTP_QUERY_CONTENT_LENGTH, NULL, + &szContentLength, &bufferBytes, &dwHeaderIndex); + + DWORD dwContentLength; + if (haveContentLength) { + dwContentLength = _wtoi(szContentLength); + } + byte p[4096]; + if (!WinHttpQueryDataAvailable(hrequest, &bufferBytes)) { + return ResponseError::ReadResponse; + } + WinHttpReadData(hrequest, p, bufferBytes, &bufferBytes); + response = CString((const char*)p, (int)bufferBytes); + return ResponseError::NoError; +} + +BOOL LauncherUtils::parseJSON(const CString& jsonTxt, Json::Value& root) { + Json::CharReaderBuilder CharBuilder; + std::string jsonString = cStringToStd(jsonTxt); + std::string errs; + Json::CharReader* nreader = CharBuilder.newCharReader(); + bool parsingSuccessful = false; + if (nreader != NULL) { + parsingSuccessful = nreader->parse(jsonString.c_str(), jsonString.c_str() + jsonString.length(), &root, &errs); + delete nreader; + } + return parsingSuccessful; +} + +BOOL LauncherUtils::getFont(const CString& fontName, int fontSize, bool isBold, CFont& fontOut) { + LOGFONT lf; + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = fontSize; + lf.lfWeight = isBold ? FW_BOLD : FW_NORMAL; + lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; + lf.lfQuality = ANTIALIASED_QUALITY; + + wcscpy_s(lf.lfFaceName, fontName); + if (!fontOut.CreateFontIndirect(&lf)) { + return FALSE; + } + return TRUE; +} + +uint64_t LauncherUtils::extractZip(const std::string& zipFile, const std::string& path, std::vector& files) { + mz_zip_archive zip_archive; + memset(&zip_archive, 0, sizeof(zip_archive)); + + auto status = mz_zip_reader_init_file(&zip_archive, zipFile.c_str(), 0); + + if (!status) return 0; + int fileCount = (int)mz_zip_reader_get_num_files(&zip_archive); + if (fileCount == 0) { + mz_zip_reader_end(&zip_archive); + return 0; + } + mz_zip_archive_file_stat file_stat; + if (!mz_zip_reader_file_stat(&zip_archive, 0, &file_stat)) { + mz_zip_reader_end(&zip_archive); + return 0; + } + // Get root folder + CString lastDir = _T(""); + uint64_t totalSize = 0; + for (int i = 0; i < fileCount; i++) { + if (!mz_zip_reader_file_stat(&zip_archive, i, &file_stat)) continue; + std::string filename = file_stat.m_filename; + std::replace(filename.begin(), filename.end(), '/', '\\'); + CString fullFilename = CString(path.c_str()) + "\\" + CString(filename.c_str()); + if (mz_zip_reader_is_file_a_directory(&zip_archive, i)) { + if (SHCreateDirectoryEx(NULL, fullFilename, NULL) || ERROR_ALREADY_EXISTS == GetLastError()) { + break; + } else { + continue; + } + } + CT2A destFile(fullFilename); + if (mz_zip_reader_extract_to_file(&zip_archive, i, destFile, 0)) { + totalSize += (uint64_t)file_stat.m_uncomp_size; + files.emplace_back(destFile); + } + } + + // Close the archive, freeing any resources it was using + mz_zip_reader_end(&zip_archive); + return totalSize; +} + +BOOL LauncherUtils::insertRegistryKey(const std::string& regPath, const std::string& name, const std::string& value) { + HKEY key; + auto status = RegCreateKeyExA(HKEY_CURRENT_USER, regPath.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_QUERY_VALUE, NULL, &key, NULL); + if (status == ERROR_SUCCESS) { + status = RegSetValueExA(key, name.c_str(), 0, REG_SZ, (const BYTE*)value.c_str(), (DWORD)(value.size() + 1)); + return status == ERROR_SUCCESS; + } + RegCloseKey(key); + return FALSE; +} + +BOOL LauncherUtils::insertRegistryKey(const std::string& regPath, const std::string& name, DWORD value) { + HKEY key; + auto status = RegCreateKeyExA(HKEY_CURRENT_USER, regPath.c_str(), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_QUERY_VALUE, NULL, &key, NULL); + if (status == ERROR_SUCCESS) { + status = RegSetValueExA(key, name.c_str(), 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); + return TRUE; + } + RegCloseKey(key); + return FALSE; +} + +BOOL LauncherUtils::deleteFileOrDirectory(const CString& dirPath, bool noRecycleBin) { + CString dir = dirPath; + // Add extra null to string + dir.AppendChar(0); + SHFILEOPSTRUCT fileop; + fileop.hwnd = NULL; // no status display + fileop.wFunc = FO_DELETE; // delete operation + fileop.pFrom = dir; // source file name as double null terminated string + fileop.pTo = NULL; // no destination needed + fileop.fFlags = FOF_NOCONFIRMATION | FOF_SILENT; // do not prompt the user + + if (!noRecycleBin) { + fileop.fFlags |= FOF_ALLOWUNDO; + } + + fileop.fAnyOperationsAborted = FALSE; + fileop.lpszProgressTitle = NULL; + fileop.hNameMappings = NULL; + + int ret = SHFileOperation(&fileop); + return (ret == 0); +} + +BOOL LauncherUtils::hMac256(const CString& cmessage, const char* keystr, CString& hashOut) { + char message[256]; + strcpy_s(message, CStringA(cmessage).GetString()); + char key[256]; + strcpy_s(key, keystr); + HCRYPTPROV hProv = 0; + HCRYPTHASH hHash = 0; + HCRYPTKEY hKey = 0; + HCRYPTHASH hHmacHash = 0; + BYTE pbHash[32]; + HMAC_INFO HmacInfo; + int err = 0; + typedef struct blob { + BLOBHEADER header; + DWORD len; + BYTE key[1]; + } m_blob; + + ZeroMemory(&HmacInfo, sizeof(HmacInfo)); + HmacInfo.HashAlgid = CALG_SHA_256; + ZeroMemory(&pbHash, 32); + m_blob* kb = NULL; + DWORD kbSize = DWORD(sizeof(m_blob) + strlen(key)); + + kb = (m_blob*)malloc(kbSize); + kb->header.bType = PLAINTEXTKEYBLOB; + kb->header.bVersion = CUR_BLOB_VERSION; + kb->header.reserved = 0; + kb->header.aiKeyAlg = CALG_RC2; + memcpy(&kb->key, key, strlen(key)); + kb->len = (DWORD)strlen(key); + BOOL success = false; + DWORD datalen = (DWORD)32; + if (CryptAcquireContext(&hProv, NULL, MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET) + && CryptImportKey(hProv, (BYTE*)kb, kbSize, 0, CRYPT_IPSEC_HMAC_KEY, &hKey) + && CryptCreateHash(hProv, CALG_HMAC, hKey, 0, &hHmacHash) + && CryptSetHashParam(hHmacHash, HP_HMAC_INFO, (BYTE*)&HmacInfo, 0) + && CryptHashData(hHmacHash, (BYTE*)message, (DWORD)strlen(message), 0) + && CryptGetHashParam(hHmacHash, HP_HASHVAL, pbHash, &datalen, 0)) { + char *Hex = "0123456789abcdef"; + char HashString[65] = { 0 }; + for (int Count = 0; Count < 32; Count++) + { + HashString[Count * 2] = Hex[pbHash[Count] >> 4]; + HashString[(Count * 2) + 1] = Hex[pbHash[Count] & 0xF]; + } + hashOut = CString(HashString); + success = true; + } + + free(kb); + if (hHmacHash) + CryptDestroyHash(hHmacHash); + if (hKey) + CryptDestroyKey(hKey); + if (hHash) + CryptDestroyHash(hHash); + if (hProv) + CryptReleaseContext(hProv, 0); + return success; +} + + +DWORD WINAPI LauncherUtils::unzipThread(LPVOID lpParameter) { + UnzipThreadData& data = *((UnzipThreadData*)lpParameter); + uint64_t size = LauncherUtils::extractZip(data._zipFile, data._path, std::vector()); + int mb_size = (int)(size * 0.001f); + data.callback(data._type, mb_size); + delete &data; + return 0; +} + +DWORD WINAPI LauncherUtils::downloadThread(LPVOID lpParameter) +{ + DownloadThreadData& data = *((DownloadThreadData*)lpParameter); + auto hr = URLDownloadToFile(0, data._url, data._file, 0, NULL); + data.callback(data._type); + return 0; +} + +BOOL LauncherUtils::unzipFileOnThread(int type, const std::string& zipFile, const std::string& path, std::function callback) { + DWORD myThreadID; + UnzipThreadData* unzipThreadData = new UnzipThreadData(); + unzipThreadData->_type = type; + unzipThreadData->_zipFile = zipFile; + unzipThreadData->_path = path; + unzipThreadData->setCallback(callback); + HANDLE myHandle = CreateThread(0, 0, unzipThread, unzipThreadData, 0, &myThreadID); + if (myHandle) { + CloseHandle(myHandle); + return TRUE; + } + return FALSE; +} + +BOOL LauncherUtils::downloadFileOnThread(int type, const CString& url, const CString& file, std::function callback) { + DWORD myThreadID; + DownloadThreadData* downloadThreadData = new DownloadThreadData(); + downloadThreadData->_type = type; + downloadThreadData->_url = url; + downloadThreadData->_file = file; + downloadThreadData->setCallback(callback); + HANDLE myHandle = CreateThread(0, 0, downloadThread, downloadThreadData, 0, &myThreadID); + if (myHandle) { + CloseHandle(myHandle); + return TRUE; + } + return FALSE; +} \ No newline at end of file diff --git a/launchers/win32/LauncherUtils.h b/launchers/win32/LauncherUtils.h new file mode 100644 index 0000000000..3e9f18d892 --- /dev/null +++ b/launchers/win32/LauncherUtils.h @@ -0,0 +1,77 @@ +// +// LauncherUtils.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +#include + +#include "libs/json/json.h" +#include "libs/miniz.h" + +class LauncherUtils +{ +public: + enum ResponseError { + Open = 0, + Connect, + OpenRequest, + SendRequest, + ReceiveRequest, + ReadResponse, + ParsingJSON, + BadCredentials, + NoError + }; + + struct DownloadThreadData { + int _type; + CString _url; + CString _file; + std::function callback; + // function(type) + void setCallback(std::function fn) { + callback = std::bind(fn, std::placeholders::_1); + } + }; + + struct UnzipThreadData { + int _type; + std::string _zipFile; + std::string _path; + // function(type, size) + std::function callback; + void setCallback(std::function fn) { + callback = std::bind(fn, std::placeholders::_1, std::placeholders::_2); + } + }; + + static BOOL parseJSON(const CString& jsonTxt, Json::Value& jsonObject); + static ResponseError makeHTTPCall(const CString& callerName, const CString& mainUrl, + const CString& dirUrl, const CString& contentType, + CStringA& postData, CString& response, bool isPost); + static std::string cStringToStd(CString cstring); + static BOOL getFont(const CString& fontName, int fontSize, bool isBold, CFont& fontOut); + static BOOL launchApplication(LPCWSTR lpApplicationName, LPTSTR cmdArgs = _T("")); + static BOOL IsProcessRunning(const wchar_t *processName); + static BOOL insertRegistryKey(const std::string& regPath, const std::string& name, const std::string& value); + static BOOL insertRegistryKey(const std::string& regPath, const std::string& name, DWORD value); + static BOOL deleteFileOrDirectory(const CString& dirPath, bool noRecycleBin = true); + static HRESULT CreateLink(LPCWSTR lpszPathObj, LPCSTR lpszPathLink, LPCWSTR lpszDesc, LPCWSTR lpszArgs = _T("")); + static BOOL hMac256(const CString& message, const char* key, CString& hashOut); + static uint64_t extractZip(const std::string& zipFile, const std::string& path, std::vector& files); + static BOOL deleteRegistryKey(const CString& registryPath); + static BOOL unzipFileOnThread(int type, const std::string& zipFile, const std::string& path, std::function callback); + static BOOL downloadFileOnThread(int type, const CString& url, const CString& file, std::function callback); + +private: + // Threads + static DWORD WINAPI unzipThread(LPVOID lpParameter); + static DWORD WINAPI downloadThread(LPVOID lpParameter); +}; \ No newline at end of file diff --git a/launchers/win32/libs/json/json-forwards.h b/launchers/win32/libs/json/json-forwards.h new file mode 100644 index 0000000000..dd9a9bf356 --- /dev/null +++ b/launchers/win32/libs/json/json-forwards.h @@ -0,0 +1,320 @@ +/// Json-cpp amalgamated forward header (http://jsoncpp.sourceforge.net/). +/// It is intended to be used with #include "json/json-forwards.h" +/// This header provides forward declaration for all JsonCpp types. + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + +/* +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... + +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. + +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +The JsonCpp Authors, and is released under the terms of the MIT License (see below). + +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. + +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: + + http://en.wikipedia.org/wiki/MIT_License + +The full text of the MIT License follows: + +======================================================================== +Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +======================================================================== +(END LICENSE TEXT) + +The MIT license is compatible with both the GPL and commercial +software, affording one all of the rights of Public Domain with the +minor nuisance of being required to keep the above copyright notice +and license text in the source code. Note also that by accepting the +Public Domain "license" you can re-license your copy using whatever +license you like. + +*/ + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + + + + + +#ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED +# define JSON_FORWARD_AMALGAMATED_H_INCLUDED +/// If defined, indicates that the source file is amalgamated +/// to prevent private header inclusion. +#define JSON_IS_AMALGAMATION + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/config.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef JSON_CONFIG_H_INCLUDED +#define JSON_CONFIG_H_INCLUDED +#include +#include +#include +#include +#include +#include +#include +#include + +/// If defined, indicates that json library is embedded in CppTL library. +//# define JSON_IN_CPPTL 1 + +/// If defined, indicates that json may leverage CppTL library +//# define JSON_USE_CPPTL 1 +/// If defined, indicates that cpptl vector based map should be used instead of +/// std::map +/// as Value container. +//# define JSON_USE_CPPTL_SMALLMAP 1 + +// If non-zero, the library uses exceptions to report bad input instead of C +// assertion macros. The default is to use exceptions. +#ifndef JSON_USE_EXCEPTION +#define JSON_USE_EXCEPTION 1 +#endif + +/// If defined, indicates that the source file is amalgamated +/// to prevent private header inclusion. +/// Remarks: it is automatically defined in the generated amalgamated header. +// #define JSON_IS_AMALGAMATION + +#ifdef JSON_IN_CPPTL +#include +#ifndef JSON_USE_CPPTL +#define JSON_USE_CPPTL 1 +#endif +#endif + +#ifdef JSON_IN_CPPTL +#define JSON_API CPPTL_API +#elif defined(JSON_DLL_BUILD) +#if defined(_MSC_VER) || defined(__MINGW32__) +#define JSON_API __declspec(dllexport) +#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING +#elif defined(__GNUC__) || defined(__clang__) +#define JSON_API __attribute__((visibility("default"))) +#endif // if defined(_MSC_VER) +#elif defined(JSON_DLL) +#if defined(_MSC_VER) || defined(__MINGW32__) +#define JSON_API __declspec(dllimport) +#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING +#endif // if defined(_MSC_VER) +#endif // ifdef JSON_IN_CPPTL +#if !defined(JSON_API) +#define JSON_API +#endif + +#if defined(_MSC_VER) && _MSC_VER < 1800 +#error \ + "ERROR: Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities" +#endif + +#if defined(_MSC_VER) && _MSC_VER < 1900 +// As recommended at +// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 +extern JSON_API int +msvc_pre1900_c99_snprintf(char* outBuf, size_t size, const char* format, ...); +#define jsoncpp_snprintf msvc_pre1900_c99_snprintf +#else +#define jsoncpp_snprintf std::snprintf +#endif + +// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for +// integer +// Storages, and 64 bits integer support is disabled. +// #define JSON_NO_INT64 1 + +// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools. +// C++11 should be used directly in JSONCPP. +#define JSONCPP_OVERRIDE override + +#if __cplusplus >= 201103L +#define JSONCPP_NOEXCEPT noexcept +#define JSONCPP_OP_EXPLICIT explicit +#elif defined(_MSC_VER) && _MSC_VER < 1900 +#define JSONCPP_NOEXCEPT throw() +#define JSONCPP_OP_EXPLICIT explicit +#elif defined(_MSC_VER) && _MSC_VER >= 1900 +#define JSONCPP_NOEXCEPT noexcept +#define JSONCPP_OP_EXPLICIT explicit +#else +#define JSONCPP_NOEXCEPT throw() +#define JSONCPP_OP_EXPLICIT +#endif + +#ifdef __clang__ +#if __has_extension(attribute_deprecated_with_message) +#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message))) +#endif +#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc) +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message))) +#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__)) +#endif // GNUC version +#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates MSVC) +#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) +#endif // __clang__ || __GNUC__ || _MSC_VER + +#if !defined(JSONCPP_DEPRECATED) +#define JSONCPP_DEPRECATED(message) +#endif // if !defined(JSONCPP_DEPRECATED) + +#if __GNUC__ >= 6 +#define JSON_USE_INT64_DOUBLE_CONVERSION 1 +#endif + +#if !defined(JSON_IS_AMALGAMATION) + +#include "allocator.h" +#include "version.h" + +#endif // if !defined(JSON_IS_AMALGAMATION) + +namespace Json { +typedef int Int; +typedef unsigned int UInt; +#if defined(JSON_NO_INT64) +typedef int LargestInt; +typedef unsigned int LargestUInt; +#undef JSON_HAS_INT64 +#else // if defined(JSON_NO_INT64) +// For Microsoft Visual use specific types as long long is not supported +#if defined(_MSC_VER) // Microsoft Visual Studio +typedef __int64 Int64; +typedef unsigned __int64 UInt64; +#else // if defined(_MSC_VER) // Other platforms, use long long +typedef int64_t Int64; +typedef uint64_t UInt64; +#endif // if defined(_MSC_VER) +typedef Int64 LargestInt; +typedef UInt64 LargestUInt; +#define JSON_HAS_INT64 +#endif // if defined(JSON_NO_INT64) + +template +using Allocator = typename std::conditional, + std::allocator>::type; +using String = std::basic_string, Allocator>; +using IStringStream = std::basic_istringstream; +using OStringStream = std::basic_ostringstream; +using IStream = std::istream; +using OStream = std::ostream; +} // namespace Json + +// Legacy names (formerly macros). +using JSONCPP_STRING = Json::String; +using JSONCPP_ISTRINGSTREAM = Json::IStringStream; +using JSONCPP_OSTRINGSTREAM = Json::OStringStream; +using JSONCPP_ISTREAM = Json::IStream; +using JSONCPP_OSTREAM = Json::OStream; + +#endif // JSON_CONFIG_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/config.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/forwards.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef JSON_FORWARDS_H_INCLUDED +#define JSON_FORWARDS_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "config.h" +#endif // if !defined(JSON_IS_AMALGAMATION) + +namespace Json { + +// writer.h +class FastWriter; +class StyledWriter; + +// reader.h +class Reader; + +// features.h +class Features; + +// value.h +typedef unsigned int ArrayIndex; +class StaticString; +class Path; +class PathArgument; +class Value; +class ValueIteratorBase; +class ValueIterator; +class ValueConstIterator; + +} // namespace Json + +#endif // JSON_FORWARDS_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/forwards.h +// ////////////////////////////////////////////////////////////////////// + + + + + +#endif //ifndef JSON_FORWARD_AMALGAMATED_H_INCLUDED diff --git a/launchers/win32/libs/json/json.h b/launchers/win32/libs/json/json.h new file mode 100644 index 0000000000..c596384322 --- /dev/null +++ b/launchers/win32/libs/json/json.h @@ -0,0 +1,2346 @@ +/// Json-cpp amalgamated header (http://jsoncpp.sourceforge.net/). +/// It is intended to be used with #include "json/json.h" + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + +/* +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... + +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. + +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +The JsonCpp Authors, and is released under the terms of the MIT License (see below). + +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. + +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: + + http://en.wikipedia.org/wiki/MIT_License + +The full text of the MIT License follows: + +======================================================================== +Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +======================================================================== +(END LICENSE TEXT) + +The MIT license is compatible with both the GPL and commercial +software, affording one all of the rights of Public Domain with the +minor nuisance of being required to keep the above copyright notice +and license text in the source code. Note also that by accepting the +Public Domain "license" you can re-license your copy using whatever +license you like. + +*/ + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + + + + + +#ifndef JSON_AMALGAMATED_H_INCLUDED +# define JSON_AMALGAMATED_H_INCLUDED +/// If defined, indicates that the source file is amalgamated +/// to prevent private header inclusion. +#define JSON_IS_AMALGAMATION + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/version.h +// ////////////////////////////////////////////////////////////////////// + +// DO NOT EDIT. This file (and "version") is generated by CMake. +// Run CMake configure step to update it. +#ifndef JSON_VERSION_H_INCLUDED +#define JSON_VERSION_H_INCLUDED + +#define JSONCPP_VERSION_STRING "1.8.4" +#define JSONCPP_VERSION_MAJOR 1 +#define JSONCPP_VERSION_MINOR 8 +#define JSONCPP_VERSION_PATCH 4 +#define JSONCPP_VERSION_QUALIFIER +#define JSONCPP_VERSION_HEXA \ + ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | \ + (JSONCPP_VERSION_PATCH << 8)) + +#ifdef JSONCPP_USING_SECURE_MEMORY +#undef JSONCPP_USING_SECURE_MEMORY +#endif +#define JSONCPP_USING_SECURE_MEMORY 0 +// If non-zero, the library zeroes any memory that it has allocated before +// it frees its memory. + +#endif // JSON_VERSION_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/version.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/allocator.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef CPPTL_JSON_ALLOCATOR_H_INCLUDED +#define CPPTL_JSON_ALLOCATOR_H_INCLUDED + +#include +#include + +#pragma pack(push, 8) + +namespace Json { +template class SecureAllocator { +public: + // Type definitions + using value_type = T; + using pointer = T*; + using const_pointer = const T*; + using reference = T&; + using const_reference = const T&; + using size_type = std::size_t; + using difference_type = std::ptrdiff_t; + + /** + * Allocate memory for N items using the standard allocator. + */ + pointer allocate(size_type n) { + // allocate using "global operator new" + return static_cast(::operator new(n * sizeof(T))); + } + + /** + * Release memory which was allocated for N items at pointer P. + * + * The memory block is filled with zeroes before being released. + * The pointer argument is tagged as "volatile" to prevent the + * compiler optimizing out this critical step. + */ + void deallocate(volatile pointer p, size_type n) { + std::memset(p, 0, n * sizeof(T)); + // free using "global operator delete" + ::operator delete(p); + } + + /** + * Construct an item in-place at pointer P. + */ + template void construct(pointer p, Args&&... args) { + // construct using "placement new" and "perfect forwarding" + ::new (static_cast(p)) T(std::forward(args)...); + } + + size_type max_size() const { return size_t(-1) / sizeof(T); } + + pointer address(reference x) const { return std::addressof(x); } + + const_pointer address(const_reference x) const { return std::addressof(x); } + + /** + * Destroy an item in-place at pointer P. + */ + void destroy(pointer p) { + // destroy using "explicit destructor" + p->~T(); + } + + // Boilerplate + SecureAllocator() {} + template SecureAllocator(const SecureAllocator&) {} + template struct rebind { using other = SecureAllocator; }; +}; + +template +bool operator==(const SecureAllocator&, const SecureAllocator&) { + return true; +} + +template +bool operator!=(const SecureAllocator&, const SecureAllocator&) { + return false; +} + +} // namespace Json + +#pragma pack(pop) + +#endif // CPPTL_JSON_ALLOCATOR_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/allocator.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/config.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef JSON_CONFIG_H_INCLUDED +#define JSON_CONFIG_H_INCLUDED +#include +#include +#include +#include +#include +#include +#include +#include + +/// If defined, indicates that json library is embedded in CppTL library. +//# define JSON_IN_CPPTL 1 + +/// If defined, indicates that json may leverage CppTL library +//# define JSON_USE_CPPTL 1 +/// If defined, indicates that cpptl vector based map should be used instead of +/// std::map +/// as Value container. +//# define JSON_USE_CPPTL_SMALLMAP 1 + +// If non-zero, the library uses exceptions to report bad input instead of C +// assertion macros. The default is to use exceptions. +#ifndef JSON_USE_EXCEPTION +#define JSON_USE_EXCEPTION 1 +#endif + +/// If defined, indicates that the source file is amalgamated +/// to prevent private header inclusion. +/// Remarks: it is automatically defined in the generated amalgamated header. +// #define JSON_IS_AMALGAMATION + +#ifdef JSON_IN_CPPTL +#include +#ifndef JSON_USE_CPPTL +#define JSON_USE_CPPTL 1 +#endif +#endif + +#ifdef JSON_IN_CPPTL +#define JSON_API CPPTL_API +#elif defined(JSON_DLL_BUILD) +#if defined(_MSC_VER) || defined(__MINGW32__) +#define JSON_API __declspec(dllexport) +#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING +#elif defined(__GNUC__) || defined(__clang__) +#define JSON_API __attribute__((visibility("default"))) +#endif // if defined(_MSC_VER) +#elif defined(JSON_DLL) +#if defined(_MSC_VER) || defined(__MINGW32__) +#define JSON_API __declspec(dllimport) +#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING +#endif // if defined(_MSC_VER) +#endif // ifdef JSON_IN_CPPTL +#if !defined(JSON_API) +#define JSON_API +#endif + +#if defined(_MSC_VER) && _MSC_VER < 1800 +#error \ + "ERROR: Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities" +#endif + +#if defined(_MSC_VER) && _MSC_VER < 1900 +// As recommended at +// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 +extern JSON_API int +msvc_pre1900_c99_snprintf(char* outBuf, size_t size, const char* format, ...); +#define jsoncpp_snprintf msvc_pre1900_c99_snprintf +#else +#define jsoncpp_snprintf std::snprintf +#endif + +// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for +// integer +// Storages, and 64 bits integer support is disabled. +// #define JSON_NO_INT64 1 + +// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools. +// C++11 should be used directly in JSONCPP. +#define JSONCPP_OVERRIDE override + +#if __cplusplus >= 201103L +#define JSONCPP_NOEXCEPT noexcept +#define JSONCPP_OP_EXPLICIT explicit +#elif defined(_MSC_VER) && _MSC_VER < 1900 +#define JSONCPP_NOEXCEPT throw() +#define JSONCPP_OP_EXPLICIT explicit +#elif defined(_MSC_VER) && _MSC_VER >= 1900 +#define JSONCPP_NOEXCEPT noexcept +#define JSONCPP_OP_EXPLICIT explicit +#else +#define JSONCPP_NOEXCEPT throw() +#define JSONCPP_OP_EXPLICIT +#endif + +#ifdef __clang__ +#if __has_extension(attribute_deprecated_with_message) +#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message))) +#endif +#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc) +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message))) +#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__)) +#endif // GNUC version +#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates MSVC) +#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message)) +#endif // __clang__ || __GNUC__ || _MSC_VER + +#if !defined(JSONCPP_DEPRECATED) +#define JSONCPP_DEPRECATED(message) +#endif // if !defined(JSONCPP_DEPRECATED) + +#if __GNUC__ >= 6 +#define JSON_USE_INT64_DOUBLE_CONVERSION 1 +#endif + +#if !defined(JSON_IS_AMALGAMATION) + +#include "allocator.h" +#include "version.h" + +#endif // if !defined(JSON_IS_AMALGAMATION) + +namespace Json { +typedef int Int; +typedef unsigned int UInt; +#if defined(JSON_NO_INT64) +typedef int LargestInt; +typedef unsigned int LargestUInt; +#undef JSON_HAS_INT64 +#else // if defined(JSON_NO_INT64) +// For Microsoft Visual use specific types as long long is not supported +#if defined(_MSC_VER) // Microsoft Visual Studio +typedef __int64 Int64; +typedef unsigned __int64 UInt64; +#else // if defined(_MSC_VER) // Other platforms, use long long +typedef int64_t Int64; +typedef uint64_t UInt64; +#endif // if defined(_MSC_VER) +typedef Int64 LargestInt; +typedef UInt64 LargestUInt; +#define JSON_HAS_INT64 +#endif // if defined(JSON_NO_INT64) + +template +using Allocator = typename std::conditional, + std::allocator>::type; +using String = std::basic_string, Allocator>; +using IStringStream = std::basic_istringstream; +using OStringStream = std::basic_ostringstream; +using IStream = std::istream; +using OStream = std::ostream; +} // namespace Json + +// Legacy names (formerly macros). +using JSONCPP_STRING = Json::String; +using JSONCPP_ISTRINGSTREAM = Json::IStringStream; +using JSONCPP_OSTRINGSTREAM = Json::OStringStream; +using JSONCPP_ISTREAM = Json::IStream; +using JSONCPP_OSTREAM = Json::OStream; + +#endif // JSON_CONFIG_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/config.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/forwards.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef JSON_FORWARDS_H_INCLUDED +#define JSON_FORWARDS_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "config.h" +#endif // if !defined(JSON_IS_AMALGAMATION) + +namespace Json { + +// writer.h +class FastWriter; +class StyledWriter; + +// reader.h +class Reader; + +// features.h +class Features; + +// value.h +typedef unsigned int ArrayIndex; +class StaticString; +class Path; +class PathArgument; +class Value; +class ValueIteratorBase; +class ValueIterator; +class ValueConstIterator; + +} // namespace Json + +#endif // JSON_FORWARDS_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/forwards.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/features.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef CPPTL_JSON_FEATURES_H_INCLUDED +#define CPPTL_JSON_FEATURES_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "forwards.h" +#endif // if !defined(JSON_IS_AMALGAMATION) + +#pragma pack(push, 8) + +namespace Json { + +/** \brief Configuration passed to reader and writer. + * This configuration object can be used to force the Reader or Writer + * to behave in a standard conforming way. + */ +class JSON_API Features { +public: + /** \brief A configuration that allows all features and assumes all strings + * are UTF-8. + * - C & C++ comments are allowed + * - Root object can be any JSON value + * - Assumes Value strings are encoded in UTF-8 + */ + static Features all(); + + /** \brief A configuration that is strictly compatible with the JSON + * specification. + * - Comments are forbidden. + * - Root object must be either an array or an object value. + * - Assumes Value strings are encoded in UTF-8 + */ + static Features strictMode(); + + /** \brief Initialize the configuration like JsonConfig::allFeatures; + */ + Features(); + + /// \c true if comments are allowed. Default: \c true. + bool allowComments_{true}; + + /// \c true if root must be either an array or an object value. Default: \c + /// false. + bool strictRoot_{false}; + + /// \c true if dropped null placeholders are allowed. Default: \c false. + bool allowDroppedNullPlaceholders_{false}; + + /// \c true if numeric object key are allowed. Default: \c false. + bool allowNumericKeys_{false}; +}; + +} // namespace Json + +#pragma pack(pop) + +#endif // CPPTL_JSON_FEATURES_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/features.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/value.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef CPPTL_JSON_H_INCLUDED +#define CPPTL_JSON_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "forwards.h" +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#include +#include + +#ifndef JSON_USE_CPPTL_SMALLMAP +#include +#else +#include +#endif +#ifdef JSON_USE_CPPTL +#include +#endif + +// Conditional NORETURN attribute on the throw functions would: +// a) suppress false positives from static code analysis +// b) possibly improve optimization opportunities. +#if !defined(JSONCPP_NORETURN) +#if defined(_MSC_VER) +#define JSONCPP_NORETURN __declspec(noreturn) +#elif defined(__GNUC__) +#define JSONCPP_NORETURN __attribute__((__noreturn__)) +#else +#define JSONCPP_NORETURN +#endif +#endif + +// Disable warning C4251: : needs to have dll-interface to +// be used by... +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#pragma warning(push) +#pragma warning(disable : 4251) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#pragma pack(push, 8) + +/** \brief JSON (JavaScript Object Notation). + */ +namespace Json { + +/** Base class for all exceptions we throw. + * + * We use nothing but these internally. Of course, STL can throw others. + */ +class JSON_API Exception : public std::exception { +public: + Exception(String msg); + ~Exception() JSONCPP_NOEXCEPT override; + char const* what() const JSONCPP_NOEXCEPT override; + +protected: + String msg_; +}; + +/** Exceptions which the user cannot easily avoid. + * + * E.g. out-of-memory (when we use malloc), stack-overflow, malicious input + * + * \remark derived from Json::Exception + */ +class JSON_API RuntimeError : public Exception { +public: + RuntimeError(String const& msg); +}; + +/** Exceptions thrown by JSON_ASSERT/JSON_FAIL macros. + * + * These are precondition-violations (user bugs) and internal errors (our bugs). + * + * \remark derived from Json::Exception + */ +class JSON_API LogicError : public Exception { +public: + LogicError(String const& msg); +}; + +/// used internally +JSONCPP_NORETURN void throwRuntimeError(String const& msg); +/// used internally +JSONCPP_NORETURN void throwLogicError(String const& msg); + +/** \brief Type of the value held by a Value object. + */ +enum ValueType { + nullValue = 0, ///< 'null' value + intValue, ///< signed integer value + uintValue, ///< unsigned integer value + realValue, ///< double value + stringValue, ///< UTF-8 string value + booleanValue, ///< bool value + arrayValue, ///< array value (ordered list) + objectValue ///< object value (collection of name/value pairs). +}; + +enum CommentPlacement { + commentBefore = 0, ///< a comment placed on the line before a value + commentAfterOnSameLine, ///< a comment just after a value on the same line + commentAfter, ///< a comment on the line after a value (only make sense for + /// root value) + numberOfCommentPlacement +}; + +/** \brief Type of precision for formatting of real values. + */ +enum PrecisionType { + significantDigits = 0, ///< we set max number of significant digits in string + decimalPlaces ///< we set max number of digits after "." in string +}; + +//# ifdef JSON_USE_CPPTL +// typedef CppTL::AnyEnumerator EnumMemberNames; +// typedef CppTL::AnyEnumerator EnumValues; +//# endif + +/** \brief Lightweight wrapper to tag static string. + * + * Value constructor and objectValue member assignment takes advantage of the + * StaticString and avoid the cost of string duplication when storing the + * string or the member name. + * + * Example of usage: + * \code + * Json::Value aValue( StaticString("some text") ); + * Json::Value object; + * static const StaticString code("code"); + * object[code] = 1234; + * \endcode + */ +class JSON_API StaticString { +public: + explicit StaticString(const char* czstring) : c_str_(czstring) {} + + operator const char*() const { return c_str_; } + + const char* c_str() const { return c_str_; } + +private: + const char* c_str_; +}; + +/** \brief Represents a JSON value. + * + * This class is a discriminated union wrapper that can represents a: + * - signed integer [range: Value::minInt - Value::maxInt] + * - unsigned integer (range: 0 - Value::maxUInt) + * - double + * - UTF-8 string + * - boolean + * - 'null' + * - an ordered list of Value + * - collection of name/value pairs (javascript object) + * + * The type of the held value is represented by a #ValueType and + * can be obtained using type(). + * + * Values of an #objectValue or #arrayValue can be accessed using operator[]() + * methods. + * Non-const methods will automatically create the a #nullValue element + * if it does not exist. + * The sequence of an #arrayValue will be automatically resized and initialized + * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue. + * + * The get() methods can be used to obtain default value in the case the + * required element does not exist. + * + * It is possible to iterate over the list of member keys of an object using + * the getMemberNames() method. + * + * \note #Value string-length fit in size_t, but keys must be < 2^30. + * (The reason is an implementation detail.) A #CharReader will raise an + * exception if a bound is exceeded to avoid security holes in your app, + * but the Value API does *not* check bounds. That is the responsibility + * of the caller. + */ +class JSON_API Value { + friend class ValueIteratorBase; + +public: + typedef std::vector Members; + typedef ValueIterator iterator; + typedef ValueConstIterator const_iterator; + typedef Json::UInt UInt; + typedef Json::Int Int; +#if defined(JSON_HAS_INT64) + typedef Json::UInt64 UInt64; + typedef Json::Int64 Int64; +#endif // defined(JSON_HAS_INT64) + typedef Json::LargestInt LargestInt; + typedef Json::LargestUInt LargestUInt; + typedef Json::ArrayIndex ArrayIndex; + + // Required for boost integration, e. g. BOOST_TEST + typedef std::string value_type; + + static const Value& null; ///< We regret this reference to a global instance; + ///< prefer the simpler Value(). + static const Value& nullRef; ///< just a kludge for binary-compatibility; same + ///< as null + static Value const& nullSingleton(); ///< Prefer this to null or nullRef. + + /// Minimum signed integer value that can be stored in a Json::Value. + static const LargestInt minLargestInt; + /// Maximum signed integer value that can be stored in a Json::Value. + static const LargestInt maxLargestInt; + /// Maximum unsigned integer value that can be stored in a Json::Value. + static const LargestUInt maxLargestUInt; + + /// Minimum signed int value that can be stored in a Json::Value. + static const Int minInt; + /// Maximum signed int value that can be stored in a Json::Value. + static const Int maxInt; + /// Maximum unsigned int value that can be stored in a Json::Value. + static const UInt maxUInt; + +#if defined(JSON_HAS_INT64) + /// Minimum signed 64 bits int value that can be stored in a Json::Value. + static const Int64 minInt64; + /// Maximum signed 64 bits int value that can be stored in a Json::Value. + static const Int64 maxInt64; + /// Maximum unsigned 64 bits int value that can be stored in a Json::Value. + static const UInt64 maxUInt64; +#endif // defined(JSON_HAS_INT64) + + /// Default precision for real value for string representation. + static const UInt defaultRealPrecision; + +// Workaround for bug in the NVIDIAs CUDA 9.1 nvcc compiler +// when using gcc and clang backend compilers. CZString +// cannot be defined as private. See issue #486 +#ifdef __NVCC__ +public: +#else +private: +#endif +#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION + class CZString { + public: + enum DuplicationPolicy { noDuplication = 0, duplicate, duplicateOnCopy }; + CZString(ArrayIndex index); + CZString(char const* str, unsigned length, DuplicationPolicy allocate); + CZString(CZString const& other); + CZString(CZString&& other); + ~CZString(); + CZString& operator=(const CZString& other); + CZString& operator=(CZString&& other); + + bool operator<(CZString const& other) const; + bool operator==(CZString const& other) const; + ArrayIndex index() const; + // const char* c_str() const; ///< \deprecated + char const* data() const; + unsigned length() const; + bool isStaticString() const; + + private: + void swap(CZString& other); + + struct StringStorage { + unsigned policy_ : 2; + unsigned length_ : 30; // 1GB max + }; + + char const* cstr_; // actually, a prefixed string, unless policy is noDup + union { + ArrayIndex index_; + StringStorage storage_; + }; + }; + +public: +#ifndef JSON_USE_CPPTL_SMALLMAP + typedef std::map ObjectValues; +#else + typedef CppTL::SmallMap ObjectValues; +#endif // ifndef JSON_USE_CPPTL_SMALLMAP +#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION + +public: + /** \brief Create a default Value of the given type. + + This is a very useful constructor. + To create an empty array, pass arrayValue. + To create an empty object, pass objectValue. + Another Value can then be set to this one by assignment. +This is useful since clear() and resize() will not alter types. + + Examples: +\code +Json::Value null_value; // null +Json::Value arr_value(Json::arrayValue); // [] +Json::Value obj_value(Json::objectValue); // {} +\endcode + */ + Value(ValueType type = nullValue); + Value(Int value); + Value(UInt value); +#if defined(JSON_HAS_INT64) + Value(Int64 value); + Value(UInt64 value); +#endif // if defined(JSON_HAS_INT64) + Value(double value); + Value(const char* value); ///< Copy til first 0. (NULL causes to seg-fault.) + Value(const char* begin, const char* end); ///< Copy all, incl zeroes. + /** \brief Constructs a value from a static string. + + * Like other value string constructor but do not duplicate the string for + * internal storage. The given string must remain alive after the call to this + * constructor. + * \note This works only for null-terminated strings. (We cannot change the + * size of this class, so we have nowhere to store the length, + * which might be computed later for various operations.) + * + * Example of usage: + * \code + * static StaticString foo("some text"); + * Json::Value aValue(foo); + * \endcode + */ + Value(const StaticString& value); + Value(const String& value); ///< Copy data() til size(). Embedded + ///< zeroes too. +#ifdef JSON_USE_CPPTL + Value(const CppTL::ConstString& value); +#endif + Value(bool value); + Value(const Value& other); + Value(Value&& other); + ~Value(); + + /// \note Overwrite existing comments. To preserve comments, use + /// #swapPayload(). + Value& operator=(const Value& other); + Value& operator=(Value&& other); + + /// Swap everything. + void swap(Value& other); + /// Swap values but leave comments and source offsets in place. + void swapPayload(Value& other); + + /// copy everything. + void copy(const Value& other); + /// copy values but leave comments and source offsets in place. + void copyPayload(const Value& other); + + ValueType type() const; + + /// Compare payload only, not comments etc. + bool operator<(const Value& other) const; + bool operator<=(const Value& other) const; + bool operator>=(const Value& other) const; + bool operator>(const Value& other) const; + bool operator==(const Value& other) const; + bool operator!=(const Value& other) const; + int compare(const Value& other) const; + + const char* asCString() const; ///< Embedded zeroes could cause you trouble! +#if JSONCPP_USING_SECURE_MEMORY + unsigned getCStringLength() const; // Allows you to understand the length of + // the CString +#endif + String asString() const; ///< Embedded zeroes are possible. + /** Get raw char* of string-value. + * \return false if !string. (Seg-fault if str or end are NULL.) + */ + bool getString(char const** begin, char const** end) const; +#ifdef JSON_USE_CPPTL + CppTL::ConstString asConstString() const; +#endif + Int asInt() const; + UInt asUInt() const; +#if defined(JSON_HAS_INT64) + Int64 asInt64() const; + UInt64 asUInt64() const; +#endif // if defined(JSON_HAS_INT64) + LargestInt asLargestInt() const; + LargestUInt asLargestUInt() const; + float asFloat() const; + double asDouble() const; + bool asBool() const; + + bool isNull() const; + bool isBool() const; + bool isInt() const; + bool isInt64() const; + bool isUInt() const; + bool isUInt64() const; + bool isIntegral() const; + bool isDouble() const; + bool isNumeric() const; + bool isString() const; + bool isArray() const; + bool isObject() const; + + bool isConvertibleTo(ValueType other) const; + + /// Number of values in array or object + ArrayIndex size() const; + + /// \brief Return true if empty array, empty object, or null; + /// otherwise, false. + bool empty() const; + + /// Return !isNull() + JSONCPP_OP_EXPLICIT operator bool() const; + + /// Remove all object members and array elements. + /// \pre type() is arrayValue, objectValue, or nullValue + /// \post type() is unchanged + void clear(); + + /// Resize the array to newSize elements. + /// New elements are initialized to null. + /// May only be called on nullValue or arrayValue. + /// \pre type() is arrayValue or nullValue + /// \post type() is arrayValue + void resize(ArrayIndex newSize); + + /// Access an array element (zero based index ). + /// If the array contains less than index element, then null value are + /// inserted + /// in the array so that its size is index+1. + /// (You may need to say 'value[0u]' to get your compiler to distinguish + /// this from the operator[] which takes a string.) + Value& operator[](ArrayIndex index); + + /// Access an array element (zero based index ). + /// If the array contains less than index element, then null value are + /// inserted + /// in the array so that its size is index+1. + /// (You may need to say 'value[0u]' to get your compiler to distinguish + /// this from the operator[] which takes a string.) + Value& operator[](int index); + + /// Access an array element (zero based index ) + /// (You may need to say 'value[0u]' to get your compiler to distinguish + /// this from the operator[] which takes a string.) + const Value& operator[](ArrayIndex index) const; + + /// Access an array element (zero based index ) + /// (You may need to say 'value[0u]' to get your compiler to distinguish + /// this from the operator[] which takes a string.) + const Value& operator[](int index) const; + + /// If the array contains at least index+1 elements, returns the element + /// value, + /// otherwise returns defaultValue. + Value get(ArrayIndex index, const Value& defaultValue) const; + /// Return true if index < size(). + bool isValidIndex(ArrayIndex index) const; + /// \brief Append value to array at the end. + /// + /// Equivalent to jsonvalue[jsonvalue.size()] = value; + Value& append(const Value& value); + Value& append(Value&& value); + + /// Access an object value by name, create a null member if it does not exist. + /// \note Because of our implementation, keys are limited to 2^30 -1 chars. + /// Exceeding that will cause an exception. + Value& operator[](const char* key); + /// Access an object value by name, returns null if there is no member with + /// that name. + const Value& operator[](const char* key) const; + /// Access an object value by name, create a null member if it does not exist. + /// \param key may contain embedded nulls. + Value& operator[](const String& key); + /// Access an object value by name, returns null if there is no member with + /// that name. + /// \param key may contain embedded nulls. + const Value& operator[](const String& key) const; + /** \brief Access an object value by name, create a null member if it does not + exist. + + * If the object has no entry for that name, then the member name used to + store + * the new entry is not duplicated. + * Example of use: + * \code + * Json::Value object; + * static const StaticString code("code"); + * object[code] = 1234; + * \endcode + */ + Value& operator[](const StaticString& key); +#ifdef JSON_USE_CPPTL + /// Access an object value by name, create a null member if it does not exist. + Value& operator[](const CppTL::ConstString& key); + /// Access an object value by name, returns null if there is no member with + /// that name. + const Value& operator[](const CppTL::ConstString& key) const; +#endif + /// Return the member named key if it exist, defaultValue otherwise. + /// \note deep copy + Value get(const char* key, const Value& defaultValue) const; + /// Return the member named key if it exist, defaultValue otherwise. + /// \note deep copy + /// \note key may contain embedded nulls. + Value + get(const char* begin, const char* end, const Value& defaultValue) const; + /// Return the member named key if it exist, defaultValue otherwise. + /// \note deep copy + /// \param key may contain embedded nulls. + Value get(const String& key, const Value& defaultValue) const; +#ifdef JSON_USE_CPPTL + /// Return the member named key if it exist, defaultValue otherwise. + /// \note deep copy + Value get(const CppTL::ConstString& key, const Value& defaultValue) const; +#endif + /// Most general and efficient version of isMember()const, get()const, + /// and operator[]const + /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30 + Value const* find(char const* begin, char const* end) const; + /// Most general and efficient version of object-mutators. + /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30 + /// \return non-zero, but JSON_ASSERT if this is neither object nor nullValue. + Value* demand(char const* begin, char const* end); + /// \brief Remove and return the named member. + /// + /// Do nothing if it did not exist. + /// \pre type() is objectValue or nullValue + /// \post type() is unchanged + void removeMember(const char* key); + /// Same as removeMember(const char*) + /// \param key may contain embedded nulls. + void removeMember(const String& key); + /// Same as removeMember(const char* begin, const char* end, Value* removed), + /// but 'key' is null-terminated. + bool removeMember(const char* key, Value* removed); + /** \brief Remove the named map member. + + Update 'removed' iff removed. + \param key may contain embedded nulls. + \return true iff removed (no exceptions) + */ + bool removeMember(String const& key, Value* removed); + /// Same as removeMember(String const& key, Value* removed) + bool removeMember(const char* begin, const char* end, Value* removed); + /** \brief Remove the indexed array element. + + O(n) expensive operations. + Update 'removed' iff removed. + \return true if removed (no exceptions) + */ + bool removeIndex(ArrayIndex index, Value* removed); + + /// Return true if the object has a member named key. + /// \note 'key' must be null-terminated. + bool isMember(const char* key) const; + /// Return true if the object has a member named key. + /// \param key may contain embedded nulls. + bool isMember(const String& key) const; + /// Same as isMember(String const& key)const + bool isMember(const char* begin, const char* end) const; +#ifdef JSON_USE_CPPTL + /// Return true if the object has a member named key. + bool isMember(const CppTL::ConstString& key) const; +#endif + + /// \brief Return a list of the member names. + /// + /// If null, return an empty list. + /// \pre type() is objectValue or nullValue + /// \post if type() was nullValue, it remains nullValue + Members getMemberNames() const; + + //# ifdef JSON_USE_CPPTL + // EnumMemberNames enumMemberNames() const; + // EnumValues enumValues() const; + //# endif + + /// \deprecated Always pass len. + JSONCPP_DEPRECATED("Use setComment(String const&) instead.") + void setComment(const char* comment, CommentPlacement placement) { + setComment(String(comment, strlen(comment)), placement); + } + /// Comments must be //... or /* ... */ + void setComment(const char* comment, size_t len, CommentPlacement placement) { + setComment(String(comment, len), placement); + } + /// Comments must be //... or /* ... */ + void setComment(String comment, CommentPlacement placement); + bool hasComment(CommentPlacement placement) const; + /// Include delimiters and embedded newlines. + String getComment(CommentPlacement placement) const; + + String toStyledString() const; + + const_iterator begin() const; + const_iterator end() const; + + iterator begin(); + iterator end(); + + // Accessors for the [start, limit) range of bytes within the JSON text from + // which this value was parsed, if any. + void setOffsetStart(ptrdiff_t start); + void setOffsetLimit(ptrdiff_t limit); + ptrdiff_t getOffsetStart() const; + ptrdiff_t getOffsetLimit() const; + +private: + void setType(ValueType v) { bits_.value_type_ = static_cast (v); } + bool isAllocated() const { return bits_.allocated_; } + void setIsAllocated(bool v) { bits_.allocated_ = v; } + + void initBasic(ValueType type, bool allocated = false); + void dupPayload(const Value& other); + void releasePayload(); + void dupMeta(const Value& other); + + Value& resolveReference(const char* key); + Value& resolveReference(const char* key, const char* end); + + // struct MemberNamesTransform + //{ + // typedef const char *result_type; + // const char *operator()( const CZString &name ) const + // { + // return name.c_str(); + // } + //}; + + union ValueHolder { + LargestInt int_; + LargestUInt uint_; + double real_; + bool bool_; + char* string_; // if allocated_, ptr to { unsigned, char[] }. + ObjectValues* map_; + } value_; + + struct { + // Really a ValueType, but types should agree for bitfield packing. + unsigned int value_type_ : 8; + // Unless allocated_, string_ must be null-terminated. + unsigned int allocated_ : 1; + } bits_; + + class Comments { + public: + Comments() = default; + Comments(const Comments& that); + Comments(Comments&& that); + Comments& operator=(const Comments& that); + Comments& operator=(Comments&& that); + bool has(CommentPlacement slot) const; + String get(CommentPlacement slot) const; + void set(CommentPlacement slot, String s); + + private: + using Array = std::array; + std::unique_ptr ptr_; + }; + Comments comments_; + + // [start, limit) byte offsets in the source JSON text from which this Value + // was extracted. + ptrdiff_t start_; + ptrdiff_t limit_; +}; + +/** \brief Experimental and untested: represents an element of the "path" to + * access a node. + */ +class JSON_API PathArgument { +public: + friend class Path; + + PathArgument(); + PathArgument(ArrayIndex index); + PathArgument(const char* key); + PathArgument(const String& key); + +private: + enum Kind { kindNone = 0, kindIndex, kindKey }; + String key_; + ArrayIndex index_{}; + Kind kind_{kindNone}; +}; + +/** \brief Experimental and untested: represents a "path" to access a node. + * + * Syntax: + * - "." => root node + * - ".[n]" => elements at index 'n' of root node (an array value) + * - ".name" => member named 'name' of root node (an object value) + * - ".name1.name2.name3" + * - ".[0][1][2].name1[3]" + * - ".%" => member name is provided as parameter + * - ".[%]" => index is provied as parameter + */ +class JSON_API Path { +public: + Path(const String& path, + const PathArgument& a1 = PathArgument(), + const PathArgument& a2 = PathArgument(), + const PathArgument& a3 = PathArgument(), + const PathArgument& a4 = PathArgument(), + const PathArgument& a5 = PathArgument()); + + const Value& resolve(const Value& root) const; + Value resolve(const Value& root, const Value& defaultValue) const; + /// Creates the "path" to access the specified node and returns a reference on + /// the node. + Value& make(Value& root) const; + +private: + typedef std::vector InArgs; + typedef std::vector Args; + + void makePath(const String& path, const InArgs& in); + void addPathInArg(const String& path, + const InArgs& in, + InArgs::const_iterator& itInArg, + PathArgument::Kind kind); + static void invalidPath(const String& path, int location); + + Args args_; +}; + +/** \brief base class for Value iterators. + * + */ +class JSON_API ValueIteratorBase { +public: + typedef std::bidirectional_iterator_tag iterator_category; + typedef unsigned int size_t; + typedef int difference_type; + typedef ValueIteratorBase SelfType; + + bool operator==(const SelfType& other) const { return isEqual(other); } + + bool operator!=(const SelfType& other) const { return !isEqual(other); } + + difference_type operator-(const SelfType& other) const { + return other.computeDistance(*this); + } + + /// Return either the index or the member name of the referenced value as a + /// Value. + Value key() const; + + /// Return the index of the referenced Value, or -1 if it is not an + /// arrayValue. + UInt index() const; + + /// Return the member name of the referenced Value, or "" if it is not an + /// objectValue. + /// \note Avoid `c_str()` on result, as embedded zeroes are possible. + String name() const; + + /// Return the member name of the referenced Value. "" if it is not an + /// objectValue. + /// \deprecated This cannot be used for UTF-8 strings, since there can be + /// embedded nulls. + JSONCPP_DEPRECATED("Use `key = name();` instead.") + char const* memberName() const; + /// Return the member name of the referenced Value, or NULL if it is not an + /// objectValue. + /// \note Better version than memberName(). Allows embedded nulls. + char const* memberName(char const** end) const; + +protected: + Value& deref() const; + + void increment(); + + void decrement(); + + difference_type computeDistance(const SelfType& other) const; + + bool isEqual(const SelfType& other) const; + + void copy(const SelfType& other); + +private: + Value::ObjectValues::iterator current_; + // Indicates that iterator is for a null value. + bool isNull_{true}; + +public: + // For some reason, BORLAND needs these at the end, rather + // than earlier. No idea why. + ValueIteratorBase(); + explicit ValueIteratorBase(const Value::ObjectValues::iterator& current); +}; + +/** \brief const iterator for object and array value. + * + */ +class JSON_API ValueConstIterator : public ValueIteratorBase { + friend class Value; + +public: + typedef const Value value_type; + // typedef unsigned int size_t; + // typedef int difference_type; + typedef const Value& reference; + typedef const Value* pointer; + typedef ValueConstIterator SelfType; + + ValueConstIterator(); + ValueConstIterator(ValueIterator const& other); + +private: + /*! \internal Use by Value to create an iterator. + */ + explicit ValueConstIterator(const Value::ObjectValues::iterator& current); + +public: + SelfType& operator=(const ValueIteratorBase& other); + + SelfType operator++(int) { + SelfType temp(*this); + ++*this; + return temp; + } + + SelfType operator--(int) { + SelfType temp(*this); + --*this; + return temp; + } + + SelfType& operator--() { + decrement(); + return *this; + } + + SelfType& operator++() { + increment(); + return *this; + } + + reference operator*() const { return deref(); } + + pointer operator->() const { return &deref(); } +}; + +/** \brief Iterator for object and array value. + */ +class JSON_API ValueIterator : public ValueIteratorBase { + friend class Value; + +public: + typedef Value value_type; + typedef unsigned int size_t; + typedef int difference_type; + typedef Value& reference; + typedef Value* pointer; + typedef ValueIterator SelfType; + + ValueIterator(); + explicit ValueIterator(const ValueConstIterator& other); + ValueIterator(const ValueIterator& other); + +private: + /*! \internal Use by Value to create an iterator. + */ + explicit ValueIterator(const Value::ObjectValues::iterator& current); + +public: + SelfType& operator=(const SelfType& other); + + SelfType operator++(int) { + SelfType temp(*this); + ++*this; + return temp; + } + + SelfType operator--(int) { + SelfType temp(*this); + --*this; + return temp; + } + + SelfType& operator--() { + decrement(); + return *this; + } + + SelfType& operator++() { + increment(); + return *this; + } + + reference operator*() const { return deref(); } + + pointer operator->() const { return &deref(); } +}; + +inline void swap(Value& a, Value& b) { a.swap(b); } + +} // namespace Json + +#pragma pack(pop) + +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#pragma warning(pop) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#endif // CPPTL_JSON_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/value.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/reader.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef CPPTL_JSON_READER_H_INCLUDED +#define CPPTL_JSON_READER_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "features.h" +#include "value.h" +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#include +#include + +// Disable warning C4251: : needs to have dll-interface to +// be used by... +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#pragma warning(push) +#pragma warning(disable : 4251) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#pragma pack(push, 8) + +namespace Json { + +/** \brief Unserialize a JSON document into a + *Value. + * + * \deprecated Use CharReader and CharReaderBuilder. + */ +class JSON_API Reader { +public: + typedef char Char; + typedef const Char* Location; + + /** \brief An error tagged with where in the JSON text it was encountered. + * + * The offsets give the [start, limit) range of bytes within the text. Note + * that this is bytes, not codepoints. + * + */ + struct StructuredError { + ptrdiff_t offset_start; + ptrdiff_t offset_limit; + String message; + }; + + /** \brief Constructs a Reader allowing all features + * for parsing. + */ + JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead") + Reader(); + + /** \brief Constructs a Reader allowing the specified feature set + * for parsing. + */ + JSONCPP_DEPRECATED("Use CharReader and CharReaderBuilder instead") + Reader(const Features& features); + + /** \brief Read a Value from a JSON + * document. + * \param document UTF-8 encoded string containing the document to read. + * \param root [out] Contains the root value of the document if it was + * successfully parsed. + * \param collectComments \c true to collect comment and allow writing them + * back during + * serialization, \c false to discard comments. + * This parameter is ignored if + * Features::allowComments_ + * is \c false. + * \return \c true if the document was successfully parsed, \c false if an + * error occurred. + */ + bool + parse(const std::string& document, Value& root, bool collectComments = true); + + /** \brief Read a Value from a JSON + document. + * \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the + document to read. + * \param endDoc Pointer on the end of the UTF-8 encoded string of the + document to read. + * Must be >= beginDoc. + * \param root [out] Contains the root value of the document if it was + * successfully parsed. + * \param collectComments \c true to collect comment and allow writing them + back during + * serialization, \c false to discard comments. + * This parameter is ignored if + Features::allowComments_ + * is \c false. + * \return \c true if the document was successfully parsed, \c false if an + error occurred. + */ + bool parse(const char* beginDoc, + const char* endDoc, + Value& root, + bool collectComments = true); + + /// \brief Parse from input stream. + /// \see Json::operator>>(std::istream&, Json::Value&). + bool parse(IStream& is, Value& root, bool collectComments = true); + + /** \brief Returns a user friendly string that list errors in the parsed + * document. + * \return Formatted error message with the list of errors with their location + * in + * the parsed document. An empty string is returned if no error + * occurred + * during parsing. + * \deprecated Use getFormattedErrorMessages() instead (typo fix). + */ + JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.") + String getFormatedErrorMessages() const; + + /** \brief Returns a user friendly string that list errors in the parsed + * document. + * \return Formatted error message with the list of errors with their location + * in + * the parsed document. An empty string is returned if no error + * occurred + * during parsing. + */ + String getFormattedErrorMessages() const; + + /** \brief Returns a vector of structured erros encounted while parsing. + * \return A (possibly empty) vector of StructuredError objects. Currently + * only one error can be returned, but the caller should tolerate + * multiple + * errors. This can occur if the parser recovers from a non-fatal + * parse error and then encounters additional errors. + */ + std::vector getStructuredErrors() const; + + /** \brief Add a semantic error message. + * \param value JSON Value location associated with the error + * \param message The error message. + * \return \c true if the error was successfully added, \c false if the + * Value offset exceeds the document size. + */ + bool pushError(const Value& value, const String& message); + + /** \brief Add a semantic error message with extra context. + * \param value JSON Value location associated with the error + * \param message The error message. + * \param extra Additional JSON Value location to contextualize the error + * \return \c true if the error was successfully added, \c false if either + * Value offset exceeds the document size. + */ + bool pushError(const Value& value, const String& message, const Value& extra); + + /** \brief Return whether there are any errors. + * \return \c true if there are no errors to report \c false if + * errors have occurred. + */ + bool good() const; + +private: + enum TokenType { + tokenEndOfStream = 0, + tokenObjectBegin, + tokenObjectEnd, + tokenArrayBegin, + tokenArrayEnd, + tokenString, + tokenNumber, + tokenTrue, + tokenFalse, + tokenNull, + tokenArraySeparator, + tokenMemberSeparator, + tokenComment, + tokenError + }; + + class Token { + public: + TokenType type_; + Location start_; + Location end_; + }; + + class ErrorInfo { + public: + Token token_; + String message_; + Location extra_; + }; + + typedef std::deque Errors; + + bool readToken(Token& token); + void skipSpaces(); + bool match(Location pattern, int patternLength); + bool readComment(); + bool readCStyleComment(); + bool readCppStyleComment(); + bool readString(); + void readNumber(); + bool readValue(); + bool readObject(Token& token); + bool readArray(Token& token); + bool decodeNumber(Token& token); + bool decodeNumber(Token& token, Value& decoded); + bool decodeString(Token& token); + bool decodeString(Token& token, String& decoded); + bool decodeDouble(Token& token); + bool decodeDouble(Token& token, Value& decoded); + bool decodeUnicodeCodePoint(Token& token, + Location& current, + Location end, + unsigned int& unicode); + bool decodeUnicodeEscapeSequence(Token& token, + Location& current, + Location end, + unsigned int& unicode); + bool addError(const String& message, Token& token, Location extra = nullptr); + bool recoverFromError(TokenType skipUntilToken); + bool addErrorAndRecover(const String& message, + Token& token, + TokenType skipUntilToken); + void skipUntilSpace(); + Value& currentValue(); + Char getNextChar(); + void + getLocationLineAndColumn(Location location, int& line, int& column) const; + String getLocationLineAndColumn(Location location) const; + void addComment(Location begin, Location end, CommentPlacement placement); + void skipCommentTokens(Token& token); + + static bool containsNewLine(Location begin, Location end); + static String normalizeEOL(Location begin, Location end); + + typedef std::stack Nodes; + Nodes nodes_; + Errors errors_; + String document_; + Location begin_{}; + Location end_{}; + Location current_{}; + Location lastValueEnd_{}; + Value* lastValue_{}; + String commentsBefore_; + Features features_; + bool collectComments_{}; +}; // Reader + +/** Interface for reading JSON from a char array. + */ +class JSON_API CharReader { +public: + virtual ~CharReader() = default; + /** \brief Read a Value from a JSON + document. + * The document must be a UTF-8 encoded string containing the document to + read. + * + * \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the + document to read. + * \param endDoc Pointer on the end of the UTF-8 encoded string of the + document to read. + * Must be >= beginDoc. + * \param root [out] Contains the root value of the document if it was + * successfully parsed. + * \param errs [out] Formatted error messages (if not NULL) + * a user friendly string that lists errors in the parsed + * document. + * \return \c true if the document was successfully parsed, \c false if an + error occurred. + */ + virtual bool parse(char const* beginDoc, + char const* endDoc, + Value* root, + String* errs) = 0; + + class JSON_API Factory { + public: + virtual ~Factory() = default; + /** \brief Allocate a CharReader via operator new(). + * \throw std::exception if something goes wrong (e.g. invalid settings) + */ + virtual CharReader* newCharReader() const = 0; + }; // Factory +}; // CharReader + +/** \brief Build a CharReader implementation. + +Usage: +\code + using namespace Json; + CharReaderBuilder builder; + builder["collectComments"] = false; + Value value; + String errs; + bool ok = parseFromStream(builder, std::cin, &value, &errs); +\endcode +*/ +class JSON_API CharReaderBuilder : public CharReader::Factory { +public: + // Note: We use a Json::Value so that we can add data-members to this class + // without a major version bump. + /** Configuration of this builder. + These are case-sensitive. + Available settings (case-sensitive): + - `"collectComments": false or true` + - true to collect comment and allow writing them + back during serialization, false to discard comments. + This parameter is ignored if allowComments is false. + - `"allowComments": false or true` + - true if comments are allowed. + - `"strictRoot": false or true` + - true if root must be either an array or an object value + - `"allowDroppedNullPlaceholders": false or true` + - true if dropped null placeholders are allowed. (See + StreamWriterBuilder.) + - `"allowNumericKeys": false or true` + - true if numeric object keys are allowed. + - `"allowSingleQuotes": false or true` + - true if '' are allowed for strings (both keys and values) + - `"stackLimit": integer` + - Exceeding stackLimit (recursive depth of `readValue()`) will + cause an exception. + - This is a security issue (seg-faults caused by deeply nested JSON), + so the default is low. + - `"failIfExtra": false or true` + - If true, `parse()` returns false when extra non-whitespace trails + the JSON value in the input string. + - `"rejectDupKeys": false or true` + - If true, `parse()` returns false when a key is duplicated within an + object. + - `"allowSpecialFloats": false or true` + - If true, special float values (NaNs and infinities) are allowed + and their values are lossfree restorable. + + You can examine 'settings_` yourself + to see the defaults. You can also write and read them just like any + JSON Value. + \sa setDefaults() + */ + Json::Value settings_; + + CharReaderBuilder(); + ~CharReaderBuilder() override; + + CharReader* newCharReader() const override; + + /** \return true if 'settings' are legal and consistent; + * otherwise, indicate bad settings via 'invalid'. + */ + bool validate(Json::Value* invalid) const; + + /** A simple way to update a specific setting. + */ + Value& operator[](const String& key); + + /** Called by ctor, but you can use this to reset settings_. + * \pre 'settings' != NULL (but Json::null is fine) + * \remark Defaults: + * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults + */ + static void setDefaults(Json::Value* settings); + /** Same as old Features::strictMode(). + * \pre 'settings' != NULL (but Json::null is fine) + * \remark Defaults: + * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode + */ + static void strictMode(Json::Value* settings); +}; + +/** Consume entire stream and use its begin/end. + * Someday we might have a real StreamReader, but for now this + * is convenient. + */ +bool JSON_API parseFromStream(CharReader::Factory const&, + IStream&, + Value* root, + std::string* errs); + +/** \brief Read from 'sin' into 'root'. + + Always keep comments from the input JSON. + + This can be used to read a file into a particular sub-object. + For example: + \code + Json::Value root; + cin >> root["dir"]["file"]; + cout << root; + \endcode + Result: + \verbatim + { + "dir": { + "file": { + // The input stream JSON would be nested here. + } + } + } + \endverbatim + \throw std::exception on parse error. + \see Json::operator<<() +*/ +JSON_API IStream& operator>>(IStream&, Value&); + +} // namespace Json + +#pragma pack(pop) + +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#pragma warning(pop) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#endif // CPPTL_JSON_READER_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/reader.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/writer.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef JSON_WRITER_H_INCLUDED +#define JSON_WRITER_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include "value.h" +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include + +// Disable warning C4251: : needs to have dll-interface to +// be used by... +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4251) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#pragma pack(push, 8) + +namespace Json { + +class Value; + +/** + +Usage: +\code + using namespace Json; + void writeToStdout(StreamWriter::Factory const& factory, Value const& value) { + std::unique_ptr const writer( + factory.newStreamWriter()); + writer->write(value, &std::cout); + std::cout << std::endl; // add lf and flush + } +\endcode +*/ +class JSON_API StreamWriter { +protected: + OStream* sout_; // not owned; will not delete +public: + StreamWriter(); + virtual ~StreamWriter(); + /** Write Value into document as configured in sub-class. + Do not take ownership of sout, but maintain a reference during function. + \pre sout != NULL + \return zero on success (For now, we always return zero, so check the + stream instead.) \throw std::exception possibly, depending on configuration + */ + virtual int write(Value const& root, OStream* sout) = 0; + + /** \brief A simple abstract factory. + */ + class JSON_API Factory { + public: + virtual ~Factory(); + /** \brief Allocate a CharReader via operator new(). + * \throw std::exception if something goes wrong (e.g. invalid settings) + */ + virtual StreamWriter* newStreamWriter() const = 0; + }; // Factory +}; // StreamWriter + +/** \brief Write into stringstream, then return string, for convenience. + * A StreamWriter will be created from the factory, used, and then deleted. + */ +String JSON_API writeString(StreamWriter::Factory const& factory, + Value const& root); + +/** \brief Build a StreamWriter implementation. + +Usage: +\code + using namespace Json; + Value value = ...; + StreamWriterBuilder builder; + builder["commentStyle"] = "None"; + builder["indentation"] = " "; // or whatever you like + std::unique_ptr writer( + builder.newStreamWriter()); + writer->write(value, &std::cout); + std::cout << std::endl; // add lf and flush +\endcode +*/ +class JSON_API StreamWriterBuilder : public StreamWriter::Factory { +public: + // Note: We use a Json::Value so that we can add data-members to this class + // without a major version bump. + /** Configuration of this builder. + Available settings (case-sensitive): + - "commentStyle": "None" or "All" + - "indentation": "". + - Setting this to an empty string also omits newline characters. + - "enableYAMLCompatibility": false or true + - slightly change the whitespace around colons + - "dropNullPlaceholders": false or true + - Drop the "null" string from the writer's output for nullValues. + Strictly speaking, this is not valid JSON. But when the output is being + fed to a browser's JavaScript, it makes for smaller output and the + browser can handle the output just fine. + - "useSpecialFloats": false or true + - If true, outputs non-finite floating point values in the following way: + NaN values as "NaN", positive infinity as "Infinity", and negative + infinity as "-Infinity". + - "precision": int + - Number of precision digits for formatting of real values. + - "precisionType": "significant"(default) or "decimal" + - Type of precision for formatting of real values. + + You can examine 'settings_` yourself + to see the defaults. You can also write and read them just like any + JSON Value. + \sa setDefaults() + */ + Json::Value settings_; + + StreamWriterBuilder(); + ~StreamWriterBuilder() override; + + /** + * \throw std::exception if something goes wrong (e.g. invalid settings) + */ + StreamWriter* newStreamWriter() const override; + + /** \return true if 'settings' are legal and consistent; + * otherwise, indicate bad settings via 'invalid'. + */ + bool validate(Json::Value* invalid) const; + /** A simple way to update a specific setting. + */ + Value& operator[](const String& key); + + /** Called by ctor, but you can use this to reset settings_. + * \pre 'settings' != NULL (but Json::null is fine) + * \remark Defaults: + * \snippet src/lib_json/json_writer.cpp StreamWriterBuilderDefaults + */ + static void setDefaults(Json::Value* settings); +}; + +/** \brief Abstract class for writers. + * \deprecated Use StreamWriter. (And really, this is an implementation detail.) + */ +class JSONCPP_DEPRECATED("Use StreamWriter instead") JSON_API Writer { +public: + virtual ~Writer(); + + virtual String write(const Value& root) = 0; +}; + +/** \brief Outputs a Value in JSON format + *without formatting (not human friendly). + * + * The JSON document is written in a single line. It is not intended for 'human' + *consumption, + * but may be useful to support feature such as RPC where bandwidth is limited. + * \sa Reader, Value + * \deprecated Use StreamWriterBuilder. + */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) // Deriving from deprecated class +#endif +class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API FastWriter + : public Writer { +public: + FastWriter(); + ~FastWriter() override = default; + + void enableYAMLCompatibility(); + + /** \brief Drop the "null" string from the writer's output for nullValues. + * Strictly speaking, this is not valid JSON. But when the output is being + * fed to a browser's JavaScript, it makes for smaller output and the + * browser can handle the output just fine. + */ + void dropNullPlaceholders(); + + void omitEndingLineFeed(); + +public: // overridden from Writer + String write(const Value& root) override; + +private: + void writeValue(const Value& value); + + String document_; + bool yamlCompatibilityEnabled_{false}; + bool dropNullPlaceholders_{false}; + bool omitEndingLineFeed_{false}; +}; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + +/** \brief Writes a Value in JSON format in a + *human friendly way. + * + * The rules for line break and indent are as follow: + * - Object value: + * - if empty then print {} without indent and line break + * - if not empty the print '{', line break & indent, print one value per + *line + * and then unindent and line break and print '}'. + * - Array value: + * - if empty then print [] without indent and line break + * - if the array contains no object value, empty array or some other value + *types, + * and all the values fit on one lines, then print the array on a single + *line. + * - otherwise, it the values do not fit on one line, or the array contains + * object or non empty array, then print one value per line. + * + * If the Value have comments then they are outputed according to their + *#CommentPlacement. + * + * \sa Reader, Value, Value::setComment() + * \deprecated Use StreamWriterBuilder. + */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) // Deriving from deprecated class +#endif +class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API + StyledWriter : public Writer { +public: + StyledWriter(); + ~StyledWriter() override = default; + +public: // overridden from Writer + /** \brief Serialize a Value in JSON format. + * \param root Value to serialize. + * \return String containing the JSON document that represents the root value. + */ + String write(const Value& root) override; + +private: + void writeValue(const Value& value); + void writeArrayValue(const Value& value); + bool isMultilineArray(const Value& value); + void pushValue(const String& value); + void writeIndent(); + void writeWithIndent(const String& value); + void indent(); + void unindent(); + void writeCommentBeforeValue(const Value& root); + void writeCommentAfterValueOnSameLine(const Value& root); + static bool hasCommentForValue(const Value& value); + static String normalizeEOL(const String& text); + + typedef std::vector ChildValues; + + ChildValues childValues_; + String document_; + String indentString_; + unsigned int rightMargin_{74}; + unsigned int indentSize_{3}; + bool addChildValues_{false}; +}; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + +/** \brief Writes a Value in JSON format in a + human friendly way, + to a stream rather than to a string. + * + * The rules for line break and indent are as follow: + * - Object value: + * - if empty then print {} without indent and line break + * - if not empty the print '{', line break & indent, print one value per + line + * and then unindent and line break and print '}'. + * - Array value: + * - if empty then print [] without indent and line break + * - if the array contains no object value, empty array or some other value + types, + * and all the values fit on one lines, then print the array on a single + line. + * - otherwise, it the values do not fit on one line, or the array contains + * object or non empty array, then print one value per line. + * + * If the Value have comments then they are outputed according to their + #CommentPlacement. + * + * \sa Reader, Value, Value::setComment() + * \deprecated Use StreamWriterBuilder. + */ +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable : 4996) // Deriving from deprecated class +#endif +class JSONCPP_DEPRECATED("Use StreamWriterBuilder instead") JSON_API + StyledStreamWriter { +public: + /** + * \param indentation Each level will be indented by this amount extra. + */ + StyledStreamWriter(String indentation = "\t"); + ~StyledStreamWriter() = default; + +public: + /** \brief Serialize a Value in JSON format. + * \param out Stream to write to. (Can be ostringstream, e.g.) + * \param root Value to serialize. + * \note There is no point in deriving from Writer, since write() should not + * return a value. + */ + void write(OStream& out, const Value& root); + +private: + void writeValue(const Value& value); + void writeArrayValue(const Value& value); + bool isMultilineArray(const Value& value); + void pushValue(const String& value); + void writeIndent(); + void writeWithIndent(const String& value); + void indent(); + void unindent(); + void writeCommentBeforeValue(const Value& root); + void writeCommentAfterValueOnSameLine(const Value& root); + static bool hasCommentForValue(const Value& value); + static String normalizeEOL(const String& text); + + typedef std::vector ChildValues; + + ChildValues childValues_; + OStream* document_; + String indentString_; + unsigned int rightMargin_{74}; + String indentation_; + bool addChildValues_ : 1; + bool indented_ : 1; +}; +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + +#if defined(JSON_HAS_INT64) +String JSON_API valueToString(Int value); +String JSON_API valueToString(UInt value); +#endif // if defined(JSON_HAS_INT64) +String JSON_API valueToString(LargestInt value); +String JSON_API valueToString(LargestUInt value); +String JSON_API +valueToString(double value, + unsigned int precision = Value::defaultRealPrecision, + PrecisionType precisionType = PrecisionType::significantDigits); +String JSON_API valueToString(bool value); +String JSON_API valueToQuotedString(const char* value); + +/// \brief Output using the StyledStreamWriter. +/// \see Json::operator>>() +JSON_API OStream& operator<<(OStream&, const Value& root); + +} // namespace Json + +#pragma pack(pop) + +#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) +#pragma warning(pop) +#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) + +#endif // JSON_WRITER_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/writer.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: include/json/assertions.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED +#define CPPTL_JSON_ASSERTIONS_H_INCLUDED + +#include +#include + +#if !defined(JSON_IS_AMALGAMATION) +#include "config.h" +#endif // if !defined(JSON_IS_AMALGAMATION) + +/** It should not be possible for a maliciously designed file to + * cause an abort() or seg-fault, so these macros are used only + * for pre-condition violations and internal logic errors. + */ +#if JSON_USE_EXCEPTION + +// @todo <= add detail about condition in exception +#define JSON_ASSERT(condition) \ + { \ + if (!(condition)) { \ + Json::throwLogicError("assert json failed"); \ + } \ + } + +#define JSON_FAIL_MESSAGE(message) \ + { \ + OStringStream oss; \ + oss << message; \ + Json::throwLogicError(oss.str()); \ + abort(); \ + } + +#else // JSON_USE_EXCEPTION + +#define JSON_ASSERT(condition) assert(condition) + +// The call to assert() will show the failure message in debug builds. In +// release builds we abort, for a core-dump or debugger. +#define JSON_FAIL_MESSAGE(message) \ + { \ + OStringStream oss; \ + oss << message; \ + assert(false && oss.str().c_str()); \ + abort(); \ + } + +#endif + +#define JSON_ASSERT_MESSAGE(condition, message) \ + if (!(condition)) { \ + JSON_FAIL_MESSAGE(message); \ + } + +#endif // CPPTL_JSON_ASSERTIONS_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: include/json/assertions.h +// ////////////////////////////////////////////////////////////////////// + + + + + +#endif //ifndef JSON_AMALGAMATED_H_INCLUDED diff --git a/launchers/win32/libs/jsoncpp.cpp b/launchers/win32/libs/jsoncpp.cpp new file mode 100644 index 0000000000..1089816159 --- /dev/null +++ b/launchers/win32/libs/jsoncpp.cpp @@ -0,0 +1,5407 @@ +#include "stdafx.h" +/// Json-cpp amalgamated source (http://jsoncpp.sourceforge.net/). +/// It is intended to be used with #include "json/json.h" + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + +/* +The JsonCpp library's source code, including accompanying documentation, +tests and demonstration applications, are licensed under the following +conditions... + +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all +jurisdictions which recognize such a disclaimer. In such jurisdictions, +this software is released into the Public Domain. + +In jurisdictions which do not recognize Public Domain property (e.g. Germany as of +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +The JsonCpp Authors, and is released under the terms of the MIT License (see below). + +In jurisdictions which recognize Public Domain property, the user of this +software may choose to accept it either as 1) Public Domain, 2) under the +conditions of the MIT License (see below), or 3) under the terms of dual +Public Domain/MIT License conditions described here, as they choose. + +The MIT License is about as close to Public Domain as a license can get, and is +described in clear, concise terms at: + + http://en.wikipedia.org/wiki/MIT_License + +The full text of the MIT License follows: + +======================================================================== +Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +======================================================================== +(END LICENSE TEXT) + +The MIT license is compatible with both the GPL and commercial +software, affording one all of the rights of Public Domain with the +minor nuisance of being required to keep the above copyright notice +and license text in the source code. Note also that by accepting the +Public Domain "license" you can re-license your copy using whatever +license you like. + +*/ + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: LICENSE +// ////////////////////////////////////////////////////////////////////// + + + + + + +#include "json/json.h" + +#ifndef JSON_IS_AMALGAMATION +#error "Compile with -I PATH_TO_JSON_DIRECTORY" +#endif + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: src/lib_json/json_tool.h +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED +#define LIB_JSONCPP_JSON_TOOL_H_INCLUDED + +#if !defined(JSON_IS_AMALGAMATION) +#include +#endif + +// Also support old flag NO_LOCALE_SUPPORT +#ifdef NO_LOCALE_SUPPORT +#define JSONCPP_NO_LOCALE_SUPPORT +#endif + +#ifndef JSONCPP_NO_LOCALE_SUPPORT +#include +#endif + +/* This header provides common string manipulation support, such as UTF-8, + * portable conversion from/to string... + * + * It is an internal header that must not be exposed. + */ + +namespace Json { +static inline char getDecimalPoint() { +#ifdef JSONCPP_NO_LOCALE_SUPPORT + return '\0'; +#else + struct lconv* lc = localeconv(); + return lc ? *(lc->decimal_point) : '\0'; +#endif +} + +/// Converts a unicode code-point to UTF-8. +static inline String codePointToUTF8(unsigned int cp) { + String result; + + // based on description from http://en.wikipedia.org/wiki/UTF-8 + + if (cp <= 0x7f) { + result.resize(1); + result[0] = static_cast(cp); + } else if (cp <= 0x7FF) { + result.resize(2); + result[1] = static_cast(0x80 | (0x3f & cp)); + result[0] = static_cast(0xC0 | (0x1f & (cp >> 6))); + } else if (cp <= 0xFFFF) { + result.resize(3); + result[2] = static_cast(0x80 | (0x3f & cp)); + result[1] = static_cast(0x80 | (0x3f & (cp >> 6))); + result[0] = static_cast(0xE0 | (0xf & (cp >> 12))); + } else if (cp <= 0x10FFFF) { + result.resize(4); + result[3] = static_cast(0x80 | (0x3f & cp)); + result[2] = static_cast(0x80 | (0x3f & (cp >> 6))); + result[1] = static_cast(0x80 | (0x3f & (cp >> 12))); + result[0] = static_cast(0xF0 | (0x7 & (cp >> 18))); + } + + return result; +} + +enum { + /// Constant that specify the size of the buffer that must be passed to + /// uintToString. + uintToStringBufferSize = 3 * sizeof(LargestUInt) + 1 +}; + +// Defines a char buffer for use with uintToString(). +typedef char UIntToStringBuffer[uintToStringBufferSize]; + +/** Converts an unsigned integer to string. + * @param value Unsigned integer to convert to string + * @param current Input/Output string buffer. + * Must have at least uintToStringBufferSize chars free. + */ +static inline void uintToString(LargestUInt value, char*& current) { + *--current = 0; + do { + *--current = static_cast(value % 10U + static_cast('0')); + value /= 10; + } while (value != 0); +} + +/** Change ',' to '.' everywhere in buffer. + * + * We had a sophisticated way, but it did not work in WinCE. + * @see https://github.com/open-source-parsers/jsoncpp/pull/9 + */ +template Iter fixNumericLocale(Iter begin, Iter end) { + for (; begin != end; ++begin) { + if (*begin == ',') { + *begin = '.'; + } + } + return begin; +} + +template void fixNumericLocaleInput(Iter begin, Iter end) { + char decimalPoint = getDecimalPoint(); + if (decimalPoint == '\0' || decimalPoint == '.') { + return; + } + for (; begin != end; ++begin) { + if (*begin == '.') { + *begin = decimalPoint; + } + } +} + +/** + * Return iterator that would be the new end of the range [begin,end), if we + * were to delete zeros in the end of string, but not the last zero before '.'. + */ +template Iter fixZerosInTheEnd(Iter begin, Iter end) { + for (; begin != end; --end) { + if (*(end - 1) != '0') { + return end; + } + // Don't delete the last zero before the decimal point. + if (begin != (end - 1) && *(end - 2) == '.') { + return end; + } + } + return end; +} + +} // namespace Json + +#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: src/lib_json/json_tool.h +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: src/lib_json/json_reader.cpp +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2011 Baptiste Lepilleur and The JsonCpp Authors +// Copyright (C) 2016 InfoTeCS JSC. All rights reserved. +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#if !defined(JSON_IS_AMALGAMATION) +#include "json_tool.h" +#include +#include +#include +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#if __cplusplus >= 201103L + +#if !defined(sscanf) +#define sscanf std::sscanf +#endif + +#endif //__cplusplus + +#if defined(_MSC_VER) +#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) +#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 +#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES +#endif //_MSC_VER + +#if defined(_MSC_VER) +// Disable warning about strdup being deprecated. +#pragma warning(disable : 4996) +#endif + +// Define JSONCPP_DEPRECATED_STACK_LIMIT as an appropriate integer at compile +// time to change the stack limit +#if !defined(JSONCPP_DEPRECATED_STACK_LIMIT) +#define JSONCPP_DEPRECATED_STACK_LIMIT 1000 +#endif + +static size_t const stackLimit_g = + JSONCPP_DEPRECATED_STACK_LIMIT; // see readValue() + +namespace Json { + +#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520) +typedef std::unique_ptr CharReaderPtr; +#else +typedef std::auto_ptr CharReaderPtr; +#endif + +// Implementation of class Features +// //////////////////////////////// + +Features::Features() = default; + +Features Features::all() { return {}; } + +Features Features::strictMode() { + Features features; + features.allowComments_ = false; + features.strictRoot_ = true; + features.allowDroppedNullPlaceholders_ = false; + features.allowNumericKeys_ = false; + return features; +} + +// Implementation of class Reader +// //////////////////////////////// + +bool Reader::containsNewLine(Reader::Location begin, Reader::Location end) { + for (; begin < end; ++begin) + if (*begin == '\n' || *begin == '\r') + return true; + return false; +} + +// Class Reader +// ////////////////////////////////////////////////////////////////// + +Reader::Reader() + : errors_(), document_(), commentsBefore_(), features_(Features::all()) {} + +Reader::Reader(const Features& features) + : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(), + lastValue_(), commentsBefore_(), features_(features), collectComments_() { +} + +bool Reader::parse(const std::string& document, + Value& root, + bool collectComments) { + document_.assign(document.begin(), document.end()); + const char* begin = document_.c_str(); + const char* end = begin + document_.length(); + return parse(begin, end, root, collectComments); +} + +bool Reader::parse(std::istream& is, Value& root, bool collectComments) { + // std::istream_iterator begin(is); + // std::istream_iterator end; + // Those would allow streamed input from a file, if parse() were a + // template function. + + // Since String is reference-counted, this at least does not + // create an extra copy. + String doc; + std::getline(is, doc, (char)EOF); + return parse(doc.data(), doc.data() + doc.size(), root, collectComments); +} + +bool Reader::parse(const char* beginDoc, + const char* endDoc, + Value& root, + bool collectComments) { + if (!features_.allowComments_) { + collectComments = false; + } + + begin_ = beginDoc; + end_ = endDoc; + collectComments_ = collectComments; + current_ = begin_; + lastValueEnd_ = nullptr; + lastValue_ = nullptr; + commentsBefore_.clear(); + errors_.clear(); + while (!nodes_.empty()) + nodes_.pop(); + nodes_.push(&root); + + bool successful = readValue(); + Token token; + skipCommentTokens(token); + if (collectComments_ && !commentsBefore_.empty()) + root.setComment(commentsBefore_, commentAfter); + if (features_.strictRoot_) { + if (!root.isArray() && !root.isObject()) { + // Set error location to start of doc, ideally should be first token found + // in doc + token.type_ = tokenError; + token.start_ = beginDoc; + token.end_ = endDoc; + addError( + "A valid JSON document must be either an array or an object value.", + token); + return false; + } + } + return successful; +} + +bool Reader::readValue() { + // readValue() may call itself only if it calls readObject() or ReadArray(). + // These methods execute nodes_.push() just before and nodes_.pop)() just + // after calling readValue(). parse() executes one nodes_.push(), so > instead + // of >=. + if (nodes_.size() > stackLimit_g) + throwRuntimeError("Exceeded stackLimit in readValue()."); + + Token token; + skipCommentTokens(token); + bool successful = true; + + if (collectComments_ && !commentsBefore_.empty()) { + currentValue().setComment(commentsBefore_, commentBefore); + commentsBefore_.clear(); + } + + switch (token.type_) { + case tokenObjectBegin: + successful = readObject(token); + currentValue().setOffsetLimit(current_ - begin_); + break; + case tokenArrayBegin: + successful = readArray(token); + currentValue().setOffsetLimit(current_ - begin_); + break; + case tokenNumber: + successful = decodeNumber(token); + break; + case tokenString: + successful = decodeString(token); + break; + case tokenTrue: { + Value v(true); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenFalse: { + Value v(false); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenNull: { + Value v; + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenArraySeparator: + case tokenObjectEnd: + case tokenArrayEnd: + if (features_.allowDroppedNullPlaceholders_) { + // "Un-read" the current token and mark the current value as a null + // token. + current_--; + Value v; + currentValue().swapPayload(v); + currentValue().setOffsetStart(current_ - begin_ - 1); + currentValue().setOffsetLimit(current_ - begin_); + break; + } // Else, fall through... + default: + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return addError("Syntax error: value, object or array expected.", token); + } + + if (collectComments_) { + lastValueEnd_ = current_; + lastValue_ = ¤tValue(); + } + + return successful; +} + +void Reader::skipCommentTokens(Token& token) { + if (features_.allowComments_) { + do { + readToken(token); + } while (token.type_ == tokenComment); + } else { + readToken(token); + } +} + +bool Reader::readToken(Token& token) { + skipSpaces(); + token.start_ = current_; + Char c = getNextChar(); + bool ok = true; + switch (c) { + case '{': + token.type_ = tokenObjectBegin; + break; + case '}': + token.type_ = tokenObjectEnd; + break; + case '[': + token.type_ = tokenArrayBegin; + break; + case ']': + token.type_ = tokenArrayEnd; + break; + case '"': + token.type_ = tokenString; + ok = readString(); + break; + case '/': + token.type_ = tokenComment; + ok = readComment(); + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + token.type_ = tokenNumber; + readNumber(); + break; + case 't': + token.type_ = tokenTrue; + ok = match("rue", 3); + break; + case 'f': + token.type_ = tokenFalse; + ok = match("alse", 4); + break; + case 'n': + token.type_ = tokenNull; + ok = match("ull", 3); + break; + case ',': + token.type_ = tokenArraySeparator; + break; + case ':': + token.type_ = tokenMemberSeparator; + break; + case 0: + token.type_ = tokenEndOfStream; + break; + default: + ok = false; + break; + } + if (!ok) + token.type_ = tokenError; + token.end_ = current_; + return true; +} + +void Reader::skipSpaces() { + while (current_ != end_) { + Char c = *current_; + if (c == ' ' || c == '\t' || c == '\r' || c == '\n') + ++current_; + else + break; + } +} + +bool Reader::match(Location pattern, int patternLength) { + if (end_ - current_ < patternLength) + return false; + int index = patternLength; + while (index--) + if (current_[index] != pattern[index]) + return false; + current_ += patternLength; + return true; +} + +bool Reader::readComment() { + Location commentBegin = current_ - 1; + Char c = getNextChar(); + bool successful = false; + if (c == '*') + successful = readCStyleComment(); + else if (c == '/') + successful = readCppStyleComment(); + if (!successful) + return false; + + if (collectComments_) { + CommentPlacement placement = commentBefore; + if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) { + if (c != '*' || !containsNewLine(commentBegin, current_)) + placement = commentAfterOnSameLine; + } + + addComment(commentBegin, current_, placement); + } + return true; +} + +String Reader::normalizeEOL(Reader::Location begin, Reader::Location end) { + String normalized; + normalized.reserve(static_cast(end - begin)); + Reader::Location current = begin; + while (current != end) { + char c = *current++; + if (c == '\r') { + if (current != end && *current == '\n') + // convert dos EOL + ++current; + // convert Mac EOL + normalized += '\n'; + } else { + normalized += c; + } + } + return normalized; +} + +void Reader::addComment(Location begin, + Location end, + CommentPlacement placement) { + assert(collectComments_); + const String& normalized = normalizeEOL(begin, end); + if (placement == commentAfterOnSameLine) { + assert(lastValue_ != nullptr); + lastValue_->setComment(normalized, placement); + } else { + commentsBefore_ += normalized; + } +} + +bool Reader::readCStyleComment() { + while ((current_ + 1) < end_) { + Char c = getNextChar(); + if (c == '*' && *current_ == '/') + break; + } + return getNextChar() == '/'; +} + +bool Reader::readCppStyleComment() { + while (current_ != end_) { + Char c = getNextChar(); + if (c == '\n') + break; + if (c == '\r') { + // Consume DOS EOL. It will be normalized in addComment. + if (current_ != end_ && *current_ == '\n') + getNextChar(); + // Break on Moc OS 9 EOL. + break; + } + } + return true; +} + +void Reader::readNumber() { + const char* p = current_; + char c = '0'; // stopgap for already consumed character + // integral part + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + // fractional part + if (c == '.') { + c = (current_ = p) < end_ ? *p++ : '\0'; + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + } + // exponential part + if (c == 'e' || c == 'E') { + c = (current_ = p) < end_ ? *p++ : '\0'; + if (c == '+' || c == '-') + c = (current_ = p) < end_ ? *p++ : '\0'; + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + } +} + +bool Reader::readString() { + Char c = '\0'; + while (current_ != end_) { + c = getNextChar(); + if (c == '\\') + getNextChar(); + else if (c == '"') + break; + } + return c == '"'; +} + +bool Reader::readObject(Token& token) { + Token tokenName; + String name; + Value init(objectValue); + currentValue().swapPayload(init); + currentValue().setOffsetStart(token.start_ - begin_); + while (readToken(tokenName)) { + bool initialTokenOk = true; + while (tokenName.type_ == tokenComment && initialTokenOk) + initialTokenOk = readToken(tokenName); + if (!initialTokenOk) + break; + if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object + return true; + name.clear(); + if (tokenName.type_ == tokenString) { + if (!decodeString(tokenName, name)) + return recoverFromError(tokenObjectEnd); + } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) { + Value numberName; + if (!decodeNumber(tokenName, numberName)) + return recoverFromError(tokenObjectEnd); + name = String(numberName.asCString()); + } else { + break; + } + + Token colon; + if (!readToken(colon) || colon.type_ != tokenMemberSeparator) { + return addErrorAndRecover("Missing ':' after object member name", colon, + tokenObjectEnd); + } + Value& value = currentValue()[name]; + nodes_.push(&value); + bool ok = readValue(); + nodes_.pop(); + if (!ok) // error already set + return recoverFromError(tokenObjectEnd); + + Token comma; + if (!readToken(comma) || + (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator && + comma.type_ != tokenComment)) { + return addErrorAndRecover("Missing ',' or '}' in object declaration", + comma, tokenObjectEnd); + } + bool finalizeTokenOk = true; + while (comma.type_ == tokenComment && finalizeTokenOk) + finalizeTokenOk = readToken(comma); + if (comma.type_ == tokenObjectEnd) + return true; + } + return addErrorAndRecover("Missing '}' or object member name", tokenName, + tokenObjectEnd); +} + +bool Reader::readArray(Token& token) { + Value init(arrayValue); + currentValue().swapPayload(init); + currentValue().setOffsetStart(token.start_ - begin_); + skipSpaces(); + if (current_ != end_ && *current_ == ']') // empty array + { + Token endArray; + readToken(endArray); + return true; + } + int index = 0; + for (;;) { + Value& value = currentValue()[index++]; + nodes_.push(&value); + bool ok = readValue(); + nodes_.pop(); + if (!ok) // error already set + return recoverFromError(tokenArrayEnd); + + Token currentToken; + // Accept Comment after last item in the array. + ok = readToken(currentToken); + while (currentToken.type_ == tokenComment && ok) { + ok = readToken(currentToken); + } + bool badTokenType = (currentToken.type_ != tokenArraySeparator && + currentToken.type_ != tokenArrayEnd); + if (!ok || badTokenType) { + return addErrorAndRecover("Missing ',' or ']' in array declaration", + currentToken, tokenArrayEnd); + } + if (currentToken.type_ == tokenArrayEnd) + break; + } + return true; +} + +bool Reader::decodeNumber(Token& token) { + Value decoded; + if (!decodeNumber(token, decoded)) + return false; + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool Reader::decodeNumber(Token& token, Value& decoded) { + // Attempts to parse the number as an integer. If the number is + // larger than the maximum supported value of an integer then + // we decode the number as a double. + Location current = token.start_; + bool isNegative = *current == '-'; + if (isNegative) + ++current; + // TODO: Help the compiler do the div and mod at compile time or get rid of + // them. + Value::LargestUInt maxIntegerValue = + isNegative ? Value::LargestUInt(Value::maxLargestInt) + 1 + : Value::maxLargestUInt; + Value::LargestUInt threshold = maxIntegerValue / 10; + Value::LargestUInt value = 0; + while (current < token.end_) { + Char c = *current++; + if (c < '0' || c > '9') + return decodeDouble(token, decoded); + auto digit(static_cast(c - '0')); + if (value >= threshold) { + // We've hit or exceeded the max value divided by 10 (rounded down). If + // a) we've only just touched the limit, b) this is the last digit, and + // c) it's small enough to fit in that rounding delta, we're okay. + // Otherwise treat this number as a double to avoid overflow. + if (value > threshold || current != token.end_ || + digit > maxIntegerValue % 10) { + return decodeDouble(token, decoded); + } + } + value = value * 10 + digit; + } + if (isNegative && value == maxIntegerValue) + decoded = Value::minLargestInt; + else if (isNegative) + decoded = -Value::LargestInt(value); + else if (value <= Value::LargestUInt(Value::maxInt)) + decoded = Value::LargestInt(value); + else + decoded = value; + return true; +} + +bool Reader::decodeDouble(Token& token) { + Value decoded; + if (!decodeDouble(token, decoded)) + return false; + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool Reader::decodeDouble(Token& token, Value& decoded) { + double value = 0; + String buffer(token.start_, token.end_); + IStringStream is(buffer); + if (!(is >> value)) + return addError( + "'" + String(token.start_, token.end_) + "' is not a number.", token); + decoded = value; + return true; +} + +bool Reader::decodeString(Token& token) { + String decoded_string; + if (!decodeString(token, decoded_string)) + return false; + Value decoded(decoded_string); + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool Reader::decodeString(Token& token, String& decoded) { + decoded.reserve(static_cast(token.end_ - token.start_ - 2)); + Location current = token.start_ + 1; // skip '"' + Location end = token.end_ - 1; // do not include '"' + while (current != end) { + Char c = *current++; + if (c == '"') + break; + else if (c == '\\') { + if (current == end) + return addError("Empty escape sequence in string", token, current); + Char escape = *current++; + switch (escape) { + case '"': + decoded += '"'; + break; + case '/': + decoded += '/'; + break; + case '\\': + decoded += '\\'; + break; + case 'b': + decoded += '\b'; + break; + case 'f': + decoded += '\f'; + break; + case 'n': + decoded += '\n'; + break; + case 'r': + decoded += '\r'; + break; + case 't': + decoded += '\t'; + break; + case 'u': { + unsigned int unicode; + if (!decodeUnicodeCodePoint(token, current, end, unicode)) + return false; + decoded += codePointToUTF8(unicode); + } break; + default: + return addError("Bad escape sequence in string", token, current); + } + } else { + decoded += c; + } + } + return true; +} + +bool Reader::decodeUnicodeCodePoint(Token& token, + Location& current, + Location end, + unsigned int& unicode) { + + if (!decodeUnicodeEscapeSequence(token, current, end, unicode)) + return false; + if (unicode >= 0xD800 && unicode <= 0xDBFF) { + // surrogate pairs + if (end - current < 6) + return addError( + "additional six characters expected to parse unicode surrogate pair.", + token, current); + if (*(current++) == '\\' && *(current++) == 'u') { + unsigned int surrogatePair; + if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) { + unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF); + } else + return false; + } else + return addError("expecting another \\u token to begin the second half of " + "a unicode surrogate pair", + token, current); + } + return true; +} + +bool Reader::decodeUnicodeEscapeSequence(Token& token, + Location& current, + Location end, + unsigned int& ret_unicode) { + if (end - current < 4) + return addError( + "Bad unicode escape sequence in string: four digits expected.", token, + current); + int unicode = 0; + for (int index = 0; index < 4; ++index) { + Char c = *current++; + unicode *= 16; + if (c >= '0' && c <= '9') + unicode += c - '0'; + else if (c >= 'a' && c <= 'f') + unicode += c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + unicode += c - 'A' + 10; + else + return addError( + "Bad unicode escape sequence in string: hexadecimal digit expected.", + token, current); + } + ret_unicode = static_cast(unicode); + return true; +} + +bool Reader::addError(const String& message, Token& token, Location extra) { + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = extra; + errors_.push_back(info); + return false; +} + +bool Reader::recoverFromError(TokenType skipUntilToken) { + size_t const errorCount = errors_.size(); + Token skip; + for (;;) { + if (!readToken(skip)) + errors_.resize(errorCount); // discard errors caused by recovery + if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream) + break; + } + errors_.resize(errorCount); + return false; +} + +bool Reader::addErrorAndRecover(const String& message, + Token& token, + TokenType skipUntilToken) { + addError(message, token); + return recoverFromError(skipUntilToken); +} + +Value& Reader::currentValue() { return *(nodes_.top()); } + +Reader::Char Reader::getNextChar() { + if (current_ == end_) + return 0; + return *current_++; +} + +void Reader::getLocationLineAndColumn(Location location, + int& line, + int& column) const { + Location current = begin_; + Location lastLineStart = current; + line = 0; + while (current < location && current != end_) { + Char c = *current++; + if (c == '\r') { + if (*current == '\n') + ++current; + lastLineStart = current; + ++line; + } else if (c == '\n') { + lastLineStart = current; + ++line; + } + } + // column & line start at 1 + column = int(location - lastLineStart) + 1; + ++line; +} + +String Reader::getLocationLineAndColumn(Location location) const { + int line, column; + getLocationLineAndColumn(location, line, column); + char buffer[18 + 16 + 16 + 1]; + jsoncpp_snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column); + return buffer; +} + +// Deprecated. Preserved for backward compatibility +String Reader::getFormatedErrorMessages() const { + return getFormattedErrorMessages(); +} + +String Reader::getFormattedErrorMessages() const { + String formattedMessage; + for (const auto& error : errors_) { + formattedMessage += + "* " + getLocationLineAndColumn(error.token_.start_) + "\n"; + formattedMessage += " " + error.message_ + "\n"; + if (error.extra_) + formattedMessage += + "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n"; + } + return formattedMessage; +} + +std::vector Reader::getStructuredErrors() const { + std::vector allErrors; + for (const auto& error : errors_) { + Reader::StructuredError structured; + structured.offset_start = error.token_.start_ - begin_; + structured.offset_limit = error.token_.end_ - begin_; + structured.message = error.message_; + allErrors.push_back(structured); + } + return allErrors; +} + +bool Reader::pushError(const Value& value, const String& message) { + ptrdiff_t const length = end_ - begin_; + if (value.getOffsetStart() > length || value.getOffsetLimit() > length) + return false; + Token token; + token.type_ = tokenError; + token.start_ = begin_ + value.getOffsetStart(); + token.end_ = end_ + value.getOffsetLimit(); + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = nullptr; + errors_.push_back(info); + return true; +} + +bool Reader::pushError(const Value& value, + const String& message, + const Value& extra) { + ptrdiff_t const length = end_ - begin_; + if (value.getOffsetStart() > length || value.getOffsetLimit() > length || + extra.getOffsetLimit() > length) + return false; + Token token; + token.type_ = tokenError; + token.start_ = begin_ + value.getOffsetStart(); + token.end_ = begin_ + value.getOffsetLimit(); + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = begin_ + extra.getOffsetStart(); + errors_.push_back(info); + return true; +} + +bool Reader::good() const { return errors_.empty(); } + +// exact copy of Features +class OurFeatures { +public: + static OurFeatures all(); + bool allowComments_; + bool strictRoot_; + bool allowDroppedNullPlaceholders_; + bool allowNumericKeys_; + bool allowSingleQuotes_; + bool failIfExtra_; + bool rejectDupKeys_; + bool allowSpecialFloats_; + size_t stackLimit_; +}; // OurFeatures + +// exact copy of Implementation of class Features +// //////////////////////////////// + +OurFeatures OurFeatures::all() { return {}; } + +// Implementation of class Reader +// //////////////////////////////// + +// exact copy of Reader, renamed to OurReader +class OurReader { +public: + typedef char Char; + typedef const Char* Location; + struct StructuredError { + ptrdiff_t offset_start; + ptrdiff_t offset_limit; + String message; + }; + + OurReader(OurFeatures const& features); + bool parse(const char* beginDoc, + const char* endDoc, + Value& root, + bool collectComments = true); + String getFormattedErrorMessages() const; + std::vector getStructuredErrors() const; + bool pushError(const Value& value, const String& message); + bool pushError(const Value& value, const String& message, const Value& extra); + bool good() const; + +private: + OurReader(OurReader const&); // no impl + void operator=(OurReader const&); // no impl + + enum TokenType { + tokenEndOfStream = 0, + tokenObjectBegin, + tokenObjectEnd, + tokenArrayBegin, + tokenArrayEnd, + tokenString, + tokenNumber, + tokenTrue, + tokenFalse, + tokenNull, + tokenNaN, + tokenPosInf, + tokenNegInf, + tokenArraySeparator, + tokenMemberSeparator, + tokenComment, + tokenError + }; + + class Token { + public: + TokenType type_; + Location start_; + Location end_; + }; + + class ErrorInfo { + public: + Token token_; + String message_; + Location extra_; + }; + + typedef std::deque Errors; + + bool readToken(Token& token); + void skipSpaces(); + bool match(Location pattern, int patternLength); + bool readComment(); + bool readCStyleComment(); + bool readCppStyleComment(); + bool readString(); + bool readStringSingleQuote(); + bool readNumber(bool checkInf); + bool readValue(); + bool readObject(Token& token); + bool readArray(Token& token); + bool decodeNumber(Token& token); + bool decodeNumber(Token& token, Value& decoded); + bool decodeString(Token& token); + bool decodeString(Token& token, String& decoded); + bool decodeDouble(Token& token); + bool decodeDouble(Token& token, Value& decoded); + bool decodeUnicodeCodePoint(Token& token, + Location& current, + Location end, + unsigned int& unicode); + bool decodeUnicodeEscapeSequence(Token& token, + Location& current, + Location end, + unsigned int& unicode); + bool addError(const String& message, Token& token, Location extra = nullptr); + bool recoverFromError(TokenType skipUntilToken); + bool addErrorAndRecover(const String& message, + Token& token, + TokenType skipUntilToken); + void skipUntilSpace(); + Value& currentValue(); + Char getNextChar(); + void + getLocationLineAndColumn(Location location, int& line, int& column) const; + String getLocationLineAndColumn(Location location) const; + void addComment(Location begin, Location end, CommentPlacement placement); + void skipCommentTokens(Token& token); + + static String normalizeEOL(Location begin, Location end); + static bool containsNewLine(Location begin, Location end); + + typedef std::stack Nodes; + Nodes nodes_; + Errors errors_; + String document_; + Location begin_; + Location end_; + Location current_; + Location lastValueEnd_; + Value* lastValue_; + String commentsBefore_; + + OurFeatures const features_; + bool collectComments_; +}; // OurReader + +// complete copy of Read impl, for OurReader + +bool OurReader::containsNewLine(OurReader::Location begin, + OurReader::Location end) { + for (; begin < end; ++begin) + if (*begin == '\n' || *begin == '\r') + return true; + return false; +} + +OurReader::OurReader(OurFeatures const& features) + : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(), + lastValue_(), commentsBefore_(), features_(features), collectComments_() { +} + +bool OurReader::parse(const char* beginDoc, + const char* endDoc, + Value& root, + bool collectComments) { + if (!features_.allowComments_) { + collectComments = false; + } + + begin_ = beginDoc; + end_ = endDoc; + collectComments_ = collectComments; + current_ = begin_; + lastValueEnd_ = nullptr; + lastValue_ = nullptr; + commentsBefore_.clear(); + errors_.clear(); + while (!nodes_.empty()) + nodes_.pop(); + nodes_.push(&root); + + bool successful = readValue(); + Token token; + skipCommentTokens(token); + if (features_.failIfExtra_) { + if ((features_.strictRoot_ || token.type_ != tokenError) && + token.type_ != tokenEndOfStream) { + addError("Extra non-whitespace after JSON value.", token); + return false; + } + } + if (collectComments_ && !commentsBefore_.empty()) + root.setComment(commentsBefore_, commentAfter); + if (features_.strictRoot_) { + if (!root.isArray() && !root.isObject()) { + // Set error location to start of doc, ideally should be first token found + // in doc + token.type_ = tokenError; + token.start_ = beginDoc; + token.end_ = endDoc; + addError( + "A valid JSON document must be either an array or an object value.", + token); + return false; + } + } + return successful; +} + +bool OurReader::readValue() { + // To preserve the old behaviour we cast size_t to int. + if (nodes_.size() > features_.stackLimit_) + throwRuntimeError("Exceeded stackLimit in readValue()."); + Token token; + skipCommentTokens(token); + bool successful = true; + + if (collectComments_ && !commentsBefore_.empty()) { + currentValue().setComment(commentsBefore_, commentBefore); + commentsBefore_.clear(); + } + + switch (token.type_) { + case tokenObjectBegin: + successful = readObject(token); + currentValue().setOffsetLimit(current_ - begin_); + break; + case tokenArrayBegin: + successful = readArray(token); + currentValue().setOffsetLimit(current_ - begin_); + break; + case tokenNumber: + successful = decodeNumber(token); + break; + case tokenString: + successful = decodeString(token); + break; + case tokenTrue: { + Value v(true); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenFalse: { + Value v(false); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenNull: { + Value v; + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenNaN: { + Value v(std::numeric_limits::quiet_NaN()); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenPosInf: { + Value v(std::numeric_limits::infinity()); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenNegInf: { + Value v(-std::numeric_limits::infinity()); + currentValue().swapPayload(v); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + } break; + case tokenArraySeparator: + case tokenObjectEnd: + case tokenArrayEnd: + if (features_.allowDroppedNullPlaceholders_) { + // "Un-read" the current token and mark the current value as a null + // token. + current_--; + Value v; + currentValue().swapPayload(v); + currentValue().setOffsetStart(current_ - begin_ - 1); + currentValue().setOffsetLimit(current_ - begin_); + break; + } // else, fall through ... + default: + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return addError("Syntax error: value, object or array expected.", token); + } + + if (collectComments_) { + lastValueEnd_ = current_; + lastValue_ = ¤tValue(); + } + + return successful; +} + +void OurReader::skipCommentTokens(Token& token) { + if (features_.allowComments_) { + do { + readToken(token); + } while (token.type_ == tokenComment); + } else { + readToken(token); + } +} + +bool OurReader::readToken(Token& token) { + skipSpaces(); + token.start_ = current_; + Char c = getNextChar(); + bool ok = true; + switch (c) { + case '{': + token.type_ = tokenObjectBegin; + break; + case '}': + token.type_ = tokenObjectEnd; + break; + case '[': + token.type_ = tokenArrayBegin; + break; + case ']': + token.type_ = tokenArrayEnd; + break; + case '"': + token.type_ = tokenString; + ok = readString(); + break; + case '\'': + if (features_.allowSingleQuotes_) { + token.type_ = tokenString; + ok = readStringSingleQuote(); + break; + } // else fall through + case '/': + token.type_ = tokenComment; + ok = readComment(); + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + token.type_ = tokenNumber; + readNumber(false); + break; + case '-': + if (readNumber(true)) { + token.type_ = tokenNumber; + } else { + token.type_ = tokenNegInf; + ok = features_.allowSpecialFloats_ && match("nfinity", 7); + } + break; + case 't': + token.type_ = tokenTrue; + ok = match("rue", 3); + break; + case 'f': + token.type_ = tokenFalse; + ok = match("alse", 4); + break; + case 'n': + token.type_ = tokenNull; + ok = match("ull", 3); + break; + case 'N': + if (features_.allowSpecialFloats_) { + token.type_ = tokenNaN; + ok = match("aN", 2); + } else { + ok = false; + } + break; + case 'I': + if (features_.allowSpecialFloats_) { + token.type_ = tokenPosInf; + ok = match("nfinity", 7); + } else { + ok = false; + } + break; + case ',': + token.type_ = tokenArraySeparator; + break; + case ':': + token.type_ = tokenMemberSeparator; + break; + case 0: + token.type_ = tokenEndOfStream; + break; + default: + ok = false; + break; + } + if (!ok) + token.type_ = tokenError; + token.end_ = current_; + return true; +} + +void OurReader::skipSpaces() { + while (current_ != end_) { + Char c = *current_; + if (c == ' ' || c == '\t' || c == '\r' || c == '\n') + ++current_; + else + break; + } +} + +bool OurReader::match(Location pattern, int patternLength) { + if (end_ - current_ < patternLength) + return false; + int index = patternLength; + while (index--) + if (current_[index] != pattern[index]) + return false; + current_ += patternLength; + return true; +} + +bool OurReader::readComment() { + Location commentBegin = current_ - 1; + Char c = getNextChar(); + bool successful = false; + if (c == '*') + successful = readCStyleComment(); + else if (c == '/') + successful = readCppStyleComment(); + if (!successful) + return false; + + if (collectComments_) { + CommentPlacement placement = commentBefore; + if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) { + if (c != '*' || !containsNewLine(commentBegin, current_)) + placement = commentAfterOnSameLine; + } + + addComment(commentBegin, current_, placement); + } + return true; +} + +String OurReader::normalizeEOL(OurReader::Location begin, + OurReader::Location end) { + String normalized; + normalized.reserve(static_cast(end - begin)); + OurReader::Location current = begin; + while (current != end) { + char c = *current++; + if (c == '\r') { + if (current != end && *current == '\n') + // convert dos EOL + ++current; + // convert Mac EOL + normalized += '\n'; + } else { + normalized += c; + } + } + return normalized; +} + +void OurReader::addComment(Location begin, + Location end, + CommentPlacement placement) { + assert(collectComments_); + const String& normalized = normalizeEOL(begin, end); + if (placement == commentAfterOnSameLine) { + assert(lastValue_ != nullptr); + lastValue_->setComment(normalized, placement); + } else { + commentsBefore_ += normalized; + } +} + +bool OurReader::readCStyleComment() { + while ((current_ + 1) < end_) { + Char c = getNextChar(); + if (c == '*' && *current_ == '/') + break; + } + return getNextChar() == '/'; +} + +bool OurReader::readCppStyleComment() { + while (current_ != end_) { + Char c = getNextChar(); + if (c == '\n') + break; + if (c == '\r') { + // Consume DOS EOL. It will be normalized in addComment. + if (current_ != end_ && *current_ == '\n') + getNextChar(); + // Break on Moc OS 9 EOL. + break; + } + } + return true; +} + +bool OurReader::readNumber(bool checkInf) { + const char* p = current_; + if (checkInf && p != end_ && *p == 'I') { + current_ = ++p; + return false; + } + char c = '0'; // stopgap for already consumed character + // integral part + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + // fractional part + if (c == '.') { + c = (current_ = p) < end_ ? *p++ : '\0'; + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + } + // exponential part + if (c == 'e' || c == 'E') { + c = (current_ = p) < end_ ? *p++ : '\0'; + if (c == '+' || c == '-') + c = (current_ = p) < end_ ? *p++ : '\0'; + while (c >= '0' && c <= '9') + c = (current_ = p) < end_ ? *p++ : '\0'; + } + return true; +} +bool OurReader::readString() { + Char c = 0; + while (current_ != end_) { + c = getNextChar(); + if (c == '\\') + getNextChar(); + else if (c == '"') + break; + } + return c == '"'; +} + +bool OurReader::readStringSingleQuote() { + Char c = 0; + while (current_ != end_) { + c = getNextChar(); + if (c == '\\') + getNextChar(); + else if (c == '\'') + break; + } + return c == '\''; +} + +bool OurReader::readObject(Token& token) { + Token tokenName; + String name; + Value init(objectValue); + currentValue().swapPayload(init); + currentValue().setOffsetStart(token.start_ - begin_); + while (readToken(tokenName)) { + bool initialTokenOk = true; + while (tokenName.type_ == tokenComment && initialTokenOk) + initialTokenOk = readToken(tokenName); + if (!initialTokenOk) + break; + if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object + return true; + name.clear(); + if (tokenName.type_ == tokenString) { + if (!decodeString(tokenName, name)) + return recoverFromError(tokenObjectEnd); + } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) { + Value numberName; + if (!decodeNumber(tokenName, numberName)) + return recoverFromError(tokenObjectEnd); + name = numberName.asString(); + } else { + break; + } + + Token colon; + if (!readToken(colon) || colon.type_ != tokenMemberSeparator) { + return addErrorAndRecover("Missing ':' after object member name", colon, + tokenObjectEnd); + } + if (name.length() >= (1U << 30)) + throwRuntimeError("keylength >= 2^30"); + if (features_.rejectDupKeys_ && currentValue().isMember(name)) { + String msg = "Duplicate key: '" + name + "'"; + return addErrorAndRecover(msg, tokenName, tokenObjectEnd); + } + Value& value = currentValue()[name]; + nodes_.push(&value); + bool ok = readValue(); + nodes_.pop(); + if (!ok) // error already set + return recoverFromError(tokenObjectEnd); + + Token comma; + if (!readToken(comma) || + (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator && + comma.type_ != tokenComment)) { + return addErrorAndRecover("Missing ',' or '}' in object declaration", + comma, tokenObjectEnd); + } + bool finalizeTokenOk = true; + while (comma.type_ == tokenComment && finalizeTokenOk) + finalizeTokenOk = readToken(comma); + if (comma.type_ == tokenObjectEnd) + return true; + } + return addErrorAndRecover("Missing '}' or object member name", tokenName, + tokenObjectEnd); +} + +bool OurReader::readArray(Token& token) { + Value init(arrayValue); + currentValue().swapPayload(init); + currentValue().setOffsetStart(token.start_ - begin_); + skipSpaces(); + if (current_ != end_ && *current_ == ']') // empty array + { + Token endArray; + readToken(endArray); + return true; + } + int index = 0; + for (;;) { + Value& value = currentValue()[index++]; + nodes_.push(&value); + bool ok = readValue(); + nodes_.pop(); + if (!ok) // error already set + return recoverFromError(tokenArrayEnd); + + Token currentToken; + // Accept Comment after last item in the array. + ok = readToken(currentToken); + while (currentToken.type_ == tokenComment && ok) { + ok = readToken(currentToken); + } + bool badTokenType = (currentToken.type_ != tokenArraySeparator && + currentToken.type_ != tokenArrayEnd); + if (!ok || badTokenType) { + return addErrorAndRecover("Missing ',' or ']' in array declaration", + currentToken, tokenArrayEnd); + } + if (currentToken.type_ == tokenArrayEnd) + break; + } + return true; +} + +bool OurReader::decodeNumber(Token& token) { + Value decoded; + if (!decodeNumber(token, decoded)) + return false; + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool OurReader::decodeNumber(Token& token, Value& decoded) { + // Attempts to parse the number as an integer. If the number is + // larger than the maximum supported value of an integer then + // we decode the number as a double. + Location current = token.start_; + bool isNegative = *current == '-'; + if (isNegative) + ++current; + // TODO: Help the compiler do the div and mod at compile time or get rid of + // them. + Value::LargestUInt maxIntegerValue = + isNegative ? Value::LargestUInt(Value::minLargestInt) + : Value::maxLargestUInt; + Value::LargestUInt threshold = maxIntegerValue / 10; + Value::LargestUInt value = 0; + while (current < token.end_) { + Char c = *current++; + if (c < '0' || c > '9') + return decodeDouble(token, decoded); + auto digit(static_cast(c - '0')); + if (value >= threshold) { + // We've hit or exceeded the max value divided by 10 (rounded down). If + // a) we've only just touched the limit, b) this is the last digit, and + // c) it's small enough to fit in that rounding delta, we're okay. + // Otherwise treat this number as a double to avoid overflow. + if (value > threshold || current != token.end_ || + digit > maxIntegerValue % 10) { + return decodeDouble(token, decoded); + } + } + value = value * 10 + digit; + } + if (isNegative) + decoded = -Value::LargestInt(value); + else if (value <= Value::LargestUInt(Value::maxInt)) + decoded = Value::LargestInt(value); + else + decoded = value; + return true; +} + +bool OurReader::decodeDouble(Token& token) { + Value decoded; + if (!decodeDouble(token, decoded)) + return false; + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool OurReader::decodeDouble(Token& token, Value& decoded) { + double value = 0; + const int bufferSize = 32; + int count; + ptrdiff_t const length = token.end_ - token.start_; + + // Sanity check to avoid buffer overflow exploits. + if (length < 0) { + return addError("Unable to parse token length", token); + } + auto const ulength = static_cast(length); + + // Avoid using a string constant for the format control string given to + // sscanf, as this can cause hard to debug crashes on OS X. See here for more + // info: + // + // http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html + char format[] = "%lf"; + + if (length <= bufferSize) { + Char buffer[bufferSize + 1]; + memcpy(buffer, token.start_, ulength); + buffer[length] = 0; + fixNumericLocaleInput(buffer, buffer + length); + count = sscanf(buffer, format, &value); + } else { + String buffer(token.start_, token.end_); + count = sscanf(buffer.c_str(), format, &value); + } + + if (count != 1) + return addError( + "'" + String(token.start_, token.end_) + "' is not a number.", token); + decoded = value; + return true; +} + +bool OurReader::decodeString(Token& token) { + String decoded_string; + if (!decodeString(token, decoded_string)) + return false; + Value decoded(decoded_string); + currentValue().swapPayload(decoded); + currentValue().setOffsetStart(token.start_ - begin_); + currentValue().setOffsetLimit(token.end_ - begin_); + return true; +} + +bool OurReader::decodeString(Token& token, String& decoded) { + decoded.reserve(static_cast(token.end_ - token.start_ - 2)); + Location current = token.start_ + 1; // skip '"' + Location end = token.end_ - 1; // do not include '"' + while (current != end) { + Char c = *current++; + if (c == '"') + break; + else if (c == '\\') { + if (current == end) + return addError("Empty escape sequence in string", token, current); + Char escape = *current++; + switch (escape) { + case '"': + decoded += '"'; + break; + case '/': + decoded += '/'; + break; + case '\\': + decoded += '\\'; + break; + case 'b': + decoded += '\b'; + break; + case 'f': + decoded += '\f'; + break; + case 'n': + decoded += '\n'; + break; + case 'r': + decoded += '\r'; + break; + case 't': + decoded += '\t'; + break; + case 'u': { + unsigned int unicode; + if (!decodeUnicodeCodePoint(token, current, end, unicode)) + return false; + decoded += codePointToUTF8(unicode); + } break; + default: + return addError("Bad escape sequence in string", token, current); + } + } else { + decoded += c; + } + } + return true; +} + +bool OurReader::decodeUnicodeCodePoint(Token& token, + Location& current, + Location end, + unsigned int& unicode) { + + if (!decodeUnicodeEscapeSequence(token, current, end, unicode)) + return false; + if (unicode >= 0xD800 && unicode <= 0xDBFF) { + // surrogate pairs + if (end - current < 6) + return addError( + "additional six characters expected to parse unicode surrogate pair.", + token, current); + if (*(current++) == '\\' && *(current++) == 'u') { + unsigned int surrogatePair; + if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) { + unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF); + } else + return false; + } else + return addError("expecting another \\u token to begin the second half of " + "a unicode surrogate pair", + token, current); + } + return true; +} + +bool OurReader::decodeUnicodeEscapeSequence(Token& token, + Location& current, + Location end, + unsigned int& ret_unicode) { + if (end - current < 4) + return addError( + "Bad unicode escape sequence in string: four digits expected.", token, + current); + int unicode = 0; + for (int index = 0; index < 4; ++index) { + Char c = *current++; + unicode *= 16; + if (c >= '0' && c <= '9') + unicode += c - '0'; + else if (c >= 'a' && c <= 'f') + unicode += c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + unicode += c - 'A' + 10; + else + return addError( + "Bad unicode escape sequence in string: hexadecimal digit expected.", + token, current); + } + ret_unicode = static_cast(unicode); + return true; +} + +bool OurReader::addError(const String& message, Token& token, Location extra) { + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = extra; + errors_.push_back(info); + return false; +} + +bool OurReader::recoverFromError(TokenType skipUntilToken) { + size_t errorCount = errors_.size(); + Token skip; + for (;;) { + if (!readToken(skip)) + errors_.resize(errorCount); // discard errors caused by recovery + if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream) + break; + } + errors_.resize(errorCount); + return false; +} + +bool OurReader::addErrorAndRecover(const String& message, + Token& token, + TokenType skipUntilToken) { + addError(message, token); + return recoverFromError(skipUntilToken); +} + +Value& OurReader::currentValue() { return *(nodes_.top()); } + +OurReader::Char OurReader::getNextChar() { + if (current_ == end_) + return 0; + return *current_++; +} + +void OurReader::getLocationLineAndColumn(Location location, + int& line, + int& column) const { + Location current = begin_; + Location lastLineStart = current; + line = 0; + while (current < location && current != end_) { + Char c = *current++; + if (c == '\r') { + if (*current == '\n') + ++current; + lastLineStart = current; + ++line; + } else if (c == '\n') { + lastLineStart = current; + ++line; + } + } + // column & line start at 1 + column = int(location - lastLineStart) + 1; + ++line; +} + +String OurReader::getLocationLineAndColumn(Location location) const { + int line, column; + getLocationLineAndColumn(location, line, column); + char buffer[18 + 16 + 16 + 1]; + jsoncpp_snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column); + return buffer; +} + +String OurReader::getFormattedErrorMessages() const { + String formattedMessage; + for (const auto& error : errors_) { + formattedMessage += + "* " + getLocationLineAndColumn(error.token_.start_) + "\n"; + formattedMessage += " " + error.message_ + "\n"; + if (error.extra_) + formattedMessage += + "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n"; + } + return formattedMessage; +} + +std::vector OurReader::getStructuredErrors() const { + std::vector allErrors; + for (const auto& error : errors_) { + OurReader::StructuredError structured; + structured.offset_start = error.token_.start_ - begin_; + structured.offset_limit = error.token_.end_ - begin_; + structured.message = error.message_; + allErrors.push_back(structured); + } + return allErrors; +} + +bool OurReader::pushError(const Value& value, const String& message) { + ptrdiff_t length = end_ - begin_; + if (value.getOffsetStart() > length || value.getOffsetLimit() > length) + return false; + Token token; + token.type_ = tokenError; + token.start_ = begin_ + value.getOffsetStart(); + token.end_ = end_ + value.getOffsetLimit(); + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = nullptr; + errors_.push_back(info); + return true; +} + +bool OurReader::pushError(const Value& value, + const String& message, + const Value& extra) { + ptrdiff_t length = end_ - begin_; + if (value.getOffsetStart() > length || value.getOffsetLimit() > length || + extra.getOffsetLimit() > length) + return false; + Token token; + token.type_ = tokenError; + token.start_ = begin_ + value.getOffsetStart(); + token.end_ = begin_ + value.getOffsetLimit(); + ErrorInfo info; + info.token_ = token; + info.message_ = message; + info.extra_ = begin_ + extra.getOffsetStart(); + errors_.push_back(info); + return true; +} + +bool OurReader::good() const { return errors_.empty(); } + +class OurCharReader : public CharReader { + bool const collectComments_; + OurReader reader_; + +public: + OurCharReader(bool collectComments, OurFeatures const& features) + : collectComments_(collectComments), reader_(features) {} + bool parse(char const* beginDoc, + char const* endDoc, + Value* root, + String* errs) override { + bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_); + if (errs) { + *errs = reader_.getFormattedErrorMessages(); + } + return ok; + } +}; + +CharReaderBuilder::CharReaderBuilder() { setDefaults(&settings_); } +CharReaderBuilder::~CharReaderBuilder() = default; +CharReader* CharReaderBuilder::newCharReader() const { + bool collectComments = settings_["collectComments"].asBool(); + OurFeatures features = OurFeatures::all(); + features.allowComments_ = settings_["allowComments"].asBool(); + features.strictRoot_ = settings_["strictRoot"].asBool(); + features.allowDroppedNullPlaceholders_ = + settings_["allowDroppedNullPlaceholders"].asBool(); + features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool(); + features.allowSingleQuotes_ = settings_["allowSingleQuotes"].asBool(); +#if defined(JSON_HAS_INT64) + features.stackLimit_ = (size_t)settings_["stackLimit"].asUInt64(); +#else + features.stackLimit_ = settings_["stackLimit"].asUInt(); +#endif + features.failIfExtra_ = settings_["failIfExtra"].asBool(); + features.rejectDupKeys_ = settings_["rejectDupKeys"].asBool(); + features.allowSpecialFloats_ = settings_["allowSpecialFloats"].asBool(); + return new OurCharReader(collectComments, features); +} +static void getValidReaderKeys(std::set* valid_keys) { + valid_keys->clear(); + valid_keys->insert("collectComments"); + valid_keys->insert("allowComments"); + valid_keys->insert("strictRoot"); + valid_keys->insert("allowDroppedNullPlaceholders"); + valid_keys->insert("allowNumericKeys"); + valid_keys->insert("allowSingleQuotes"); + valid_keys->insert("stackLimit"); + valid_keys->insert("failIfExtra"); + valid_keys->insert("rejectDupKeys"); + valid_keys->insert("allowSpecialFloats"); +} +bool CharReaderBuilder::validate(Json::Value* invalid) const { + Json::Value my_invalid; + if (!invalid) + invalid = &my_invalid; // so we do not need to test for NULL + Json::Value& inv = *invalid; + std::set valid_keys; + getValidReaderKeys(&valid_keys); + Value::Members keys = settings_.getMemberNames(); + size_t n = keys.size(); + for (size_t i = 0; i < n; ++i) { + String const& key = keys[i]; + if (valid_keys.find(key) == valid_keys.end()) { + inv[key] = settings_[key]; + } + } + return inv.empty(); +} +Value& CharReaderBuilder::operator[](const String& key) { + return settings_[key]; +} +// static +void CharReaderBuilder::strictMode(Json::Value* settings) { + //! [CharReaderBuilderStrictMode] + (*settings)["allowComments"] = false; + (*settings)["strictRoot"] = true; + (*settings)["allowDroppedNullPlaceholders"] = false; + (*settings)["allowNumericKeys"] = false; + (*settings)["allowSingleQuotes"] = false; + (*settings)["stackLimit"] = 1000; + (*settings)["failIfExtra"] = true; + (*settings)["rejectDupKeys"] = true; + (*settings)["allowSpecialFloats"] = false; + //! [CharReaderBuilderStrictMode] +} +// static +void CharReaderBuilder::setDefaults(Json::Value* settings) { + //! [CharReaderBuilderDefaults] + (*settings)["collectComments"] = true; + (*settings)["allowComments"] = true; + (*settings)["strictRoot"] = false; + (*settings)["allowDroppedNullPlaceholders"] = false; + (*settings)["allowNumericKeys"] = false; + (*settings)["allowSingleQuotes"] = false; + (*settings)["stackLimit"] = 1000; + (*settings)["failIfExtra"] = false; + (*settings)["rejectDupKeys"] = false; + (*settings)["allowSpecialFloats"] = false; + //! [CharReaderBuilderDefaults] +} + +////////////////////////////////// +// global functions + +bool parseFromStream(CharReader::Factory const& fact, + IStream& sin, + Value* root, + String* errs) { + OStringStream ssin; + ssin << sin.rdbuf(); + String doc = ssin.str(); + char const* begin = doc.data(); + char const* end = begin + doc.size(); + // Note that we do not actually need a null-terminator. + CharReaderPtr const reader(fact.newCharReader()); + return reader->parse(begin, end, root, errs); +} + +IStream& operator>>(IStream& sin, Value& root) { + CharReaderBuilder b; + String errs; + bool ok = parseFromStream(b, sin, &root, &errs); + if (!ok) { + throwRuntimeError(errs); + } + return sin; +} + +} // namespace Json + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: src/lib_json/json_reader.cpp +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: src/lib_json/json_valueiterator.inl +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +// included by json_value.cpp + +namespace Json { + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// class ValueIteratorBase +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// + +ValueIteratorBase::ValueIteratorBase() : current_() {} + +ValueIteratorBase::ValueIteratorBase( + const Value::ObjectValues::iterator& current) + : current_(current), isNull_(false) {} + +Value& ValueIteratorBase::deref() const { return current_->second; } + +void ValueIteratorBase::increment() { ++current_; } + +void ValueIteratorBase::decrement() { --current_; } + +ValueIteratorBase::difference_type +ValueIteratorBase::computeDistance(const SelfType& other) const { +#ifdef JSON_USE_CPPTL_SMALLMAP + return other.current_ - current_; +#else + // Iterator for null value are initialized using the default + // constructor, which initialize current_ to the default + // std::map::iterator. As begin() and end() are two instance + // of the default std::map::iterator, they can not be compared. + // To allow this, we handle this comparison specifically. + if (isNull_ && other.isNull_) { + return 0; + } + + // Usage of std::distance is not portable (does not compile with Sun Studio 12 + // RogueWave STL, + // which is the one used by default). + // Using a portable hand-made version for non random iterator instead: + // return difference_type( std::distance( current_, other.current_ ) ); + difference_type myDistance = 0; + for (Value::ObjectValues::iterator it = current_; it != other.current_; + ++it) { + ++myDistance; + } + return myDistance; +#endif +} + +bool ValueIteratorBase::isEqual(const SelfType& other) const { + if (isNull_) { + return other.isNull_; + } + return current_ == other.current_; +} + +void ValueIteratorBase::copy(const SelfType& other) { + current_ = other.current_; + isNull_ = other.isNull_; +} + +Value ValueIteratorBase::key() const { + const Value::CZString czstring = (*current_).first; + if (czstring.data()) { + if (czstring.isStaticString()) + return Value(StaticString(czstring.data())); + return Value(czstring.data(), czstring.data() + czstring.length()); + } + return Value(czstring.index()); +} + +UInt ValueIteratorBase::index() const { + const Value::CZString czstring = (*current_).first; + if (!czstring.data()) + return czstring.index(); + return Value::UInt(-1); +} + +String ValueIteratorBase::name() const { + char const* keey; + char const* end; + keey = memberName(&end); + if (!keey) + return String(); + return String(keey, end); +} + +char const* ValueIteratorBase::memberName() const { + const char* cname = (*current_).first.data(); + return cname ? cname : ""; +} + +char const* ValueIteratorBase::memberName(char const** end) const { + const char* cname = (*current_).first.data(); + if (!cname) { + *end = nullptr; + return nullptr; + } + *end = cname + (*current_).first.length(); + return cname; +} + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// class ValueConstIterator +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// + +ValueConstIterator::ValueConstIterator() = default; + +ValueConstIterator::ValueConstIterator( + const Value::ObjectValues::iterator& current) + : ValueIteratorBase(current) {} + +ValueConstIterator::ValueConstIterator(ValueIterator const& other) + : ValueIteratorBase(other) {} + +ValueConstIterator& ValueConstIterator:: +operator=(const ValueIteratorBase& other) { + copy(other); + return *this; +} + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// class ValueIterator +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// + +ValueIterator::ValueIterator() = default; + +ValueIterator::ValueIterator(const Value::ObjectValues::iterator& current) + : ValueIteratorBase(current) {} + +ValueIterator::ValueIterator(const ValueConstIterator& other) + : ValueIteratorBase(other) { + throwRuntimeError("ConstIterator to Iterator should never be allowed."); +} + +ValueIterator::ValueIterator(const ValueIterator& other) = default; + +ValueIterator& ValueIterator::operator=(const SelfType& other) { + copy(other); + return *this; +} + +} // namespace Json + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: src/lib_json/json_valueiterator.inl +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: src/lib_json/json_value.cpp +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#include +#include +#ifdef JSON_USE_CPPTL +#include +#endif +#include // min() +#include // size_t + +// Provide implementation equivalent of std::snprintf for older _MSC compilers +#if defined(_MSC_VER) && _MSC_VER < 1900 +#include +static int msvc_pre1900_c99_vsnprintf(char* outBuf, + size_t size, + const char* format, + va_list ap) { + int count = -1; + if (size != 0) + count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap); + if (count == -1) + count = _vscprintf(format, ap); + return count; +} + +int JSON_API msvc_pre1900_c99_snprintf(char* outBuf, + size_t size, + const char* format, + ...) { + va_list ap; + va_start(ap, format); + const int count = msvc_pre1900_c99_vsnprintf(outBuf, size, format, ap); + va_end(ap); + return count; +} +#endif + +// Disable warning C4702 : unreachable code +#if defined(_MSC_VER) +#pragma warning(disable : 4702) +#endif + +#define JSON_ASSERT_UNREACHABLE assert(false) + +namespace Json { + +template +static std::unique_ptr cloneUnique(const std::unique_ptr& p) { + std::unique_ptr r; + if (p) { + r = std::unique_ptr(new T(*p)); + } + return r; +} + +// This is a walkaround to avoid the static initialization of Value::null. +// kNull must be word-aligned to avoid crashing on ARM. We use an alignment of +// 8 (instead of 4) as a bit of future-proofing. +#if defined(__ARMEL__) +#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment))) +#else +#define ALIGNAS(byte_alignment) +#endif +// static const unsigned char ALIGNAS(8) kNull[sizeof(Value)] = { 0 }; +// const unsigned char& kNullRef = kNull[0]; +// const Value& Value::null = reinterpret_cast(kNullRef); +// const Value& Value::nullRef = null; + +// static +Value const& Value::nullSingleton() { + static Value const nullStatic; + return nullStatic; +} + +// for backwards compatibility, we'll leave these global references around, but +// DO NOT use them in JSONCPP library code any more! +Value const& Value::null = Value::nullSingleton(); +Value const& Value::nullRef = Value::nullSingleton(); + +const Int Value::minInt = Int(~(UInt(-1) / 2)); +const Int Value::maxInt = Int(UInt(-1) / 2); +const UInt Value::maxUInt = UInt(-1); +#if defined(JSON_HAS_INT64) +const Int64 Value::minInt64 = Int64(~(UInt64(-1) / 2)); +const Int64 Value::maxInt64 = Int64(UInt64(-1) / 2); +const UInt64 Value::maxUInt64 = UInt64(-1); +// The constant is hard-coded because some compiler have trouble +// converting Value::maxUInt64 to a double correctly (AIX/xlC). +// Assumes that UInt64 is a 64 bits integer. +static const double maxUInt64AsDouble = 18446744073709551615.0; +#endif // defined(JSON_HAS_INT64) +const LargestInt Value::minLargestInt = LargestInt(~(LargestUInt(-1) / 2)); +const LargestInt Value::maxLargestInt = LargestInt(LargestUInt(-1) / 2); +const LargestUInt Value::maxLargestUInt = LargestUInt(-1); + +const UInt Value::defaultRealPrecision = 17; + +#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) +template +static inline bool InRange(double d, T min, U max) { + // The casts can lose precision, but we are looking only for + // an approximate range. Might fail on edge cases though. ~cdunn + // return d >= static_cast(min) && d <= static_cast(max); + return d >= min && d <= max; +} +#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) +static inline double integerToDouble(Json::UInt64 value) { + return static_cast(Int64(value / 2)) * 2.0 + + static_cast(Int64(value & 1)); +} + +template static inline double integerToDouble(T value) { + return static_cast(value); +} + +template +static inline bool InRange(double d, T min, U max) { + return d >= integerToDouble(min) && d <= integerToDouble(max); +} +#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + +/** Duplicates the specified string value. + * @param value Pointer to the string to duplicate. Must be zero-terminated if + * length is "unknown". + * @param length Length of the value. if equals to unknown, then it will be + * computed using strlen(value). + * @return Pointer on the duplicate instance of string. + */ +static inline char* duplicateStringValue(const char* value, size_t length) { + // Avoid an integer overflow in the call to malloc below by limiting length + // to a sane value. + if (length >= static_cast(Value::maxInt)) + length = Value::maxInt - 1; + + char* newString = static_cast(malloc(length + 1)); + if (newString == nullptr) { + throwRuntimeError("in Json::Value::duplicateStringValue(): " + "Failed to allocate string value buffer"); + } + memcpy(newString, value, length); + newString[length] = 0; + return newString; +} + +/* Record the length as a prefix. + */ +static inline char* duplicateAndPrefixStringValue(const char* value, + unsigned int length) { + // Avoid an integer overflow in the call to malloc below by limiting length + // to a sane value. + JSON_ASSERT_MESSAGE(length <= static_cast(Value::maxInt) - + sizeof(unsigned) - 1U, + "in Json::Value::duplicateAndPrefixStringValue(): " + "length too big for prefixing"); + unsigned actualLength = length + static_cast(sizeof(unsigned)) + 1U; + char* newString = static_cast(malloc(actualLength)); + if (newString == nullptr) { + throwRuntimeError("in Json::Value::duplicateAndPrefixStringValue(): " + "Failed to allocate string value buffer"); + } + *reinterpret_cast(newString) = length; + memcpy(newString + sizeof(unsigned), value, length); + newString[actualLength - 1U] = + 0; // to avoid buffer over-run accidents by users later + return newString; +} +inline static void decodePrefixedString(bool isPrefixed, + char const* prefixed, + unsigned* length, + char const** value) { + if (!isPrefixed) { + *length = static_cast(strlen(prefixed)); + *value = prefixed; + } else { + *length = *reinterpret_cast(prefixed); + *value = prefixed + sizeof(unsigned); + } +} +/** Free the string duplicated by + * duplicateStringValue()/duplicateAndPrefixStringValue(). + */ +#if JSONCPP_USING_SECURE_MEMORY +static inline void releasePrefixedStringValue(char* value) { + unsigned length = 0; + char const* valueDecoded; + decodePrefixedString(true, value, &length, &valueDecoded); + size_t const size = sizeof(unsigned) + length + 1U; + memset(value, 0, size); + free(value); +} +static inline void releaseStringValue(char* value, unsigned length) { + // length==0 => we allocated the strings memory + size_t size = (length == 0) ? strlen(value) : length; + memset(value, 0, size); + free(value); +} +#else // !JSONCPP_USING_SECURE_MEMORY +static inline void releasePrefixedStringValue(char* value) { free(value); } +static inline void releaseStringValue(char* value, unsigned) { free(value); } +#endif // JSONCPP_USING_SECURE_MEMORY + +} // namespace Json + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ValueInternals... +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +#if !defined(JSON_IS_AMALGAMATION) + +#include "json_valueiterator.inl" +#endif // if !defined(JSON_IS_AMALGAMATION) + +namespace Json { + +Exception::Exception(String msg) : msg_(std::move(msg)) {} +Exception::~Exception() JSONCPP_NOEXCEPT {} +char const* Exception::what() const JSONCPP_NOEXCEPT { return msg_.c_str(); } +RuntimeError::RuntimeError(String const& msg) : Exception(msg) {} +LogicError::LogicError(String const& msg) : Exception(msg) {} +JSONCPP_NORETURN void throwRuntimeError(String const& msg) { + throw RuntimeError(msg); +} +JSONCPP_NORETURN void throwLogicError(String const& msg) { + throw LogicError(msg); +} + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// class Value::CZString +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// + +// Notes: policy_ indicates if the string was allocated when +// a string is stored. + +Value::CZString::CZString(ArrayIndex index) : cstr_(nullptr), index_(index) {} + +Value::CZString::CZString(char const* str, + unsigned length, + DuplicationPolicy allocate) + : cstr_(str) { + // allocate != duplicate + storage_.policy_ = allocate & 0x3; + storage_.length_ = length & 0x3FFFFFFF; +} + +Value::CZString::CZString(const CZString& other) { + cstr_ = (other.storage_.policy_ != noDuplication && other.cstr_ != nullptr + ? duplicateStringValue(other.cstr_, other.storage_.length_) + : other.cstr_); + storage_.policy_ = + static_cast( + other.cstr_ + ? (static_cast(other.storage_.policy_) == + noDuplication + ? noDuplication + : duplicate) + : static_cast(other.storage_.policy_)) & + 3U; + storage_.length_ = other.storage_.length_; +} + +Value::CZString::CZString(CZString&& other) + : cstr_(other.cstr_), index_(other.index_) { + other.cstr_ = nullptr; +} + +Value::CZString::~CZString() { + if (cstr_ && storage_.policy_ == duplicate) { + releaseStringValue(const_cast(cstr_), + storage_.length_ + 1u); // +1 for null terminating + // character for sake of + // completeness but not actually + // necessary + } +} + +void Value::CZString::swap(CZString& other) { + std::swap(cstr_, other.cstr_); + std::swap(index_, other.index_); +} + +Value::CZString& Value::CZString::operator=(const CZString& other) { + cstr_ = other.cstr_; + index_ = other.index_; + return *this; +} + +Value::CZString& Value::CZString::operator=(CZString&& other) { + cstr_ = other.cstr_; + index_ = other.index_; + other.cstr_ = nullptr; + return *this; +} + +bool Value::CZString::operator<(const CZString& other) const { + if (!cstr_) + return index_ < other.index_; + // return strcmp(cstr_, other.cstr_) < 0; + // Assume both are strings. + unsigned this_len = this->storage_.length_; + unsigned other_len = other.storage_.length_; + unsigned min_len = std::min(this_len, other_len); + JSON_ASSERT(this->cstr_ && other.cstr_); + int comp = memcmp(this->cstr_, other.cstr_, min_len); + if (comp < 0) + return true; + if (comp > 0) + return false; + return (this_len < other_len); +} + +bool Value::CZString::operator==(const CZString& other) const { + if (!cstr_) + return index_ == other.index_; + // return strcmp(cstr_, other.cstr_) == 0; + // Assume both are strings. + unsigned this_len = this->storage_.length_; + unsigned other_len = other.storage_.length_; + if (this_len != other_len) + return false; + JSON_ASSERT(this->cstr_ && other.cstr_); + int comp = memcmp(this->cstr_, other.cstr_, this_len); + return comp == 0; +} + +ArrayIndex Value::CZString::index() const { return index_; } + +// const char* Value::CZString::c_str() const { return cstr_; } +const char* Value::CZString::data() const { return cstr_; } +unsigned Value::CZString::length() const { return storage_.length_; } +bool Value::CZString::isStaticString() const { + return storage_.policy_ == noDuplication; +} + +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// class Value::Value +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// +// ////////////////////////////////////////////////////////////////// + +/*! \internal Default constructor initialization must be equivalent to: + * memset( this, 0, sizeof(Value) ) + * This optimization is used in ValueInternalMap fast allocator. + */ +Value::Value(ValueType type) { + static char const emptyString[] = ""; + initBasic(type); + switch (type) { + case nullValue: + break; + case intValue: + case uintValue: + value_.int_ = 0; + break; + case realValue: + value_.real_ = 0.0; + break; + case stringValue: + // allocated_ == false, so this is safe. + value_.string_ = const_cast(static_cast(emptyString)); + break; + case arrayValue: + case objectValue: + value_.map_ = new ObjectValues(); + break; + case booleanValue: + value_.bool_ = false; + break; + default: + JSON_ASSERT_UNREACHABLE; + } +} + +Value::Value(Int value) { + initBasic(intValue); + value_.int_ = value; +} + +Value::Value(UInt value) { + initBasic(uintValue); + value_.uint_ = value; +} +#if defined(JSON_HAS_INT64) +Value::Value(Int64 value) { + initBasic(intValue); + value_.int_ = value; +} +Value::Value(UInt64 value) { + initBasic(uintValue); + value_.uint_ = value; +} +#endif // defined(JSON_HAS_INT64) + +Value::Value(double value) { + initBasic(realValue); + value_.real_ = value; +} + +Value::Value(const char* value) { + initBasic(stringValue, true); + JSON_ASSERT_MESSAGE(value != nullptr, + "Null Value Passed to Value Constructor"); + value_.string_ = duplicateAndPrefixStringValue( + value, static_cast(strlen(value))); +} + +Value::Value(const char* begin, const char* end) { + initBasic(stringValue, true); + value_.string_ = + duplicateAndPrefixStringValue(begin, static_cast(end - begin)); +} + +Value::Value(const String& value) { + initBasic(stringValue, true); + value_.string_ = duplicateAndPrefixStringValue( + value.data(), static_cast(value.length())); +} + +Value::Value(const StaticString& value) { + initBasic(stringValue); + value_.string_ = const_cast(value.c_str()); +} + +#ifdef JSON_USE_CPPTL +Value::Value(const CppTL::ConstString& value) { + initBasic(stringValue, true); + value_.string_ = duplicateAndPrefixStringValue( + value, static_cast(value.length())); +} +#endif + +Value::Value(bool value) { + initBasic(booleanValue); + value_.bool_ = value; +} + +Value::Value(const Value& other) { + dupPayload(other); + dupMeta(other); +} + +Value::Value(Value&& other) { + initBasic(nullValue); + swap(other); +} + +Value::~Value() { + releasePayload(); + value_.uint_ = 0; +} + +Value& Value::operator=(const Value& other) { + Value(other).swap(*this); + return *this; +} + +Value& Value::operator=(Value&& other) { + other.swap(*this); + return *this; +} + +void Value::swapPayload(Value& other) { + std::swap(bits_, other.bits_); + std::swap(value_, other.value_); +} + +void Value::copyPayload(const Value& other) { + releasePayload(); + dupPayload(other); +} + +void Value::swap(Value& other) { + swapPayload(other); + std::swap(comments_, other.comments_); + std::swap(start_, other.start_); + std::swap(limit_, other.limit_); +} + +void Value::copy(const Value& other) { + copyPayload(other); + dupMeta(other); +} + +ValueType Value::type() const { + return static_cast(bits_.value_type_); +} + +int Value::compare(const Value& other) const { + if (*this < other) + return -1; + if (*this > other) + return 1; + return 0; +} + +bool Value::operator<(const Value& other) const { + int typeDelta = type() - other.type(); + if (typeDelta) + return typeDelta < 0 ? true : false; + switch (type()) { + case nullValue: + return false; + case intValue: + return value_.int_ < other.value_.int_; + case uintValue: + return value_.uint_ < other.value_.uint_; + case realValue: + return value_.real_ < other.value_.real_; + case booleanValue: + return value_.bool_ < other.value_.bool_; + case stringValue: { + if ((value_.string_ == nullptr) || (other.value_.string_ == nullptr)) { + if (other.value_.string_) + return true; + else + return false; + } + unsigned this_len; + unsigned other_len; + char const* this_str; + char const* other_str; + decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len, + &this_str); + decodePrefixedString(other.isAllocated(), other.value_.string_, &other_len, + &other_str); + unsigned min_len = std::min(this_len, other_len); + JSON_ASSERT(this_str && other_str); + int comp = memcmp(this_str, other_str, min_len); + if (comp < 0) + return true; + if (comp > 0) + return false; + return (this_len < other_len); + } + case arrayValue: + case objectValue: { + int delta = int(value_.map_->size() - other.value_.map_->size()); + if (delta) + return delta < 0; + return (*value_.map_) < (*other.value_.map_); + } + default: + JSON_ASSERT_UNREACHABLE; + } + return false; // unreachable +} + +bool Value::operator<=(const Value& other) const { return !(other < *this); } + +bool Value::operator>=(const Value& other) const { return !(*this < other); } + +bool Value::operator>(const Value& other) const { return other < *this; } + +bool Value::operator==(const Value& other) const { + if (type() != other.type()) + return false; + switch (type()) { + case nullValue: + return true; + case intValue: + return value_.int_ == other.value_.int_; + case uintValue: + return value_.uint_ == other.value_.uint_; + case realValue: + return value_.real_ == other.value_.real_; + case booleanValue: + return value_.bool_ == other.value_.bool_; + case stringValue: { + if ((value_.string_ == nullptr) || (other.value_.string_ == nullptr)) { + return (value_.string_ == other.value_.string_); + } + unsigned this_len; + unsigned other_len; + char const* this_str; + char const* other_str; + decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len, + &this_str); + decodePrefixedString(other.isAllocated(), other.value_.string_, &other_len, + &other_str); + if (this_len != other_len) + return false; + JSON_ASSERT(this_str && other_str); + int comp = memcmp(this_str, other_str, this_len); + return comp == 0; + } + case arrayValue: + case objectValue: + return value_.map_->size() == other.value_.map_->size() && + (*value_.map_) == (*other.value_.map_); + default: + JSON_ASSERT_UNREACHABLE; + } + return false; // unreachable +} + +bool Value::operator!=(const Value& other) const { return !(*this == other); } + +const char* Value::asCString() const { + JSON_ASSERT_MESSAGE(type() == stringValue, + "in Json::Value::asCString(): requires stringValue"); + if (value_.string_ == nullptr) + return nullptr; + unsigned this_len; + char const* this_str; + decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len, + &this_str); + return this_str; +} + +#if JSONCPP_USING_SECURE_MEMORY +unsigned Value::getCStringLength() const { + JSON_ASSERT_MESSAGE(type() == stringValue, + "in Json::Value::asCString(): requires stringValue"); + if (value_.string_ == 0) + return 0; + unsigned this_len; + char const* this_str; + decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len, + &this_str); + return this_len; +} +#endif + +bool Value::getString(char const** begin, char const** end) const { + if (type() != stringValue) + return false; + if (value_.string_ == nullptr) + return false; + unsigned length; + decodePrefixedString(this->isAllocated(), this->value_.string_, &length, + begin); + *end = *begin + length; + return true; +} + +String Value::asString() const { + switch (type()) { + case nullValue: + return ""; + case stringValue: { + if (value_.string_ == nullptr) + return ""; + unsigned this_len; + char const* this_str; + decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len, + &this_str); + return String(this_str, this_len); + } + case booleanValue: + return value_.bool_ ? "true" : "false"; + case intValue: + return valueToString(value_.int_); + case uintValue: + return valueToString(value_.uint_); + case realValue: + return valueToString(value_.real_); + default: + JSON_FAIL_MESSAGE("Type is not convertible to string"); + } +} + +#ifdef JSON_USE_CPPTL +CppTL::ConstString Value::asConstString() const { + unsigned len; + char const* str; + decodePrefixedString(isAllocated(), value_.string_, &len, &str); + return CppTL::ConstString(str, len); +} +#endif + +Value::Int Value::asInt() const { + switch (type()) { + case intValue: + JSON_ASSERT_MESSAGE(isInt(), "LargestInt out of Int range"); + return Int(value_.int_); + case uintValue: + JSON_ASSERT_MESSAGE(isInt(), "LargestUInt out of Int range"); + return Int(value_.uint_); + case realValue: + JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt, maxInt), + "double out of Int range"); + return Int(value_.real_); + case nullValue: + return 0; + case booleanValue: + return value_.bool_ ? 1 : 0; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to Int."); +} + +Value::UInt Value::asUInt() const { + switch (type()) { + case intValue: + JSON_ASSERT_MESSAGE(isUInt(), "LargestInt out of UInt range"); + return UInt(value_.int_); + case uintValue: + JSON_ASSERT_MESSAGE(isUInt(), "LargestUInt out of UInt range"); + return UInt(value_.uint_); + case realValue: + JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt), + "double out of UInt range"); + return UInt(value_.real_); + case nullValue: + return 0; + case booleanValue: + return value_.bool_ ? 1 : 0; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to UInt."); +} + +#if defined(JSON_HAS_INT64) + +Value::Int64 Value::asInt64() const { + switch (type()) { + case intValue: + return Int64(value_.int_); + case uintValue: + JSON_ASSERT_MESSAGE(isInt64(), "LargestUInt out of Int64 range"); + return Int64(value_.uint_); + case realValue: + JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt64, maxInt64), + "double out of Int64 range"); + return Int64(value_.real_); + case nullValue: + return 0; + case booleanValue: + return value_.bool_ ? 1 : 0; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to Int64."); +} + +Value::UInt64 Value::asUInt64() const { + switch (type()) { + case intValue: + JSON_ASSERT_MESSAGE(isUInt64(), "LargestInt out of UInt64 range"); + return UInt64(value_.int_); + case uintValue: + return UInt64(value_.uint_); + case realValue: + JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt64), + "double out of UInt64 range"); + return UInt64(value_.real_); + case nullValue: + return 0; + case booleanValue: + return value_.bool_ ? 1 : 0; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to UInt64."); +} +#endif // if defined(JSON_HAS_INT64) + +LargestInt Value::asLargestInt() const { +#if defined(JSON_NO_INT64) + return asInt(); +#else + return asInt64(); +#endif +} + +LargestUInt Value::asLargestUInt() const { +#if defined(JSON_NO_INT64) + return asUInt(); +#else + return asUInt64(); +#endif +} + +double Value::asDouble() const { + switch (type()) { + case intValue: + return static_cast(value_.int_); + case uintValue: +#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + return static_cast(value_.uint_); +#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + return integerToDouble(value_.uint_); +#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + case realValue: + return value_.real_; + case nullValue: + return 0.0; + case booleanValue: + return value_.bool_ ? 1.0 : 0.0; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to double."); +} + +float Value::asFloat() const { + switch (type()) { + case intValue: + return static_cast(value_.int_); + case uintValue: +#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + return static_cast(value_.uint_); +#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + // This can fail (silently?) if the value is bigger than MAX_FLOAT. + return static_cast(integerToDouble(value_.uint_)); +#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) + case realValue: + return static_cast(value_.real_); + case nullValue: + return 0.0; + case booleanValue: + return value_.bool_ ? 1.0f : 0.0f; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to float."); +} + +bool Value::asBool() const { + switch (type()) { + case booleanValue: + return value_.bool_; + case nullValue: + return false; + case intValue: + return value_.int_ ? true : false; + case uintValue: + return value_.uint_ ? true : false; + case realValue: + // This is kind of strange. Not recommended. + return (value_.real_ != 0.0) ? true : false; + default: + break; + } + JSON_FAIL_MESSAGE("Value is not convertible to bool."); +} + +bool Value::isConvertibleTo(ValueType other) const { + switch (other) { + case nullValue: + return (isNumeric() && asDouble() == 0.0) || + (type() == booleanValue && value_.bool_ == false) || + (type() == stringValue && asString().empty()) || + (type() == arrayValue && value_.map_->empty()) || + (type() == objectValue && value_.map_->empty()) || + type() == nullValue; + case intValue: + return isInt() || + (type() == realValue && InRange(value_.real_, minInt, maxInt)) || + type() == booleanValue || type() == nullValue; + case uintValue: + return isUInt() || + (type() == realValue && InRange(value_.real_, 0, maxUInt)) || + type() == booleanValue || type() == nullValue; + case realValue: + return isNumeric() || type() == booleanValue || type() == nullValue; + case booleanValue: + return isNumeric() || type() == booleanValue || type() == nullValue; + case stringValue: + return isNumeric() || type() == booleanValue || type() == stringValue || + type() == nullValue; + case arrayValue: + return type() == arrayValue || type() == nullValue; + case objectValue: + return type() == objectValue || type() == nullValue; + } + JSON_ASSERT_UNREACHABLE; + return false; +} + +/// Number of values in array or object +ArrayIndex Value::size() const { + switch (type()) { + case nullValue: + case intValue: + case uintValue: + case realValue: + case booleanValue: + case stringValue: + return 0; + case arrayValue: // size of the array is highest index + 1 + if (!value_.map_->empty()) { + ObjectValues::const_iterator itLast = value_.map_->end(); + --itLast; + return (*itLast).first.index() + 1; + } + return 0; + case objectValue: + return ArrayIndex(value_.map_->size()); + } + JSON_ASSERT_UNREACHABLE; + return 0; // unreachable; +} + +bool Value::empty() const { + if (isNull() || isArray() || isObject()) + return size() == 0u; + else + return false; +} + +Value::operator bool() const { return !isNull(); } + +void Value::clear() { + JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue || + type() == objectValue, + "in Json::Value::clear(): requires complex value"); + start_ = 0; + limit_ = 0; + switch (type()) { + case arrayValue: + case objectValue: + value_.map_->clear(); + break; + default: + break; + } +} + +void Value::resize(ArrayIndex newSize) { + JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue, + "in Json::Value::resize(): requires arrayValue"); + if (type() == nullValue) + *this = Value(arrayValue); + ArrayIndex oldSize = size(); + if (newSize == 0) + clear(); + else if (newSize > oldSize) + this->operator[](newSize - 1); + else { + for (ArrayIndex index = newSize; index < oldSize; ++index) { + value_.map_->erase(index); + } + JSON_ASSERT(size() == newSize); + } +} + +Value& Value::operator[](ArrayIndex index) { + JSON_ASSERT_MESSAGE( + type() == nullValue || type() == arrayValue, + "in Json::Value::operator[](ArrayIndex): requires arrayValue"); + if (type() == nullValue) + *this = Value(arrayValue); + CZString key(index); + auto it = value_.map_->lower_bound(key); + if (it != value_.map_->end() && (*it).first == key) + return (*it).second; + + ObjectValues::value_type defaultValue(key, nullSingleton()); + it = value_.map_->insert(it, defaultValue); + return (*it).second; +} + +Value& Value::operator[](int index) { + JSON_ASSERT_MESSAGE( + index >= 0, + "in Json::Value::operator[](int index): index cannot be negative"); + return (*this)[ArrayIndex(index)]; +} + +const Value& Value::operator[](ArrayIndex index) const { + JSON_ASSERT_MESSAGE( + type() == nullValue || type() == arrayValue, + "in Json::Value::operator[](ArrayIndex)const: requires arrayValue"); + if (type() == nullValue) + return nullSingleton(); + CZString key(index); + ObjectValues::const_iterator it = value_.map_->find(key); + if (it == value_.map_->end()) + return nullSingleton(); + return (*it).second; +} + +const Value& Value::operator[](int index) const { + JSON_ASSERT_MESSAGE( + index >= 0, + "in Json::Value::operator[](int index) const: index cannot be negative"); + return (*this)[ArrayIndex(index)]; +} + +void Value::initBasic(ValueType type, bool allocated) { + setType(type); + setIsAllocated(allocated); + comments_ = Comments{}; + start_ = 0; + limit_ = 0; +} + +void Value::dupPayload(const Value& other) { + setType(other.type()); + setIsAllocated(false); + switch (type()) { + case nullValue: + case intValue: + case uintValue: + case realValue: + case booleanValue: + value_ = other.value_; + break; + case stringValue: + if (other.value_.string_ && other.isAllocated()) { + unsigned len; + char const* str; + decodePrefixedString(other.isAllocated(), other.value_.string_, &len, + &str); + value_.string_ = duplicateAndPrefixStringValue(str, len); + setIsAllocated(true); + } else { + value_.string_ = other.value_.string_; + } + break; + case arrayValue: + case objectValue: + value_.map_ = new ObjectValues(*other.value_.map_); + break; + default: + JSON_ASSERT_UNREACHABLE; + } +} + +void Value::releasePayload() { + switch (type()) { + case nullValue: + case intValue: + case uintValue: + case realValue: + case booleanValue: + break; + case stringValue: + if (isAllocated()) + releasePrefixedStringValue(value_.string_); + break; + case arrayValue: + case objectValue: + delete value_.map_; + break; + default: + JSON_ASSERT_UNREACHABLE; + } +} + +void Value::dupMeta(const Value& other) { + comments_ = other.comments_; + start_ = other.start_; + limit_ = other.limit_; +} + +// Access an object value by name, create a null member if it does not exist. +// @pre Type of '*this' is object or null. +// @param key is null-terminated. +Value& Value::resolveReference(const char* key) { + JSON_ASSERT_MESSAGE( + type() == nullValue || type() == objectValue, + "in Json::Value::resolveReference(): requires objectValue"); + if (type() == nullValue) + *this = Value(objectValue); + CZString actualKey(key, static_cast(strlen(key)), + CZString::noDuplication); // NOTE! + auto it = value_.map_->lower_bound(actualKey); + if (it != value_.map_->end() && (*it).first == actualKey) + return (*it).second; + + ObjectValues::value_type defaultValue(actualKey, nullSingleton()); + it = value_.map_->insert(it, defaultValue); + Value& value = (*it).second; + return value; +} + +// @param key is not null-terminated. +Value& Value::resolveReference(char const* key, char const* end) { + JSON_ASSERT_MESSAGE( + type() == nullValue || type() == objectValue, + "in Json::Value::resolveReference(key, end): requires objectValue"); + if (type() == nullValue) + *this = Value(objectValue); + CZString actualKey(key, static_cast(end - key), + CZString::duplicateOnCopy); + auto it = value_.map_->lower_bound(actualKey); + if (it != value_.map_->end() && (*it).first == actualKey) + return (*it).second; + + ObjectValues::value_type defaultValue(actualKey, nullSingleton()); + it = value_.map_->insert(it, defaultValue); + Value& value = (*it).second; + return value; +} + +Value Value::get(ArrayIndex index, const Value& defaultValue) const { + const Value* value = &((*this)[index]); + return value == &nullSingleton() ? defaultValue : *value; +} + +bool Value::isValidIndex(ArrayIndex index) const { return index < size(); } + +Value const* Value::find(char const* begin, char const* end) const { + JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue, + "in Json::Value::find(begin, end): requires " + "objectValue or nullValue"); + if (type() == nullValue) + return nullptr; + CZString actualKey(begin, static_cast(end - begin), + CZString::noDuplication); + ObjectValues::const_iterator it = value_.map_->find(actualKey); + if (it == value_.map_->end()) + return nullptr; + return &(*it).second; +} +Value* Value::demand(char const* begin, char const* end) { + JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue, + "in Json::Value::demand(begin, end): requires " + "objectValue or nullValue"); + return &resolveReference(begin, end); +} +const Value& Value::operator[](const char* key) const { + Value const* found = find(key, key + strlen(key)); + if (!found) + return nullSingleton(); + return *found; +} +Value const& Value::operator[](const String& key) const { + Value const* found = find(key.data(), key.data() + key.length()); + if (!found) + return nullSingleton(); + return *found; +} + +Value& Value::operator[](const char* key) { + return resolveReference(key, key + strlen(key)); +} + +Value& Value::operator[](const String& key) { + return resolveReference(key.data(), key.data() + key.length()); +} + +Value& Value::operator[](const StaticString& key) { + return resolveReference(key.c_str()); +} + +#ifdef JSON_USE_CPPTL +Value& Value::operator[](const CppTL::ConstString& key) { + return resolveReference(key.c_str(), key.end_c_str()); +} +Value const& Value::operator[](CppTL::ConstString const& key) const { + Value const* found = find(key.c_str(), key.end_c_str()); + if (!found) + return nullSingleton(); + return *found; +} +#endif + +Value& Value::append(const Value& value) { return (*this)[size()] = value; } + +Value& Value::append(Value&& value) { + return (*this)[size()] = std::move(value); +} + +Value Value::get(char const* begin, + char const* end, + Value const& defaultValue) const { + Value const* found = find(begin, end); + return !found ? defaultValue : *found; +} +Value Value::get(char const* key, Value const& defaultValue) const { + return get(key, key + strlen(key), defaultValue); +} +Value Value::get(String const& key, Value const& defaultValue) const { + return get(key.data(), key.data() + key.length(), defaultValue); +} + +bool Value::removeMember(const char* begin, const char* end, Value* removed) { + if (type() != objectValue) { + return false; + } + CZString actualKey(begin, static_cast(end - begin), + CZString::noDuplication); + auto it = value_.map_->find(actualKey); + if (it == value_.map_->end()) + return false; + if (removed) + *removed = std::move(it->second); + value_.map_->erase(it); + return true; +} +bool Value::removeMember(const char* key, Value* removed) { + return removeMember(key, key + strlen(key), removed); +} +bool Value::removeMember(String const& key, Value* removed) { + return removeMember(key.data(), key.data() + key.length(), removed); +} +void Value::removeMember(const char* key) { + JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue, + "in Json::Value::removeMember(): requires objectValue"); + if (type() == nullValue) + return; + + CZString actualKey(key, unsigned(strlen(key)), CZString::noDuplication); + value_.map_->erase(actualKey); +} +void Value::removeMember(const String& key) { removeMember(key.c_str()); } + +bool Value::removeIndex(ArrayIndex index, Value* removed) { + if (type() != arrayValue) { + return false; + } + CZString key(index); + auto it = value_.map_->find(key); + if (it == value_.map_->end()) { + return false; + } + if (removed) + *removed = it->second; + ArrayIndex oldSize = size(); + // shift left all items left, into the place of the "removed" + for (ArrayIndex i = index; i < (oldSize - 1); ++i) { + CZString keey(i); + (*value_.map_)[keey] = (*this)[i + 1]; + } + // erase the last one ("leftover") + CZString keyLast(oldSize - 1); + auto itLast = value_.map_->find(keyLast); + value_.map_->erase(itLast); + return true; +} + +#ifdef JSON_USE_CPPTL +Value Value::get(const CppTL::ConstString& key, + const Value& defaultValue) const { + return get(key.c_str(), key.end_c_str(), defaultValue); +} +#endif + +bool Value::isMember(char const* begin, char const* end) const { + Value const* value = find(begin, end); + return nullptr != value; +} +bool Value::isMember(char const* key) const { + return isMember(key, key + strlen(key)); +} +bool Value::isMember(String const& key) const { + return isMember(key.data(), key.data() + key.length()); +} + +#ifdef JSON_USE_CPPTL +bool Value::isMember(const CppTL::ConstString& key) const { + return isMember(key.c_str(), key.end_c_str()); +} +#endif + +Value::Members Value::getMemberNames() const { + JSON_ASSERT_MESSAGE( + type() == nullValue || type() == objectValue, + "in Json::Value::getMemberNames(), value must be objectValue"); + if (type() == nullValue) + return Value::Members(); + Members members; + members.reserve(value_.map_->size()); + ObjectValues::const_iterator it = value_.map_->begin(); + ObjectValues::const_iterator itEnd = value_.map_->end(); + for (; it != itEnd; ++it) { + members.push_back(String((*it).first.data(), (*it).first.length())); + } + return members; +} +// +//# ifdef JSON_USE_CPPTL +// EnumMemberNames +// Value::enumMemberNames() const +//{ +// if ( type() == objectValue ) +// { +// return CppTL::Enum::any( CppTL::Enum::transform( +// CppTL::Enum::keys( *(value_.map_), CppTL::Type() ), +// MemberNamesTransform() ) ); +// } +// return EnumMemberNames(); +//} +// +// +// EnumValues +// Value::enumValues() const +//{ +// if ( type() == objectValue || type() == arrayValue ) +// return CppTL::Enum::anyValues( *(value_.map_), +// CppTL::Type() ); +// return EnumValues(); +//} +// +//# endif + +static bool IsIntegral(double d) { + double integral_part; + return modf(d, &integral_part) == 0.0; +} + +bool Value::isNull() const { return type() == nullValue; } + +bool Value::isBool() const { return type() == booleanValue; } + +bool Value::isInt() const { + switch (type()) { + case intValue: +#if defined(JSON_HAS_INT64) + return value_.int_ >= minInt && value_.int_ <= maxInt; +#else + return true; +#endif + case uintValue: + return value_.uint_ <= UInt(maxInt); + case realValue: + return value_.real_ >= minInt && value_.real_ <= maxInt && + IsIntegral(value_.real_); + default: + break; + } + return false; +} + +bool Value::isUInt() const { + switch (type()) { + case intValue: +#if defined(JSON_HAS_INT64) + return value_.int_ >= 0 && LargestUInt(value_.int_) <= LargestUInt(maxUInt); +#else + return value_.int_ >= 0; +#endif + case uintValue: +#if defined(JSON_HAS_INT64) + return value_.uint_ <= maxUInt; +#else + return true; +#endif + case realValue: + return value_.real_ >= 0 && value_.real_ <= maxUInt && + IsIntegral(value_.real_); + default: + break; + } + return false; +} + +bool Value::isInt64() const { +#if defined(JSON_HAS_INT64) + switch (type()) { + case intValue: + return true; + case uintValue: + return value_.uint_ <= UInt64(maxInt64); + case realValue: + // Note that maxInt64 (= 2^63 - 1) is not exactly representable as a + // double, so double(maxInt64) will be rounded up to 2^63. Therefore we + // require the value to be strictly less than the limit. + return value_.real_ >= double(minInt64) && + value_.real_ < double(maxInt64) && IsIntegral(value_.real_); + default: + break; + } +#endif // JSON_HAS_INT64 + return false; +} + +bool Value::isUInt64() const { +#if defined(JSON_HAS_INT64) + switch (type()) { + case intValue: + return value_.int_ >= 0; + case uintValue: + return true; + case realValue: + // Note that maxUInt64 (= 2^64 - 1) is not exactly representable as a + // double, so double(maxUInt64) will be rounded up to 2^64. Therefore we + // require the value to be strictly less than the limit. + return value_.real_ >= 0 && value_.real_ < maxUInt64AsDouble && + IsIntegral(value_.real_); + default: + break; + } +#endif // JSON_HAS_INT64 + return false; +} + +bool Value::isIntegral() const { + switch (type()) { + case intValue: + case uintValue: + return true; + case realValue: +#if defined(JSON_HAS_INT64) + // Note that maxUInt64 (= 2^64 - 1) is not exactly representable as a + // double, so double(maxUInt64) will be rounded up to 2^64. Therefore we + // require the value to be strictly less than the limit. + return value_.real_ >= double(minInt64) && + value_.real_ < maxUInt64AsDouble && IsIntegral(value_.real_); +#else + return value_.real_ >= minInt && value_.real_ <= maxUInt && + IsIntegral(value_.real_); +#endif // JSON_HAS_INT64 + default: + break; + } + return false; +} + +bool Value::isDouble() const { + return type() == intValue || type() == uintValue || type() == realValue; +} + +bool Value::isNumeric() const { return isDouble(); } + +bool Value::isString() const { return type() == stringValue; } + +bool Value::isArray() const { return type() == arrayValue; } + +bool Value::isObject() const { return type() == objectValue; } + +Value::Comments::Comments(const Comments& that) + : ptr_{cloneUnique(that.ptr_)} {} + +Value::Comments::Comments(Comments&& that) + : ptr_{std::move(that.ptr_)} {} + +Value::Comments& Value::Comments::operator=(const Comments& that) { + ptr_ = cloneUnique(that.ptr_); + return *this; +} + +Value::Comments& Value::Comments::operator=(Comments&& that) { + ptr_ = std::move(that.ptr_); + return *this; +} + +bool Value::Comments::has(CommentPlacement slot) const { + return ptr_ && !(*ptr_)[slot].empty(); +} + +String Value::Comments::get(CommentPlacement slot) const { + if (!ptr_) + return {}; + return (*ptr_)[slot]; +} + +void Value::Comments::set(CommentPlacement slot, String comment) { + if (!ptr_) { + ptr_ = std::unique_ptr(new Array()); + } + (*ptr_)[slot] = std::move(comment); +} + +void Value::setComment(String comment, CommentPlacement placement) { + if (!comment.empty() && (comment.back() == '\n')) { + // Always discard trailing newline, to aid indentation. + comment.pop_back(); + } + JSON_ASSERT(!comment.empty()); + JSON_ASSERT_MESSAGE( + comment[0] == '\0' || comment[0] == '/', + "in Json::Value::setComment(): Comments must start with /"); + comments_.set(placement, std::move(comment)); +} + +bool Value::hasComment(CommentPlacement placement) const { + return comments_.has(placement); +} + +String Value::getComment(CommentPlacement placement) const { + return comments_.get(placement); +} + +void Value::setOffsetStart(ptrdiff_t start) { start_ = start; } + +void Value::setOffsetLimit(ptrdiff_t limit) { limit_ = limit; } + +ptrdiff_t Value::getOffsetStart() const { return start_; } + +ptrdiff_t Value::getOffsetLimit() const { return limit_; } + +String Value::toStyledString() const { + StreamWriterBuilder builder; + + String out = this->hasComment(commentBefore) ? "\n" : ""; + out += Json::writeString(builder, *this); + out += '\n'; + + return out; +} + +Value::const_iterator Value::begin() const { + switch (type()) { + case arrayValue: + case objectValue: + if (value_.map_) + return const_iterator(value_.map_->begin()); + break; + default: + break; + } + return {}; +} + +Value::const_iterator Value::end() const { + switch (type()) { + case arrayValue: + case objectValue: + if (value_.map_) + return const_iterator(value_.map_->end()); + break; + default: + break; + } + return {}; +} + +Value::iterator Value::begin() { + switch (type()) { + case arrayValue: + case objectValue: + if (value_.map_) + return iterator(value_.map_->begin()); + break; + default: + break; + } + return iterator(); +} + +Value::iterator Value::end() { + switch (type()) { + case arrayValue: + case objectValue: + if (value_.map_) + return iterator(value_.map_->end()); + break; + default: + break; + } + return iterator(); +} + +// class PathArgument +// ////////////////////////////////////////////////////////////////// + +PathArgument::PathArgument() : key_() {} + +PathArgument::PathArgument(ArrayIndex index) + : key_(), index_(index), kind_(kindIndex) {} + +PathArgument::PathArgument(const char* key) + : key_(key), index_(), kind_(kindKey) {} + +PathArgument::PathArgument(const String& key) + : key_(key.c_str()), index_(), kind_(kindKey) {} + +// class Path +// ////////////////////////////////////////////////////////////////// + +Path::Path(const String& path, + const PathArgument& a1, + const PathArgument& a2, + const PathArgument& a3, + const PathArgument& a4, + const PathArgument& a5) { + InArgs in; + in.reserve(5); + in.push_back(&a1); + in.push_back(&a2); + in.push_back(&a3); + in.push_back(&a4); + in.push_back(&a5); + makePath(path, in); +} + +void Path::makePath(const String& path, const InArgs& in) { + const char* current = path.c_str(); + const char* end = current + path.length(); + auto itInArg = in.begin(); + while (current != end) { + if (*current == '[') { + ++current; + if (*current == '%') + addPathInArg(path, in, itInArg, PathArgument::kindIndex); + else { + ArrayIndex index = 0; + for (; current != end && *current >= '0' && *current <= '9'; ++current) + index = index * 10 + ArrayIndex(*current - '0'); + args_.push_back(index); + } + if (current == end || *++current != ']') + invalidPath(path, int(current - path.c_str())); + } else if (*current == '%') { + addPathInArg(path, in, itInArg, PathArgument::kindKey); + ++current; + } else if (*current == '.' || *current == ']') { + ++current; + } else { + const char* beginName = current; + while (current != end && !strchr("[.", *current)) + ++current; + args_.push_back(String(beginName, current)); + } + } +} + +void Path::addPathInArg(const String& /*path*/, + const InArgs& in, + InArgs::const_iterator& itInArg, + PathArgument::Kind kind) { + if (itInArg == in.end()) { + // Error: missing argument %d + } else if ((*itInArg)->kind_ != kind) { + // Error: bad argument type + } else { + args_.push_back(**itInArg++); + } +} + +void Path::invalidPath(const String& /*path*/, int /*location*/) { + // Error: invalid path. +} + +const Value& Path::resolve(const Value& root) const { + const Value* node = &root; + for (const auto& arg : args_) { + if (arg.kind_ == PathArgument::kindIndex) { + if (!node->isArray() || !node->isValidIndex(arg.index_)) { + // Error: unable to resolve path (array value expected at position... + return Value::null; + } + node = &((*node)[arg.index_]); + } else if (arg.kind_ == PathArgument::kindKey) { + if (!node->isObject()) { + // Error: unable to resolve path (object value expected at position...) + return Value::null; + } + node = &((*node)[arg.key_]); + if (node == &Value::nullSingleton()) { + // Error: unable to resolve path (object has no member named '' at + // position...) + return Value::null; + } + } + } + return *node; +} + +Value Path::resolve(const Value& root, const Value& defaultValue) const { + const Value* node = &root; + for (const auto& arg : args_) { + if (arg.kind_ == PathArgument::kindIndex) { + if (!node->isArray() || !node->isValidIndex(arg.index_)) + return defaultValue; + node = &((*node)[arg.index_]); + } else if (arg.kind_ == PathArgument::kindKey) { + if (!node->isObject()) + return defaultValue; + node = &((*node)[arg.key_]); + if (node == &Value::nullSingleton()) + return defaultValue; + } + } + return *node; +} + +Value& Path::make(Value& root) const { + Value* node = &root; + for (const auto& arg : args_) { + if (arg.kind_ == PathArgument::kindIndex) { + if (!node->isArray()) { + // Error: node is not an array at position ... + } + node = &((*node)[arg.index_]); + } else if (arg.kind_ == PathArgument::kindKey) { + if (!node->isObject()) { + // Error: node is not an object at position... + } + node = &((*node)[arg.key_]); + } + } + return *node; +} + +} // namespace Json + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: src/lib_json/json_value.cpp +// ////////////////////////////////////////////////////////////////////// + + + + + + +// ////////////////////////////////////////////////////////////////////// +// Beginning of content of file: src/lib_json/json_writer.cpp +// ////////////////////////////////////////////////////////////////////// + +// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors +// Distributed under MIT license, or public domain if desired and +// recognized in your jurisdiction. +// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE + +#if !defined(JSON_IS_AMALGAMATION) +#include "json_tool.h" +#include +#endif // if !defined(JSON_IS_AMALGAMATION) +#include +#include +#include +#include +#include +#include +#include + +#if __cplusplus >= 201103L +#include +#include + +#if !defined(isnan) +#define isnan std::isnan +#endif + +#if !defined(isfinite) +#define isfinite std::isfinite +#endif + +#else +#include +#include + +#if defined(_MSC_VER) +#if !defined(isnan) +#include +#define isnan _isnan +#endif + +#if !defined(isfinite) +#include +#define isfinite _finite +#endif + +#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) +#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 +#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES + +#endif //_MSC_VER + +#if defined(__sun) && defined(__SVR4) // Solaris +#if !defined(isfinite) +#include +#define isfinite finite +#endif +#endif + +#if defined(__hpux) +#if !defined(isfinite) +#if defined(__ia64) && !defined(finite) +#define isfinite(x) \ + ((sizeof(x) == sizeof(float) ? _Isfinitef(x) : _IsFinite(x))) +#endif +#endif +#endif + +#if !defined(isnan) +// IEEE standard states that NaN values will not compare to themselves +#define isnan(x) (x != x) +#endif + +#if !defined(__APPLE__) +#if !defined(isfinite) +#define isfinite finite +#endif +#endif +#endif + +#if defined(_MSC_VER) +// Disable warning about strdup being deprecated. +#pragma warning(disable : 4996) +#endif + +namespace Json { + +#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520) +typedef std::unique_ptr StreamWriterPtr; +#else +typedef std::auto_ptr StreamWriterPtr; +#endif + +String valueToString(LargestInt value) { + UIntToStringBuffer buffer; + char* current = buffer + sizeof(buffer); + if (value == Value::minLargestInt) { + uintToString(LargestUInt(Value::maxLargestInt) + 1, current); + *--current = '-'; + } else if (value < 0) { + uintToString(LargestUInt(-value), current); + *--current = '-'; + } else { + uintToString(LargestUInt(value), current); + } + assert(current >= buffer); + return current; +} + +String valueToString(LargestUInt value) { + UIntToStringBuffer buffer; + char* current = buffer + sizeof(buffer); + uintToString(value, current); + assert(current >= buffer); + return current; +} + +#if defined(JSON_HAS_INT64) + +String valueToString(Int value) { return valueToString(LargestInt(value)); } + +String valueToString(UInt value) { return valueToString(LargestUInt(value)); } + +#endif // # if defined(JSON_HAS_INT64) + +namespace { +String valueToString(double value, + bool useSpecialFloats, + unsigned int precision, + PrecisionType precisionType) { + // Print into the buffer. We need not request the alternative representation + // that always has a decimal point because JSON doesn't distinguish the + // concepts of reals and integers. + if (!isfinite(value)) { + static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"}, + {"null", "-1e+9999", "1e+9999"}}; + return reps[useSpecialFloats ? 0 : 1] + [isnan(value) ? 0 : (value < 0) ? 1 : 2]; + } + + String buffer(size_t(36), '\0'); + while (true) { + int len = jsoncpp_snprintf( + &*buffer.begin(), buffer.size(), + (precisionType == PrecisionType::significantDigits) ? "%.*g" : "%.*f", + precision, value); + assert(len >= 0); + auto wouldPrint = static_cast(len); + if (wouldPrint >= buffer.size()) { + buffer.resize(wouldPrint + 1); + continue; + } + buffer.resize(wouldPrint); + break; + } + + buffer.erase(fixNumericLocale(buffer.begin(), buffer.end()), buffer.end()); + + // strip the zero padding from the right + if (precisionType == PrecisionType::decimalPlaces) { + buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end()), buffer.end()); + } + + // try to ensure we preserve the fact that this was given to us as a double on + // input + if (buffer.find('.') == buffer.npos && buffer.find('e') == buffer.npos) { + buffer += ".0"; + } + return buffer; +} +} // namespace + +String valueToString(double value, + unsigned int precision, + PrecisionType precisionType) { + return valueToString(value, false, precision, precisionType); +} + +String valueToString(bool value) { return value ? "true" : "false"; } + +static bool isAnyCharRequiredQuoting(char const* s, size_t n) { + assert(s || !n); + + char const* const end = s + n; + for (char const* cur = s; cur < end; ++cur) { + if (*cur == '\\' || *cur == '\"' || *cur < ' ' || + static_cast(*cur) < 0x80) + return true; + } + return false; +} + +static unsigned int utf8ToCodepoint(const char*& s, const char* e) { + const unsigned int REPLACEMENT_CHARACTER = 0xFFFD; + + unsigned int firstByte = static_cast(*s); + + if (firstByte < 0x80) + return firstByte; + + if (firstByte < 0xE0) { + if (e - s < 2) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = + ((firstByte & 0x1F) << 6) | (static_cast(s[1]) & 0x3F); + s += 1; + // oversized encoded characters are invalid + return calculated < 0x80 ? REPLACEMENT_CHARACTER : calculated; + } + + if (firstByte < 0xF0) { + if (e - s < 3) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = ((firstByte & 0x0F) << 12) | + ((static_cast(s[1]) & 0x3F) << 6) | + (static_cast(s[2]) & 0x3F); + s += 2; + // surrogates aren't valid codepoints itself + // shouldn't be UTF-8 encoded + if (calculated >= 0xD800 && calculated <= 0xDFFF) + return REPLACEMENT_CHARACTER; + // oversized encoded characters are invalid + return calculated < 0x800 ? REPLACEMENT_CHARACTER : calculated; + } + + if (firstByte < 0xF8) { + if (e - s < 4) + return REPLACEMENT_CHARACTER; + + unsigned int calculated = ((firstByte & 0x07) << 18) | + ((static_cast(s[1]) & 0x3F) << 12) | + ((static_cast(s[2]) & 0x3F) << 6) | + (static_cast(s[3]) & 0x3F); + s += 3; + // oversized encoded characters are invalid + return calculated < 0x10000 ? REPLACEMENT_CHARACTER : calculated; + } + + return REPLACEMENT_CHARACTER; +} + +static const char hex2[] = "000102030405060708090a0b0c0d0e0f" + "101112131415161718191a1b1c1d1e1f" + "202122232425262728292a2b2c2d2e2f" + "303132333435363738393a3b3c3d3e3f" + "404142434445464748494a4b4c4d4e4f" + "505152535455565758595a5b5c5d5e5f" + "606162636465666768696a6b6c6d6e6f" + "707172737475767778797a7b7c7d7e7f" + "808182838485868788898a8b8c8d8e8f" + "909192939495969798999a9b9c9d9e9f" + "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf" + "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf" + "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf" + "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf" + "e0e1e2e3e4e5e6e7e8e9eaebecedeeef" + "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"; + +static String toHex16Bit(unsigned int x) { + const unsigned int hi = (x >> 8) & 0xff; + const unsigned int lo = x & 0xff; + String result(4, ' '); + result[0] = hex2[2 * hi]; + result[1] = hex2[2 * hi + 1]; + result[2] = hex2[2 * lo]; + result[3] = hex2[2 * lo + 1]; + return result; +} + +static String valueToQuotedStringN(const char* value, unsigned length) { + if (value == nullptr) + return ""; + + if (!isAnyCharRequiredQuoting(value, length)) + return String("\"") + value + "\""; + // We have to walk value and escape any special characters. + // Appending to String is not efficient, but this should be rare. + // (Note: forward slashes are *not* rare, but I am not escaping them.) + String::size_type maxsize = length * 2 + 3; // allescaped+quotes+NULL + String result; + result.reserve(maxsize); // to avoid lots of mallocs + result += "\""; + char const* end = value + length; + for (const char* c = value; c != end; ++c) { + switch (*c) { + case '\"': + result += "\\\""; + break; + case '\\': + result += "\\\\"; + break; + case '\b': + result += "\\b"; + break; + case '\f': + result += "\\f"; + break; + case '\n': + result += "\\n"; + break; + case '\r': + result += "\\r"; + break; + case '\t': + result += "\\t"; + break; + // case '/': + // Even though \/ is considered a legal escape in JSON, a bare + // slash is also legal, so I see no reason to escape it. + // (I hope I am not misunderstanding something.) + // blep notes: actually escaping \/ may be useful in javascript to avoid = 0x20) + result += static_cast(cp); + else if (cp < 0x10000) { // codepoint is in Basic Multilingual Plane + result += "\\u"; + result += toHex16Bit(cp); + } else { // codepoint is not in Basic Multilingual Plane + // convert to surrogate pair first + cp -= 0x10000; + result += "\\u"; + result += toHex16Bit((cp >> 10) + 0xD800); + result += "\\u"; + result += toHex16Bit((cp & 0x3FF) + 0xDC00); + } + } break; + } + } + result += "\""; + return result; +} + +String valueToQuotedString(const char* value) { + return valueToQuotedStringN(value, static_cast(strlen(value))); +} + +// Class Writer +// ////////////////////////////////////////////////////////////////// +Writer::~Writer() = default; + +// Class FastWriter +// ////////////////////////////////////////////////////////////////// + +FastWriter::FastWriter() + + = default; + +void FastWriter::enableYAMLCompatibility() { yamlCompatibilityEnabled_ = true; } + +void FastWriter::dropNullPlaceholders() { dropNullPlaceholders_ = true; } + +void FastWriter::omitEndingLineFeed() { omitEndingLineFeed_ = true; } + +String FastWriter::write(const Value& root) { + document_.clear(); + writeValue(root); + if (!omitEndingLineFeed_) + document_ += '\n'; + return document_; +} + +void FastWriter::writeValue(const Value& value) { + switch (value.type()) { + case nullValue: + if (!dropNullPlaceholders_) + document_ += "null"; + break; + case intValue: + document_ += valueToString(value.asLargestInt()); + break; + case uintValue: + document_ += valueToString(value.asLargestUInt()); + break; + case realValue: + document_ += valueToString(value.asDouble()); + break; + case stringValue: { + // Is NULL possible for value.string_? No. + char const* str; + char const* end; + bool ok = value.getString(&str, &end); + if (ok) + document_ += valueToQuotedStringN(str, static_cast(end - str)); + break; + } + case booleanValue: + document_ += valueToString(value.asBool()); + break; + case arrayValue: { + document_ += '['; + ArrayIndex size = value.size(); + for (ArrayIndex index = 0; index < size; ++index) { + if (index > 0) + document_ += ','; + writeValue(value[index]); + } + document_ += ']'; + } break; + case objectValue: { + Value::Members members(value.getMemberNames()); + document_ += '{'; + for (auto it = members.begin(); it != members.end(); ++it) { + const String& name = *it; + if (it != members.begin()) + document_ += ','; + document_ += valueToQuotedStringN(name.data(), + static_cast(name.length())); + document_ += yamlCompatibilityEnabled_ ? ": " : ":"; + writeValue(value[name]); + } + document_ += '}'; + } break; + } +} + +// Class StyledWriter +// ////////////////////////////////////////////////////////////////// + +StyledWriter::StyledWriter() = default; + +String StyledWriter::write(const Value& root) { + document_.clear(); + addChildValues_ = false; + indentString_.clear(); + writeCommentBeforeValue(root); + writeValue(root); + writeCommentAfterValueOnSameLine(root); + document_ += '\n'; + return document_; +} + +void StyledWriter::writeValue(const Value& value) { + switch (value.type()) { + case nullValue: + pushValue("null"); + break; + case intValue: + pushValue(valueToString(value.asLargestInt())); + break; + case uintValue: + pushValue(valueToString(value.asLargestUInt())); + break; + case realValue: + pushValue(valueToString(value.asDouble())); + break; + case stringValue: { + // Is NULL possible for value.string_? No. + char const* str; + char const* end; + bool ok = value.getString(&str, &end); + if (ok) + pushValue(valueToQuotedStringN(str, static_cast(end - str))); + else + pushValue(""); + break; + } + case booleanValue: + pushValue(valueToString(value.asBool())); + break; + case arrayValue: + writeArrayValue(value); + break; + case objectValue: { + Value::Members members(value.getMemberNames()); + if (members.empty()) + pushValue("{}"); + else { + writeWithIndent("{"); + indent(); + auto it = members.begin(); + for (;;) { + const String& name = *it; + const Value& childValue = value[name]; + writeCommentBeforeValue(childValue); + writeWithIndent(valueToQuotedString(name.c_str())); + document_ += " : "; + writeValue(childValue); + if (++it == members.end()) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + document_ += ','; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("}"); + } + } break; + } +} + +void StyledWriter::writeArrayValue(const Value& value) { + unsigned size = value.size(); + if (size == 0) + pushValue("[]"); + else { + bool isArrayMultiLine = isMultilineArray(value); + if (isArrayMultiLine) { + writeWithIndent("["); + indent(); + bool hasChildValue = !childValues_.empty(); + unsigned index = 0; + for (;;) { + const Value& childValue = value[index]; + writeCommentBeforeValue(childValue); + if (hasChildValue) + writeWithIndent(childValues_[index]); + else { + writeIndent(); + writeValue(childValue); + } + if (++index == size) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + document_ += ','; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("]"); + } else // output on a single line + { + assert(childValues_.size() == size); + document_ += "[ "; + for (unsigned index = 0; index < size; ++index) { + if (index > 0) + document_ += ", "; + document_ += childValues_[index]; + } + document_ += " ]"; + } + } +} + +bool StyledWriter::isMultilineArray(const Value& value) { + ArrayIndex const size = value.size(); + bool isMultiLine = size * 3 >= rightMargin_; + childValues_.clear(); + for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) { + const Value& childValue = value[index]; + isMultiLine = ((childValue.isArray() || childValue.isObject()) && + !childValue.empty()); + } + if (!isMultiLine) // check if line length > max line length + { + childValues_.reserve(size); + addChildValues_ = true; + ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]' + for (ArrayIndex index = 0; index < size; ++index) { + if (hasCommentForValue(value[index])) { + isMultiLine = true; + } + writeValue(value[index]); + lineLength += static_cast(childValues_[index].length()); + } + addChildValues_ = false; + isMultiLine = isMultiLine || lineLength >= rightMargin_; + } + return isMultiLine; +} + +void StyledWriter::pushValue(const String& value) { + if (addChildValues_) + childValues_.push_back(value); + else + document_ += value; +} + +void StyledWriter::writeIndent() { + if (!document_.empty()) { + char last = document_[document_.length() - 1]; + if (last == ' ') // already indented + return; + if (last != '\n') // Comments may add new-line + document_ += '\n'; + } + document_ += indentString_; +} + +void StyledWriter::writeWithIndent(const String& value) { + writeIndent(); + document_ += value; +} + +void StyledWriter::indent() { indentString_ += String(indentSize_, ' '); } + +void StyledWriter::unindent() { + assert(indentString_.size() >= indentSize_); + indentString_.resize(indentString_.size() - indentSize_); +} + +void StyledWriter::writeCommentBeforeValue(const Value& root) { + if (!root.hasComment(commentBefore)) + return; + + document_ += '\n'; + writeIndent(); + const String& comment = root.getComment(commentBefore); + String::const_iterator iter = comment.begin(); + while (iter != comment.end()) { + document_ += *iter; + if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/')) + writeIndent(); + ++iter; + } + + // Comments are stripped of trailing newlines, so add one here + document_ += '\n'; +} + +void StyledWriter::writeCommentAfterValueOnSameLine(const Value& root) { + if (root.hasComment(commentAfterOnSameLine)) + document_ += " " + root.getComment(commentAfterOnSameLine); + + if (root.hasComment(commentAfter)) { + document_ += '\n'; + document_ += root.getComment(commentAfter); + document_ += '\n'; + } +} + +bool StyledWriter::hasCommentForValue(const Value& value) { + return value.hasComment(commentBefore) || + value.hasComment(commentAfterOnSameLine) || + value.hasComment(commentAfter); +} + +// Class StyledStreamWriter +// ////////////////////////////////////////////////////////////////// + +StyledStreamWriter::StyledStreamWriter(String indentation) + : document_(nullptr), indentation_(std::move(indentation)), + addChildValues_(), indented_(false) {} + +void StyledStreamWriter::write(OStream& out, const Value& root) { + document_ = &out; + addChildValues_ = false; + indentString_.clear(); + indented_ = true; + writeCommentBeforeValue(root); + if (!indented_) + writeIndent(); + indented_ = true; + writeValue(root); + writeCommentAfterValueOnSameLine(root); + *document_ << "\n"; + document_ = nullptr; // Forget the stream, for safety. +} + +void StyledStreamWriter::writeValue(const Value& value) { + switch (value.type()) { + case nullValue: + pushValue("null"); + break; + case intValue: + pushValue(valueToString(value.asLargestInt())); + break; + case uintValue: + pushValue(valueToString(value.asLargestUInt())); + break; + case realValue: + pushValue(valueToString(value.asDouble())); + break; + case stringValue: { + // Is NULL possible for value.string_? No. + char const* str; + char const* end; + bool ok = value.getString(&str, &end); + if (ok) + pushValue(valueToQuotedStringN(str, static_cast(end - str))); + else + pushValue(""); + break; + } + case booleanValue: + pushValue(valueToString(value.asBool())); + break; + case arrayValue: + writeArrayValue(value); + break; + case objectValue: { + Value::Members members(value.getMemberNames()); + if (members.empty()) + pushValue("{}"); + else { + writeWithIndent("{"); + indent(); + auto it = members.begin(); + for (;;) { + const String& name = *it; + const Value& childValue = value[name]; + writeCommentBeforeValue(childValue); + writeWithIndent(valueToQuotedString(name.c_str())); + *document_ << " : "; + writeValue(childValue); + if (++it == members.end()) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + *document_ << ","; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("}"); + } + } break; + } +} + +void StyledStreamWriter::writeArrayValue(const Value& value) { + unsigned size = value.size(); + if (size == 0) + pushValue("[]"); + else { + bool isArrayMultiLine = isMultilineArray(value); + if (isArrayMultiLine) { + writeWithIndent("["); + indent(); + bool hasChildValue = !childValues_.empty(); + unsigned index = 0; + for (;;) { + const Value& childValue = value[index]; + writeCommentBeforeValue(childValue); + if (hasChildValue) + writeWithIndent(childValues_[index]); + else { + if (!indented_) + writeIndent(); + indented_ = true; + writeValue(childValue); + indented_ = false; + } + if (++index == size) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + *document_ << ","; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("]"); + } else // output on a single line + { + assert(childValues_.size() == size); + *document_ << "[ "; + for (unsigned index = 0; index < size; ++index) { + if (index > 0) + *document_ << ", "; + *document_ << childValues_[index]; + } + *document_ << " ]"; + } + } +} + +bool StyledStreamWriter::isMultilineArray(const Value& value) { + ArrayIndex const size = value.size(); + bool isMultiLine = size * 3 >= rightMargin_; + childValues_.clear(); + for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) { + const Value& childValue = value[index]; + isMultiLine = ((childValue.isArray() || childValue.isObject()) && + !childValue.empty()); + } + if (!isMultiLine) // check if line length > max line length + { + childValues_.reserve(size); + addChildValues_ = true; + ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]' + for (ArrayIndex index = 0; index < size; ++index) { + if (hasCommentForValue(value[index])) { + isMultiLine = true; + } + writeValue(value[index]); + lineLength += static_cast(childValues_[index].length()); + } + addChildValues_ = false; + isMultiLine = isMultiLine || lineLength >= rightMargin_; + } + return isMultiLine; +} + +void StyledStreamWriter::pushValue(const String& value) { + if (addChildValues_) + childValues_.push_back(value); + else + *document_ << value; +} + +void StyledStreamWriter::writeIndent() { + // blep intended this to look at the so-far-written string + // to determine whether we are already indented, but + // with a stream we cannot do that. So we rely on some saved state. + // The caller checks indented_. + *document_ << '\n' << indentString_; +} + +void StyledStreamWriter::writeWithIndent(const String& value) { + if (!indented_) + writeIndent(); + *document_ << value; + indented_ = false; +} + +void StyledStreamWriter::indent() { indentString_ += indentation_; } + +void StyledStreamWriter::unindent() { + assert(indentString_.size() >= indentation_.size()); + indentString_.resize(indentString_.size() - indentation_.size()); +} + +void StyledStreamWriter::writeCommentBeforeValue(const Value& root) { + if (!root.hasComment(commentBefore)) + return; + + if (!indented_) + writeIndent(); + const String& comment = root.getComment(commentBefore); + String::const_iterator iter = comment.begin(); + while (iter != comment.end()) { + *document_ << *iter; + if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/')) + // writeIndent(); // would include newline + *document_ << indentString_; + ++iter; + } + indented_ = false; +} + +void StyledStreamWriter::writeCommentAfterValueOnSameLine(const Value& root) { + if (root.hasComment(commentAfterOnSameLine)) + *document_ << ' ' << root.getComment(commentAfterOnSameLine); + + if (root.hasComment(commentAfter)) { + writeIndent(); + *document_ << root.getComment(commentAfter); + } + indented_ = false; +} + +bool StyledStreamWriter::hasCommentForValue(const Value& value) { + return value.hasComment(commentBefore) || + value.hasComment(commentAfterOnSameLine) || + value.hasComment(commentAfter); +} + +////////////////////////// +// BuiltStyledStreamWriter + +/// Scoped enums are not available until C++11. +struct CommentStyle { + /// Decide whether to write comments. + enum Enum { + None, ///< Drop all comments. + Most, ///< Recover odd behavior of previous versions (not implemented yet). + All ///< Keep all comments. + }; +}; + +struct BuiltStyledStreamWriter : public StreamWriter { + BuiltStyledStreamWriter(String indentation, + CommentStyle::Enum cs, + String colonSymbol, + String nullSymbol, + String endingLineFeedSymbol, + bool useSpecialFloats, + unsigned int precision, + PrecisionType precisionType); + int write(Value const& root, OStream* sout) override; + +private: + void writeValue(Value const& value); + void writeArrayValue(Value const& value); + bool isMultilineArray(Value const& value); + void pushValue(String const& value); + void writeIndent(); + void writeWithIndent(String const& value); + void indent(); + void unindent(); + void writeCommentBeforeValue(Value const& root); + void writeCommentAfterValueOnSameLine(Value const& root); + static bool hasCommentForValue(const Value& value); + + typedef std::vector ChildValues; + + ChildValues childValues_; + String indentString_; + unsigned int rightMargin_; + String indentation_; + CommentStyle::Enum cs_; + String colonSymbol_; + String nullSymbol_; + String endingLineFeedSymbol_; + bool addChildValues_ : 1; + bool indented_ : 1; + bool useSpecialFloats_ : 1; + unsigned int precision_; + PrecisionType precisionType_; +}; +BuiltStyledStreamWriter::BuiltStyledStreamWriter(String indentation, + CommentStyle::Enum cs, + String colonSymbol, + String nullSymbol, + String endingLineFeedSymbol, + bool useSpecialFloats, + unsigned int precision, + PrecisionType precisionType) + : rightMargin_(74), indentation_(std::move(indentation)), cs_(cs), + colonSymbol_(std::move(colonSymbol)), nullSymbol_(std::move(nullSymbol)), + endingLineFeedSymbol_(std::move(endingLineFeedSymbol)), + addChildValues_(false), indented_(false), + useSpecialFloats_(useSpecialFloats), precision_(precision), + precisionType_(precisionType) {} +int BuiltStyledStreamWriter::write(Value const& root, OStream* sout) { + sout_ = sout; + addChildValues_ = false; + indented_ = true; + indentString_.clear(); + writeCommentBeforeValue(root); + if (!indented_) + writeIndent(); + indented_ = true; + writeValue(root); + writeCommentAfterValueOnSameLine(root); + *sout_ << endingLineFeedSymbol_; + sout_ = nullptr; + return 0; +} +void BuiltStyledStreamWriter::writeValue(Value const& value) { + switch (value.type()) { + case nullValue: + pushValue(nullSymbol_); + break; + case intValue: + pushValue(valueToString(value.asLargestInt())); + break; + case uintValue: + pushValue(valueToString(value.asLargestUInt())); + break; + case realValue: + pushValue(valueToString(value.asDouble(), useSpecialFloats_, precision_, + precisionType_)); + break; + case stringValue: { + // Is NULL is possible for value.string_? No. + char const* str; + char const* end; + bool ok = value.getString(&str, &end); + if (ok) + pushValue(valueToQuotedStringN(str, static_cast(end - str))); + else + pushValue(""); + break; + } + case booleanValue: + pushValue(valueToString(value.asBool())); + break; + case arrayValue: + writeArrayValue(value); + break; + case objectValue: { + Value::Members members(value.getMemberNames()); + if (members.empty()) + pushValue("{}"); + else { + writeWithIndent("{"); + indent(); + auto it = members.begin(); + for (;;) { + String const& name = *it; + Value const& childValue = value[name]; + writeCommentBeforeValue(childValue); + writeWithIndent(valueToQuotedStringN( + name.data(), static_cast(name.length()))); + *sout_ << colonSymbol_; + writeValue(childValue); + if (++it == members.end()) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + *sout_ << ","; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("}"); + } + } break; + } +} + +void BuiltStyledStreamWriter::writeArrayValue(Value const& value) { + unsigned size = value.size(); + if (size == 0) + pushValue("[]"); + else { + bool isMultiLine = (cs_ == CommentStyle::All) || isMultilineArray(value); + if (isMultiLine) { + writeWithIndent("["); + indent(); + bool hasChildValue = !childValues_.empty(); + unsigned index = 0; + for (;;) { + Value const& childValue = value[index]; + writeCommentBeforeValue(childValue); + if (hasChildValue) + writeWithIndent(childValues_[index]); + else { + if (!indented_) + writeIndent(); + indented_ = true; + writeValue(childValue); + indented_ = false; + } + if (++index == size) { + writeCommentAfterValueOnSameLine(childValue); + break; + } + *sout_ << ","; + writeCommentAfterValueOnSameLine(childValue); + } + unindent(); + writeWithIndent("]"); + } else // output on a single line + { + assert(childValues_.size() == size); + *sout_ << "["; + if (!indentation_.empty()) + *sout_ << " "; + for (unsigned index = 0; index < size; ++index) { + if (index > 0) + *sout_ << ((!indentation_.empty()) ? ", " : ","); + *sout_ << childValues_[index]; + } + if (!indentation_.empty()) + *sout_ << " "; + *sout_ << "]"; + } + } +} + +bool BuiltStyledStreamWriter::isMultilineArray(Value const& value) { + ArrayIndex const size = value.size(); + bool isMultiLine = size * 3 >= rightMargin_; + childValues_.clear(); + for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) { + Value const& childValue = value[index]; + isMultiLine = ((childValue.isArray() || childValue.isObject()) && + !childValue.empty()); + } + if (!isMultiLine) // check if line length > max line length + { + childValues_.reserve(size); + addChildValues_ = true; + ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]' + for (ArrayIndex index = 0; index < size; ++index) { + if (hasCommentForValue(value[index])) { + isMultiLine = true; + } + writeValue(value[index]); + lineLength += static_cast(childValues_[index].length()); + } + addChildValues_ = false; + isMultiLine = isMultiLine || lineLength >= rightMargin_; + } + return isMultiLine; +} + +void BuiltStyledStreamWriter::pushValue(String const& value) { + if (addChildValues_) + childValues_.push_back(value); + else + *sout_ << value; +} + +void BuiltStyledStreamWriter::writeIndent() { + // blep intended this to look at the so-far-written string + // to determine whether we are already indented, but + // with a stream we cannot do that. So we rely on some saved state. + // The caller checks indented_. + + if (!indentation_.empty()) { + // In this case, drop newlines too. + *sout_ << '\n' << indentString_; + } +} + +void BuiltStyledStreamWriter::writeWithIndent(String const& value) { + if (!indented_) + writeIndent(); + *sout_ << value; + indented_ = false; +} + +void BuiltStyledStreamWriter::indent() { indentString_ += indentation_; } + +void BuiltStyledStreamWriter::unindent() { + assert(indentString_.size() >= indentation_.size()); + indentString_.resize(indentString_.size() - indentation_.size()); +} + +void BuiltStyledStreamWriter::writeCommentBeforeValue(Value const& root) { + if (cs_ == CommentStyle::None) + return; + if (!root.hasComment(commentBefore)) + return; + + if (!indented_) + writeIndent(); + const String& comment = root.getComment(commentBefore); + String::const_iterator iter = comment.begin(); + while (iter != comment.end()) { + *sout_ << *iter; + if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/')) + // writeIndent(); // would write extra newline + *sout_ << indentString_; + ++iter; + } + indented_ = false; +} + +void BuiltStyledStreamWriter::writeCommentAfterValueOnSameLine( + Value const& root) { + if (cs_ == CommentStyle::None) + return; + if (root.hasComment(commentAfterOnSameLine)) + *sout_ << " " + root.getComment(commentAfterOnSameLine); + + if (root.hasComment(commentAfter)) { + writeIndent(); + *sout_ << root.getComment(commentAfter); + } +} + +// static +bool BuiltStyledStreamWriter::hasCommentForValue(const Value& value) { + return value.hasComment(commentBefore) || + value.hasComment(commentAfterOnSameLine) || + value.hasComment(commentAfter); +} + +/////////////// +// StreamWriter + +StreamWriter::StreamWriter() : sout_(nullptr) {} +StreamWriter::~StreamWriter() = default; +StreamWriter::Factory::~Factory() = default; +StreamWriterBuilder::StreamWriterBuilder() { setDefaults(&settings_); } +StreamWriterBuilder::~StreamWriterBuilder() = default; +StreamWriter* StreamWriterBuilder::newStreamWriter() const { + String indentation = settings_["indentation"].asString(); + String cs_str = settings_["commentStyle"].asString(); + String pt_str = settings_["precisionType"].asString(); + bool eyc = settings_["enableYAMLCompatibility"].asBool(); + bool dnp = settings_["dropNullPlaceholders"].asBool(); + bool usf = settings_["useSpecialFloats"].asBool(); + unsigned int pre = settings_["precision"].asUInt(); + CommentStyle::Enum cs = CommentStyle::All; + if (cs_str == "All") { + cs = CommentStyle::All; + } else if (cs_str == "None") { + cs = CommentStyle::None; + } else { + throwRuntimeError("commentStyle must be 'All' or 'None'"); + } + PrecisionType precisionType(significantDigits); + if (pt_str == "significant") { + precisionType = PrecisionType::significantDigits; + } else if (pt_str == "decimal") { + precisionType = PrecisionType::decimalPlaces; + } else { + throwRuntimeError("precisionType must be 'significant' or 'decimal'"); + } + String colonSymbol = " : "; + if (eyc) { + colonSymbol = ": "; + } else if (indentation.empty()) { + colonSymbol = ":"; + } + String nullSymbol = "null"; + if (dnp) { + nullSymbol.clear(); + } + if (pre > 17) + pre = 17; + String endingLineFeedSymbol; + return new BuiltStyledStreamWriter(indentation, cs, colonSymbol, nullSymbol, + endingLineFeedSymbol, usf, pre, + precisionType); +} +static void getValidWriterKeys(std::set* valid_keys) { + valid_keys->clear(); + valid_keys->insert("indentation"); + valid_keys->insert("commentStyle"); + valid_keys->insert("enableYAMLCompatibility"); + valid_keys->insert("dropNullPlaceholders"); + valid_keys->insert("useSpecialFloats"); + valid_keys->insert("precision"); + valid_keys->insert("precisionType"); +} +bool StreamWriterBuilder::validate(Json::Value* invalid) const { + Json::Value my_invalid; + if (!invalid) + invalid = &my_invalid; // so we do not need to test for NULL + Json::Value& inv = *invalid; + std::set valid_keys; + getValidWriterKeys(&valid_keys); + Value::Members keys = settings_.getMemberNames(); + size_t n = keys.size(); + for (size_t i = 0; i < n; ++i) { + String const& key = keys[i]; + if (valid_keys.find(key) == valid_keys.end()) { + inv[key] = settings_[key]; + } + } + return inv.empty(); +} +Value& StreamWriterBuilder::operator[](const String& key) { + return settings_[key]; +} +// static +void StreamWriterBuilder::setDefaults(Json::Value* settings) { + //! [StreamWriterBuilderDefaults] + (*settings)["commentStyle"] = "All"; + (*settings)["indentation"] = "\t"; + (*settings)["enableYAMLCompatibility"] = false; + (*settings)["dropNullPlaceholders"] = false; + (*settings)["useSpecialFloats"] = false; + (*settings)["precision"] = 17; + (*settings)["precisionType"] = "significant"; + //! [StreamWriterBuilderDefaults] +} + +String writeString(StreamWriter::Factory const& factory, Value const& root) { + OStringStream sout; + StreamWriterPtr const writer(factory.newStreamWriter()); + writer->write(root, &sout); + return sout.str(); +} + +OStream& operator<<(OStream& sout, Value const& root) { + StreamWriterBuilder builder; + StreamWriterPtr const writer(builder.newStreamWriter()); + writer->write(root, &sout); + return sout; +} + +} // namespace Json + +// ////////////////////////////////////////////////////////////////////// +// End of content of file: src/lib_json/json_writer.cpp +// ////////////////////////////////////////////////////////////////////// + + + + + diff --git a/launchers/win32/libs/miniz.cpp b/launchers/win32/libs/miniz.cpp new file mode 100644 index 0000000000..96d7cc106a --- /dev/null +++ b/launchers/win32/libs/miniz.cpp @@ -0,0 +1,7657 @@ +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ +#include "stdafx.h" +#include "miniz.h" + +typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1]; +typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1]; +typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- zlib-style API's */ + +mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) +{ + mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16); + size_t block_len = buf_len % 5552; + if (!ptr) + return MZ_ADLER32_INIT; + while (buf_len) + { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) + { + s1 += ptr[0], s2 += s1; + s1 += ptr[1], s2 += s1; + s1 += ptr[2], s2 += s1; + s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; + s1 += ptr[5], s2 += s1; + s1 += ptr[6], s2 += s1; + s1 += ptr[7], s2 += s1; + } + for (; i < block_len; ++i) + s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; + buf_len -= block_len; + block_len = 5552; + } + return (s2 << 16) + s1; +} + +/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/ */ +#if 0 + mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) + { + static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, + 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c }; + mz_uint32 crcu32 = (mz_uint32)crc; + if (!ptr) + return MZ_CRC32_INIT; + crcu32 = ~crcu32; + while (buf_len--) + { + mz_uint8 b = *ptr++; + crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)]; + crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)]; + } + return ~crcu32; + } +#else +/* Faster, but larger CPU cache footprint. + */ +mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) +{ + static const mz_uint32 s_crc_table[256] = + { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, + 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, + 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, + 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, + 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, + 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, + 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, + 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, + 0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, + 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, + 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, + 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, + 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, + 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, + 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, + 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, + 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, + 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, + 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, + 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, + 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, + 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, + 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, + 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, + 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, + 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, + 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, + 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, + 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, + 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, + 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D + }; + + mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF; + const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr; + + while (buf_len >= 4) + { + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF]; + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF]; + pByte_buf += 4; + buf_len -= 4; + } + + while (buf_len) + { + crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF]; + ++pByte_buf; + --buf_len; + } + + return ~crc32; +} +#endif + +void mz_free(void *p) +{ + MZ_FREE(p); +} + +void *miniz_def_alloc_func(void *opaque, size_t items, size_t size) +{ + (void)opaque, (void)items, (void)size; + return MZ_MALLOC(items * size); +} +void miniz_def_free_func(void *opaque, void *address) +{ + (void)opaque, (void)address; + MZ_FREE(address); +} +void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size) +{ + (void)opaque, (void)address, (void)items, (void)size; + return MZ_REALLOC(address, items * size); +} + +const char *mz_version(void) +{ + return MZ_VERSION; +} + +#ifndef MINIZ_NO_ZLIB_APIS + +int mz_deflateInit(mz_streamp pStream, int level) +{ + return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY); +} + +int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy) +{ + tdefl_compressor *pComp; + mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy); + + if (!pStream) + return MZ_STREAM_ERROR; + if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))) + return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = MZ_ADLER32_INIT; + pStream->msg = NULL; + pStream->reserved = 0; + pStream->total_in = 0; + pStream->total_out = 0; + if (!pStream->zalloc) + pStream->zalloc = miniz_def_alloc_func; + if (!pStream->zfree) + pStream->zfree = miniz_def_free_func; + + pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, sizeof(tdefl_compressor)); + if (!pComp) + return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pComp; + + if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY) + { + mz_deflateEnd(pStream); + return MZ_PARAM_ERROR; + } + + return MZ_OK; +} + +int mz_deflateReset(mz_streamp pStream) +{ + if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || (!pStream->zfree)) + return MZ_STREAM_ERROR; + pStream->total_in = pStream->total_out = 0; + tdefl_init((tdefl_compressor *)pStream->state, NULL, NULL, ((tdefl_compressor *)pStream->state)->m_flags); + return MZ_OK; +} + +int mz_deflate(mz_streamp pStream, int flush) +{ + size_t in_bytes, out_bytes; + mz_ulong orig_total_in, orig_total_out; + int mz_status = MZ_OK; + + if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || (!pStream->next_out)) + return MZ_STREAM_ERROR; + if (!pStream->avail_out) + return MZ_BUF_ERROR; + + if (flush == MZ_PARTIAL_FLUSH) + flush = MZ_SYNC_FLUSH; + + if (((tdefl_compressor *)pStream->state)->m_prev_return_status == TDEFL_STATUS_DONE) + return (flush == MZ_FINISH) ? MZ_STREAM_END : MZ_BUF_ERROR; + + orig_total_in = pStream->total_in; + orig_total_out = pStream->total_out; + for (;;) + { + tdefl_status defl_status; + in_bytes = pStream->avail_in; + out_bytes = pStream->avail_out; + + defl_status = tdefl_compress((tdefl_compressor *)pStream->state, pStream->next_in, &in_bytes, pStream->next_out, &out_bytes, (tdefl_flush)flush); + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tdefl_get_adler32((tdefl_compressor *)pStream->state); + + pStream->next_out += (mz_uint)out_bytes; + pStream->avail_out -= (mz_uint)out_bytes; + pStream->total_out += (mz_uint)out_bytes; + + if (defl_status < 0) + { + mz_status = MZ_STREAM_ERROR; + break; + } + else if (defl_status == TDEFL_STATUS_DONE) + { + mz_status = MZ_STREAM_END; + break; + } + else if (!pStream->avail_out) + break; + else if ((!pStream->avail_in) && (flush != MZ_FINISH)) + { + if ((flush) || (pStream->total_in != orig_total_in) || (pStream->total_out != orig_total_out)) + break; + return MZ_BUF_ERROR; /* Can't make forward progress without some input. + */ + } + } + return mz_status; +} + +int mz_deflateEnd(mz_streamp pStream) +{ + if (!pStream) + return MZ_STREAM_ERROR; + if (pStream->state) + { + pStream->zfree(pStream->opaque, pStream->state); + pStream->state = NULL; + } + return MZ_OK; +} + +mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len) +{ + (void)pStream; + /* This is really over conservative. (And lame, but it's actually pretty tricky to compute a true upper bound given the way tdefl's blocking works.) */ + return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5); +} + +int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level) +{ + int status; + mz_stream stream; + memset(&stream, 0, sizeof(stream)); + + /* In case mz_ulong is 64-bits (argh I hate longs). */ + if ((source_len | *pDest_len) > 0xFFFFFFFFU) + return MZ_PARAM_ERROR; + + stream.next_in = pSource; + stream.avail_in = (mz_uint32)source_len; + stream.next_out = pDest; + stream.avail_out = (mz_uint32)*pDest_len; + + status = mz_deflateInit(&stream, level); + if (status != MZ_OK) + return status; + + status = mz_deflate(&stream, MZ_FINISH); + if (status != MZ_STREAM_END) + { + mz_deflateEnd(&stream); + return (status == MZ_OK) ? MZ_BUF_ERROR : status; + } + + *pDest_len = stream.total_out; + return mz_deflateEnd(&stream); +} + +int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len) +{ + return mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION); +} + +mz_ulong mz_compressBound(mz_ulong source_len) +{ + return mz_deflateBound(NULL, source_len); +} + +typedef struct +{ + tinfl_decompressor m_decomp; + mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; + int m_window_bits; + mz_uint8 m_dict[TINFL_LZ_DICT_SIZE]; + tinfl_status m_last_status; +} inflate_state; + +int mz_inflateInit2(mz_streamp pStream, int window_bits) +{ + inflate_state *pDecomp; + if (!pStream) + return MZ_STREAM_ERROR; + if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)) + return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = 0; + pStream->msg = NULL; + pStream->total_in = 0; + pStream->total_out = 0; + pStream->reserved = 0; + if (!pStream->zalloc) + pStream->zalloc = miniz_def_alloc_func; + if (!pStream->zfree) + pStream->zfree = miniz_def_free_func; + + pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state)); + if (!pDecomp) + return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pDecomp; + + tinfl_init(&pDecomp->m_decomp); + pDecomp->m_dict_ofs = 0; + pDecomp->m_dict_avail = 0; + pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT; + pDecomp->m_first_call = 1; + pDecomp->m_has_flushed = 0; + pDecomp->m_window_bits = window_bits; + + return MZ_OK; +} + +int mz_inflateInit(mz_streamp pStream) +{ + return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS); +} + +int mz_inflateReset(mz_streamp pStream) +{ + inflate_state *pDecomp; + if (!pStream) + return MZ_STREAM_ERROR; + + pStream->data_type = 0; + pStream->adler = 0; + pStream->msg = NULL; + pStream->total_in = 0; + pStream->total_out = 0; + pStream->reserved = 0; + + pDecomp = (inflate_state *)pStream->state; + + tinfl_init(&pDecomp->m_decomp); + pDecomp->m_dict_ofs = 0; + pDecomp->m_dict_avail = 0; + pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT; + pDecomp->m_first_call = 1; + pDecomp->m_has_flushed = 0; + /* pDecomp->m_window_bits = window_bits */; + + return MZ_OK; +} + +int mz_inflate(mz_streamp pStream, int flush) +{ + inflate_state *pState; + mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32; + size_t in_bytes, out_bytes, orig_avail_in; + tinfl_status status; + + if ((!pStream) || (!pStream->state)) + return MZ_STREAM_ERROR; + if (flush == MZ_PARTIAL_FLUSH) + flush = MZ_SYNC_FLUSH; + if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH)) + return MZ_STREAM_ERROR; + + pState = (inflate_state *)pStream->state; + if (pState->m_window_bits > 0) + decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER; + orig_avail_in = pStream->avail_in; + + first_call = pState->m_first_call; + pState->m_first_call = 0; + if (pState->m_last_status < 0) + return MZ_DATA_ERROR; + + if (pState->m_has_flushed && (flush != MZ_FINISH)) + return MZ_STREAM_ERROR; + pState->m_has_flushed |= (flush == MZ_FINISH); + + if ((flush == MZ_FINISH) && (first_call)) + { + /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */ + decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF; + in_bytes = pStream->avail_in; + out_bytes = pStream->avail_out; + status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags); + pState->m_last_status = status; + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tinfl_get_adler32(&pState->m_decomp); + pStream->next_out += (mz_uint)out_bytes; + pStream->avail_out -= (mz_uint)out_bytes; + pStream->total_out += (mz_uint)out_bytes; + + if (status < 0) + return MZ_DATA_ERROR; + else if (status != TINFL_STATUS_DONE) + { + pState->m_last_status = TINFL_STATUS_FAILED; + return MZ_BUF_ERROR; + } + return MZ_STREAM_END; + } + /* flush != MZ_FINISH then we must assume there's more input. */ + if (flush != MZ_FINISH) + decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT; + + if (pState->m_dict_avail) + { + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; + pStream->avail_out -= n; + pStream->total_out += n; + pState->m_dict_avail -= n; + pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK; + } + + for (;;) + { + in_bytes = pStream->avail_in; + out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs; + + status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags); + pState->m_last_status = status; + + pStream->next_in += (mz_uint)in_bytes; + pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tinfl_get_adler32(&pState->m_decomp); + + pState->m_dict_avail = (mz_uint)out_bytes; + + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; + pStream->avail_out -= n; + pStream->total_out += n; + pState->m_dict_avail -= n; + pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + + if (status < 0) + return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */ + else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in)) + return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */ + else if (flush == MZ_FINISH) + { + /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */ + if (status == TINFL_STATUS_DONE) + return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END; + /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */ + else if (!pStream->avail_out) + return MZ_BUF_ERROR; + } + else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail)) + break; + } + + return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK; +} + +int mz_inflateEnd(mz_streamp pStream) +{ + if (!pStream) + return MZ_STREAM_ERROR; + if (pStream->state) + { + pStream->zfree(pStream->opaque, pStream->state); + pStream->state = NULL; + } + return MZ_OK; +} + +int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len) +{ + mz_stream stream; + int status; + memset(&stream, 0, sizeof(stream)); + + /* In case mz_ulong is 64-bits (argh I hate longs). */ + if ((source_len | *pDest_len) > 0xFFFFFFFFU) + return MZ_PARAM_ERROR; + + stream.next_in = pSource; + stream.avail_in = (mz_uint32)source_len; + stream.next_out = pDest; + stream.avail_out = (mz_uint32)*pDest_len; + + status = mz_inflateInit(&stream); + if (status != MZ_OK) + return status; + + status = mz_inflate(&stream, MZ_FINISH); + if (status != MZ_STREAM_END) + { + mz_inflateEnd(&stream); + return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status; + } + *pDest_len = stream.total_out; + + return mz_inflateEnd(&stream); +} + +const char *mz_error(int err) +{ + static struct + { + int m_err; + const char *m_pDesc; + } s_error_descs[] = + { + { MZ_OK, "" }, { MZ_STREAM_END, "stream end" }, { MZ_NEED_DICT, "need dictionary" }, { MZ_ERRNO, "file error" }, { MZ_STREAM_ERROR, "stream error" }, { MZ_DATA_ERROR, "data error" }, { MZ_MEM_ERROR, "out of memory" }, { MZ_BUF_ERROR, "buf error" }, { MZ_VERSION_ERROR, "version error" }, { MZ_PARAM_ERROR, "parameter error" } + }; + mz_uint i; + for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i) + if (s_error_descs[i].m_err == err) + return s_error_descs[i].m_pDesc; + return NULL; +} + +#endif /*MINIZ_NO_ZLIB_APIS */ + +#ifdef __cplusplus +} +#endif + +/* + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + For more information, please refer to +*/ +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + + + + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- Low-level Compression (independent from all decompression API's) */ + +/* Purposely making these tables static for faster init and thread safety. */ +static const mz_uint16 s_tdefl_len_sym[256] = + { + 257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, 268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, 272, 272, + 273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, 276, 276, 276, 276, + 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 285 + }; + +static const mz_uint8 s_tdefl_len_extra[256] = + { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0 + }; + +static const mz_uint8 s_tdefl_small_dist_sym[512] = + { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17 + }; + +static const mz_uint8 s_tdefl_small_dist_extra[512] = + { + 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7 + }; + +static const mz_uint8 s_tdefl_large_dist_sym[128] = + { + 0, 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, + 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 + }; + +static const mz_uint8 s_tdefl_large_dist_extra[128] = + { + 0, 0, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13 + }; + +/* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted values. */ +typedef struct +{ + mz_uint16 m_key, m_sym_index; +} tdefl_sym_freq; +static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq *pSyms0, tdefl_sym_freq *pSyms1) +{ + mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2]; + tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1; + MZ_CLEAR_OBJ(hist); + for (i = 0; i < num_syms; i++) + { + mz_uint freq = pSyms0[i].m_key; + hist[freq & 0xFF]++; + hist[256 + ((freq >> 8) & 0xFF)]++; + } + while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256])) + total_passes--; + for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8) + { + const mz_uint32 *pHist = &hist[pass << 8]; + mz_uint offsets[256], cur_ofs = 0; + for (i = 0; i < 256; i++) + { + offsets[i] = cur_ofs; + cur_ofs += pHist[i]; + } + for (i = 0; i < num_syms; i++) + pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = pCur_syms[i]; + { + tdefl_sym_freq *t = pCur_syms; + pCur_syms = pNew_syms; + pNew_syms = t; + } + } + return pCur_syms; +} + +/* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat, alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */ +static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n) +{ + int root, leaf, next, avbl, used, dpth; + if (n == 0) + return; + else if (n == 1) + { + A[0].m_key = 1; + return; + } + A[0].m_key += A[1].m_key; + root = 0; + leaf = 2; + for (next = 1; next < n - 1; next++) + { + if (leaf >= n || A[root].m_key < A[leaf].m_key) + { + A[next].m_key = A[root].m_key; + A[root++].m_key = (mz_uint16)next; + } + else + A[next].m_key = A[leaf++].m_key; + if (leaf >= n || (root < next && A[root].m_key < A[leaf].m_key)) + { + A[next].m_key = (mz_uint16)(A[next].m_key + A[root].m_key); + A[root++].m_key = (mz_uint16)next; + } + else + A[next].m_key = (mz_uint16)(A[next].m_key + A[leaf++].m_key); + } + A[n - 2].m_key = 0; + for (next = n - 3; next >= 0; next--) + A[next].m_key = A[A[next].m_key].m_key + 1; + avbl = 1; + used = dpth = 0; + root = n - 2; + next = n - 1; + while (avbl > 0) + { + while (root >= 0 && (int)A[root].m_key == dpth) + { + used++; + root--; + } + while (avbl > used) + { + A[next--].m_key = (mz_uint16)(dpth); + avbl--; + } + avbl = 2 * used; + dpth++; + used = 0; + } +} + +/* Limits canonical Huffman code table's max code size. */ +enum +{ + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32 +}; +static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_len, int max_code_size) +{ + int i; + mz_uint32 total = 0; + if (code_list_len <= 1) + return; + for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++) + pNum_codes[max_code_size] += pNum_codes[i]; + for (i = max_code_size; i > 0; i--) + total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i)); + while (total != (1UL << max_code_size)) + { + pNum_codes[max_code_size]--; + for (i = max_code_size - 1; i > 0; i--) + if (pNum_codes[i]) + { + pNum_codes[i]--; + pNum_codes[i + 1] += 2; + break; + } + total--; + } +} + +static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int table_len, int code_size_limit, int static_table) +{ + int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE]; + mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1]; + MZ_CLEAR_OBJ(num_codes); + if (static_table) + { + for (i = 0; i < table_len; i++) + num_codes[d->m_huff_code_sizes[table_num][i]]++; + } + else + { + tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms; + int num_used_syms = 0; + const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0]; + for (i = 0; i < table_len; i++) + if (pSym_count[i]) + { + syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i]; + syms0[num_used_syms++].m_sym_index = (mz_uint16)i; + } + + pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1); + tdefl_calculate_minimum_redundancy(pSyms, num_used_syms); + + for (i = 0; i < num_used_syms; i++) + num_codes[pSyms[i].m_key]++; + + tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms, code_size_limit); + + MZ_CLEAR_OBJ(d->m_huff_code_sizes[table_num]); + MZ_CLEAR_OBJ(d->m_huff_codes[table_num]); + for (i = 1, j = num_used_syms; i <= code_size_limit; i++) + for (l = num_codes[i]; l > 0; l--) + d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i); + } + + next_code[1] = 0; + for (j = 0, i = 2; i <= code_size_limit; i++) + next_code[i] = j = ((j + num_codes[i - 1]) << 1); + + for (i = 0; i < table_len; i++) + { + mz_uint rev_code = 0, code, code_size; + if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0) + continue; + code = next_code[code_size]++; + for (l = code_size; l > 0; l--, code >>= 1) + rev_code = (rev_code << 1) | (code & 1); + d->m_huff_codes[table_num][i] = (mz_uint16)rev_code; + } +} + +#define TDEFL_PUT_BITS(b, l) \ + do \ + { \ + mz_uint bits = b; \ + mz_uint len = l; \ + MZ_ASSERT(bits <= ((1U << len) - 1U)); \ + d->m_bit_buffer |= (bits << d->m_bits_in); \ + d->m_bits_in += len; \ + while (d->m_bits_in >= 8) \ + { \ + if (d->m_pOutput_buf < d->m_pOutput_buf_end) \ + *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \ + d->m_bit_buffer >>= 8; \ + d->m_bits_in -= 8; \ + } \ + } \ + MZ_MACRO_END + +#define TDEFL_RLE_PREV_CODE_SIZE() \ + { \ + if (rle_repeat_count) \ + { \ + if (rle_repeat_count < 3) \ + { \ + d->m_huff_count[2][prev_code_size] = (mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \ + while (rle_repeat_count--) \ + packed_code_sizes[num_packed_code_sizes++] = prev_code_size; \ + } \ + else \ + { \ + d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 16; \ + packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_repeat_count - 3); \ + } \ + rle_repeat_count = 0; \ + } \ + } + +#define TDEFL_RLE_ZERO_CODE_SIZE() \ + { \ + if (rle_z_count) \ + { \ + if (rle_z_count < 3) \ + { \ + d->m_huff_count[2][0] = (mz_uint16)(d->m_huff_count[2][0] + rle_z_count); \ + while (rle_z_count--) \ + packed_code_sizes[num_packed_code_sizes++] = 0; \ + } \ + else if (rle_z_count <= 10) \ + { \ + d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 17; \ + packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 3); \ + } \ + else \ + { \ + d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1); \ + packed_code_sizes[num_packed_code_sizes++] = 18; \ + packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 11); \ + } \ + rle_z_count = 0; \ + } \ + } + +static mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; + +static void tdefl_start_dynamic_block(tdefl_compressor *d) +{ + int num_lit_codes, num_dist_codes, num_bit_lengths; + mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index; + mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF; + + d->m_huff_count[0][256] = 1; + + tdefl_optimize_huffman_table(d, 0, TDEFL_MAX_HUFF_SYMBOLS_0, 15, MZ_FALSE); + tdefl_optimize_huffman_table(d, 1, TDEFL_MAX_HUFF_SYMBOLS_1, 15, MZ_FALSE); + + for (num_lit_codes = 286; num_lit_codes > 257; num_lit_codes--) + if (d->m_huff_code_sizes[0][num_lit_codes - 1]) + break; + for (num_dist_codes = 30; num_dist_codes > 1; num_dist_codes--) + if (d->m_huff_code_sizes[1][num_dist_codes - 1]) + break; + + memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes); + memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0], num_dist_codes); + total_code_sizes_to_pack = num_lit_codes + num_dist_codes; + num_packed_code_sizes = 0; + rle_z_count = 0; + rle_repeat_count = 0; + + memset(&d->m_huff_count[2][0], 0, sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2); + for (i = 0; i < total_code_sizes_to_pack; i++) + { + mz_uint8 code_size = code_sizes_to_pack[i]; + if (!code_size) + { + TDEFL_RLE_PREV_CODE_SIZE(); + if (++rle_z_count == 138) + { + TDEFL_RLE_ZERO_CODE_SIZE(); + } + } + else + { + TDEFL_RLE_ZERO_CODE_SIZE(); + if (code_size != prev_code_size) + { + TDEFL_RLE_PREV_CODE_SIZE(); + d->m_huff_count[2][code_size] = (mz_uint16)(d->m_huff_count[2][code_size] + 1); + packed_code_sizes[num_packed_code_sizes++] = code_size; + } + else if (++rle_repeat_count == 6) + { + TDEFL_RLE_PREV_CODE_SIZE(); + } + } + prev_code_size = code_size; + } + if (rle_repeat_count) + { + TDEFL_RLE_PREV_CODE_SIZE(); + } + else + { + TDEFL_RLE_ZERO_CODE_SIZE(); + } + + tdefl_optimize_huffman_table(d, 2, TDEFL_MAX_HUFF_SYMBOLS_2, 7, MZ_FALSE); + + TDEFL_PUT_BITS(2, 2); + + TDEFL_PUT_BITS(num_lit_codes - 257, 5); + TDEFL_PUT_BITS(num_dist_codes - 1, 5); + + for (num_bit_lengths = 18; num_bit_lengths >= 0; num_bit_lengths--) + if (d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[num_bit_lengths]]) + break; + num_bit_lengths = MZ_MAX(4, (num_bit_lengths + 1)); + TDEFL_PUT_BITS(num_bit_lengths - 4, 4); + for (i = 0; (int)i < num_bit_lengths; i++) + TDEFL_PUT_BITS(d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[i]], 3); + + for (packed_code_sizes_index = 0; packed_code_sizes_index < num_packed_code_sizes;) + { + mz_uint code = packed_code_sizes[packed_code_sizes_index++]; + MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2); + TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]); + if (code >= 16) + TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], "\02\03\07"[code - 16]); + } +} + +static void tdefl_start_static_block(tdefl_compressor *d) +{ + mz_uint i; + mz_uint8 *p = &d->m_huff_code_sizes[0][0]; + + for (i = 0; i <= 143; ++i) + *p++ = 8; + for (; i <= 255; ++i) + *p++ = 9; + for (; i <= 279; ++i) + *p++ = 7; + for (; i <= 287; ++i) + *p++ = 8; + + memset(d->m_huff_code_sizes[1], 5, 32); + + tdefl_optimize_huffman_table(d, 0, 288, 15, MZ_TRUE); + tdefl_optimize_huffman_table(d, 1, 32, 15, MZ_TRUE); + + TDEFL_PUT_BITS(1, 2); +} + +static const mz_uint mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF }; + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS +static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) +{ + mz_uint flags; + mz_uint8 *pLZ_codes; + mz_uint8 *pOutput_buf = d->m_pOutput_buf; + mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf; + mz_uint64 bit_buffer = d->m_bit_buffer; + mz_uint bits_in = d->m_bits_in; + +#define TDEFL_PUT_BITS_FAST(b, l) \ + { \ + bit_buffer |= (((mz_uint64)(b)) << bits_in); \ + bits_in += (l); \ + } + + flags = 1; + for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; flags >>= 1) + { + if (flags == 1) + flags = *pLZ_codes++ | 0x100; + + if (flags & 1) + { + mz_uint s0, s1, n0, n1, sym, num_extra_bits; + mz_uint match_len = pLZ_codes[0], match_dist = *(const mz_uint16 *)(pLZ_codes + 1); + pLZ_codes += 3; + + MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]); + + /* This sequence coaxes MSVC into using cmov's vs. jmp's. */ + s0 = s_tdefl_small_dist_sym[match_dist & 511]; + n0 = s_tdefl_small_dist_extra[match_dist & 511]; + s1 = s_tdefl_large_dist_sym[match_dist >> 8]; + n1 = s_tdefl_large_dist_extra[match_dist >> 8]; + sym = (match_dist < 512) ? s0 : s1; + num_extra_bits = (match_dist < 512) ? n0 : n1; + + MZ_ASSERT(d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits); + } + else + { + mz_uint lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]); + + if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end)) + { + flags >>= 1; + lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]); + + if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end)) + { + flags >>= 1; + lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]); + } + } + } + + if (pOutput_buf >= d->m_pOutput_buf_end) + return MZ_FALSE; + + *(mz_uint64 *)pOutput_buf = bit_buffer; + pOutput_buf += (bits_in >> 3); + bit_buffer >>= (bits_in & ~7); + bits_in &= 7; + } + +#undef TDEFL_PUT_BITS_FAST + + d->m_pOutput_buf = pOutput_buf; + d->m_bits_in = 0; + d->m_bit_buffer = 0; + + while (bits_in) + { + mz_uint32 n = MZ_MIN(bits_in, 16); + TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n); + bit_buffer >>= n; + bits_in -= n; + } + + TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]); + + return (d->m_pOutput_buf < d->m_pOutput_buf_end); +} +#else +static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d) +{ + mz_uint flags; + mz_uint8 *pLZ_codes; + + flags = 1; + for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; flags >>= 1) + { + if (flags == 1) + flags = *pLZ_codes++ | 0x100; + if (flags & 1) + { + mz_uint sym, num_extra_bits; + mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8)); + pLZ_codes += 3; + + MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]); + TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]); + + if (match_dist < 512) + { + sym = s_tdefl_small_dist_sym[match_dist]; + num_extra_bits = s_tdefl_small_dist_extra[match_dist]; + } + else + { + sym = s_tdefl_large_dist_sym[match_dist >> 8]; + num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8]; + } + MZ_ASSERT(d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]); + TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits); + } + else + { + mz_uint lit = *pLZ_codes++; + MZ_ASSERT(d->m_huff_code_sizes[0][lit]); + TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]); + } + } + + TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]); + + return (d->m_pOutput_buf < d->m_pOutput_buf_end); +} +#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS */ + +static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block) +{ + if (static_block) + tdefl_start_static_block(d); + else + tdefl_start_dynamic_block(d); + return tdefl_compress_lz_codes(d); +} + +static int tdefl_flush_block(tdefl_compressor *d, int flush) +{ + mz_uint saved_bit_buf, saved_bits_in; + mz_uint8 *pSaved_output_buf; + mz_bool comp_block_succeeded = MZ_FALSE; + int n, use_raw_block = ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size; + mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf; + + d->m_pOutput_buf = pOutput_buf_start; + d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16; + + MZ_ASSERT(!d->m_output_flush_remaining); + d->m_output_flush_ofs = 0; + d->m_output_flush_remaining = 0; + + *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left); + d->m_pLZ_code_buf -= (d->m_num_flags_left == 8); + + if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index)) + { + TDEFL_PUT_BITS(0x78, 8); + TDEFL_PUT_BITS(0x01, 8); + } + + TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1); + + pSaved_output_buf = d->m_pOutput_buf; + saved_bit_buf = d->m_bit_buffer; + saved_bits_in = d->m_bits_in; + + if (!use_raw_block) + comp_block_succeeded = tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) || (d->m_total_lz_bytes < 48)); + + /* If the block gets expanded, forget the current contents of the output buffer and send a raw block instead. */ + if (((use_raw_block) || ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= d->m_total_lz_bytes))) && + ((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size)) + { + mz_uint i; + d->m_pOutput_buf = pSaved_output_buf; + d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in; + TDEFL_PUT_BITS(0, 2); + if (d->m_bits_in) + { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF) + { + TDEFL_PUT_BITS(d->m_total_lz_bytes & 0xFFFF, 16); + } + for (i = 0; i < d->m_total_lz_bytes; ++i) + { + TDEFL_PUT_BITS(d->m_dict[(d->m_lz_code_buf_dict_pos + i) & TDEFL_LZ_DICT_SIZE_MASK], 8); + } + } + /* Check for the extremely unlikely (if not impossible) case of the compressed block not fitting into the output buffer when using dynamic codes. */ + else if (!comp_block_succeeded) + { + d->m_pOutput_buf = pSaved_output_buf; + d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in; + tdefl_compress_block(d, MZ_TRUE); + } + + if (flush) + { + if (flush == TDEFL_FINISH) + { + if (d->m_bits_in) + { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER) + { + mz_uint i, a = d->m_adler32; + for (i = 0; i < 4; i++) + { + TDEFL_PUT_BITS((a >> 24) & 0xFF, 8); + a <<= 8; + } + } + } + else + { + mz_uint i, z = 0; + TDEFL_PUT_BITS(0, 3); + if (d->m_bits_in) + { + TDEFL_PUT_BITS(0, 8 - d->m_bits_in); + } + for (i = 2; i; --i, z ^= 0xFFFF) + { + TDEFL_PUT_BITS(z & 0xFFFF, 16); + } + } + } + + MZ_ASSERT(d->m_pOutput_buf < d->m_pOutput_buf_end); + + memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0); + memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1); + + d->m_pLZ_code_buf = d->m_lz_code_buf + 1; + d->m_pLZ_flags = d->m_lz_code_buf; + d->m_num_flags_left = 8; + d->m_lz_code_buf_dict_pos += d->m_total_lz_bytes; + d->m_total_lz_bytes = 0; + d->m_block_index++; + + if ((n = (int)(d->m_pOutput_buf - pOutput_buf_start)) != 0) + { + if (d->m_pPut_buf_func) + { + *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf; + if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user)) + return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED); + } + else if (pOutput_buf_start == d->m_output_buf) + { + int bytes_to_copy = (int)MZ_MIN((size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs)); + memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy); + d->m_out_buf_ofs += bytes_to_copy; + if ((n -= bytes_to_copy) != 0) + { + d->m_output_flush_ofs = bytes_to_copy; + d->m_output_flush_remaining = n; + } + } + else + { + d->m_out_buf_ofs += n; + } + } + + return d->m_output_flush_remaining; +} + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES +#ifdef MINIZ_UNALIGNED_USE_MEMCPY +static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8* p) +{ + mz_uint16 ret; + memcpy(&ret, p, sizeof(mz_uint16)); + return ret; +} +static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16* p) +{ + mz_uint16 ret; + memcpy(&ret, p, sizeof(mz_uint16)); + return ret; +} +#else +#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p) +#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p) +#endif +static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len) +{ + mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len; + mz_uint num_probes_left = d->m_max_probes[match_len >= 32]; + const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q; + mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD2(s); + MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); + if (max_match_len <= match_len) + return; + for (;;) + { + for (;;) + { + if (--num_probes_left == 0) + return; +#define TDEFL_PROBE \ + next_probe_pos = d->m_next[probe_pos]; \ + if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \ + return; \ + probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \ + if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) \ + break; + TDEFL_PROBE; + TDEFL_PROBE; + TDEFL_PROBE; + } + if (!dist) + break; + q = (const mz_uint16 *)(d->m_dict + probe_pos); + if (TDEFL_READ_UNALIGNED_WORD2(q) != s01) + continue; + p = s; + probe_len = 32; + do + { + } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0)); + if (!probe_len) + { + *pMatch_dist = dist; + *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN); + break; + } + else if ((probe_len = ((mz_uint)(p - s) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q)) > match_len) + { + *pMatch_dist = dist; + if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == max_match_len) + break; + c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]); + } + } +} +#else +static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len) +{ + mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len; + mz_uint num_probes_left = d->m_max_probes[match_len >= 32]; + const mz_uint8 *s = d->m_dict + pos, *p, *q; + mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1]; + MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); + if (max_match_len <= match_len) + return; + for (;;) + { + for (;;) + { + if (--num_probes_left == 0) + return; +#define TDEFL_PROBE \ + next_probe_pos = d->m_next[probe_pos]; \ + if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \ + return; \ + probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \ + if ((d->m_dict[probe_pos + match_len] == c0) && (d->m_dict[probe_pos + match_len - 1] == c1)) \ + break; + TDEFL_PROBE; + TDEFL_PROBE; + TDEFL_PROBE; + } + if (!dist) + break; + p = s; + q = d->m_dict + probe_pos; + for (probe_len = 0; probe_len < max_match_len; probe_len++) + if (*p++ != *q++) + break; + if (probe_len > match_len) + { + *pMatch_dist = dist; + if ((*pMatch_len = match_len = probe_len) == max_match_len) + return; + c0 = d->m_dict[pos + match_len]; + c1 = d->m_dict[pos + match_len - 1]; + } + } +} +#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */ + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN +#ifdef MINIZ_UNALIGNED_USE_MEMCPY +static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8* p) +{ + mz_uint32 ret; + memcpy(&ret, p, sizeof(mz_uint32)); + return ret; +} +#else +#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p) +#endif +static mz_bool tdefl_compress_fast(tdefl_compressor *d) +{ + /* Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio. */ + mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left; + mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags; + mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK; + + while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size))) + { + const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096; + mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK; + mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size); + d->m_src_buf_left -= num_bytes_to_process; + lookahead_size += num_bytes_to_process; + + while (num_bytes_to_process) + { + mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process); + memcpy(d->m_dict + dst_pos, d->m_pSrc, n); + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos)); + d->m_pSrc += n; + dst_pos = (dst_pos + n) & TDEFL_LZ_DICT_SIZE_MASK; + num_bytes_to_process -= n; + } + + dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - lookahead_size, dict_size); + if ((!d->m_flush) && (lookahead_size < TDEFL_COMP_FAST_LOOKAHEAD_SIZE)) + break; + + while (lookahead_size >= 4) + { + mz_uint cur_match_dist, cur_match_len = 1; + mz_uint8 *pCur_dict = d->m_dict + cur_pos; + mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF; + mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK; + mz_uint probe_pos = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)lookahead_pos; + + if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((TDEFL_READ_UNALIGNED_WORD32(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram)) + { + const mz_uint16 *p = (const mz_uint16 *)pCur_dict; + const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos); + mz_uint32 probe_len = 32; + do + { + } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && + (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0)); + cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q); + if (!probe_len) + cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0; + + if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || ((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U))) + { + cur_match_len = 1; + *pLZ_code_buf++ = (mz_uint8)first_trigram; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + d->m_huff_count[0][(mz_uint8)first_trigram]++; + } + else + { + mz_uint32 s0, s1; + cur_match_len = MZ_MIN(cur_match_len, lookahead_size); + + MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 1) && (cur_match_dist <= TDEFL_LZ_DICT_SIZE)); + + cur_match_dist--; + + pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN); +#ifdef MINIZ_UNALIGNED_USE_MEMCPY + memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist)); +#else + *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist; +#endif + pLZ_code_buf += 3; + *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80); + + s0 = s_tdefl_small_dist_sym[cur_match_dist & 511]; + s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8]; + d->m_huff_count[1][(cur_match_dist < 512) ? s0 : s1]++; + + d->m_huff_count[0][s_tdefl_len_sym[cur_match_len - TDEFL_MIN_MATCH_LEN]]++; + } + } + else + { + *pLZ_code_buf++ = (mz_uint8)first_trigram; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + d->m_huff_count[0][(mz_uint8)first_trigram]++; + } + + if (--num_flags_left == 0) + { + num_flags_left = 8; + pLZ_flags = pLZ_code_buf++; + } + + total_lz_bytes += cur_match_len; + lookahead_pos += cur_match_len; + dict_size = MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE); + cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK; + MZ_ASSERT(lookahead_size >= cur_match_len); + lookahead_size -= cur_match_len; + + if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) + { + int n; + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + total_lz_bytes = d->m_total_lz_bytes; + pLZ_code_buf = d->m_pLZ_code_buf; + pLZ_flags = d->m_pLZ_flags; + num_flags_left = d->m_num_flags_left; + } + } + + while (lookahead_size) + { + mz_uint8 lit = d->m_dict[cur_pos]; + + total_lz_bytes++; + *pLZ_code_buf++ = lit; + *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1); + if (--num_flags_left == 0) + { + num_flags_left = 8; + pLZ_flags = pLZ_code_buf++; + } + + d->m_huff_count[0][lit]++; + + lookahead_pos++; + dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE); + cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK; + lookahead_size--; + + if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) + { + int n; + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + total_lz_bytes = d->m_total_lz_bytes; + pLZ_code_buf = d->m_pLZ_code_buf; + pLZ_flags = d->m_pLZ_flags; + num_flags_left = d->m_num_flags_left; + } + } + } + + d->m_lookahead_pos = lookahead_pos; + d->m_lookahead_size = lookahead_size; + d->m_dict_size = dict_size; + d->m_total_lz_bytes = total_lz_bytes; + d->m_pLZ_code_buf = pLZ_code_buf; + d->m_pLZ_flags = pLZ_flags; + d->m_num_flags_left = num_flags_left; + return MZ_TRUE; +} +#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */ + +static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, mz_uint8 lit) +{ + d->m_total_lz_bytes++; + *d->m_pLZ_code_buf++ = lit; + *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1); + if (--d->m_num_flags_left == 0) + { + d->m_num_flags_left = 8; + d->m_pLZ_flags = d->m_pLZ_code_buf++; + } + d->m_huff_count[0][lit]++; +} + +static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist) +{ + mz_uint32 s0, s1; + + MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && (match_dist <= TDEFL_LZ_DICT_SIZE)); + + d->m_total_lz_bytes += match_len; + + d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN); + + match_dist -= 1; + d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF); + d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8); + d->m_pLZ_code_buf += 3; + + *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80); + if (--d->m_num_flags_left == 0) + { + d->m_num_flags_left = 8; + d->m_pLZ_flags = d->m_pLZ_code_buf++; + } + + s0 = s_tdefl_small_dist_sym[match_dist & 511]; + s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127]; + d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++; + + if (match_len >= TDEFL_MIN_MATCH_LEN) + d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++; +} + +static mz_bool tdefl_compress_normal(tdefl_compressor *d) +{ + const mz_uint8 *pSrc = d->m_pSrc; + size_t src_buf_left = d->m_src_buf_left; + tdefl_flush flush = d->m_flush; + + while ((src_buf_left) || ((flush) && (d->m_lookahead_size))) + { + mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos; + /* Update dictionary and hash chains. Keeps the lookahead size equal to TDEFL_MAX_MATCH_LEN. */ + if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1)) + { + mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2; + mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK]; + mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size); + const mz_uint8 *pSrc_end = pSrc + num_bytes_to_process; + src_buf_left -= num_bytes_to_process; + d->m_lookahead_size += num_bytes_to_process; + while (pSrc != pSrc_end) + { + mz_uint8 c = *pSrc++; + d->m_dict[dst_pos] = c; + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c; + hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1); + d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)(ins_pos); + dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK; + ins_pos++; + } + } + else + { + while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN)) + { + mz_uint8 c = *pSrc++; + mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK; + src_buf_left--; + d->m_dict[dst_pos] = c; + if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) + d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c; + if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN) + { + mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2; + mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1); + d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; + d->m_hash[hash] = (mz_uint16)(ins_pos); + } + } + } + d->m_dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - d->m_lookahead_size, d->m_dict_size); + if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN)) + break; + + /* Simple lazy/greedy parsing state machine. */ + len_to_move = 1; + cur_match_dist = 0; + cur_match_len = d->m_saved_match_len ? d->m_saved_match_len : (TDEFL_MIN_MATCH_LEN - 1); + cur_pos = d->m_lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK; + if (d->m_flags & (TDEFL_RLE_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS)) + { + if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))) + { + mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK]; + cur_match_len = 0; + while (cur_match_len < d->m_lookahead_size) + { + if (d->m_dict[cur_pos + cur_match_len] != c) + break; + cur_match_len++; + } + if (cur_match_len < TDEFL_MIN_MATCH_LEN) + cur_match_len = 0; + else + cur_match_dist = 1; + } + } + else + { + tdefl_find_match(d, d->m_lookahead_pos, d->m_dict_size, d->m_lookahead_size, &cur_match_dist, &cur_match_len); + } + if (((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)) || (cur_pos == cur_match_dist) || ((d->m_flags & TDEFL_FILTER_MATCHES) && (cur_match_len <= 5))) + { + cur_match_dist = cur_match_len = 0; + } + if (d->m_saved_match_len) + { + if (cur_match_len > d->m_saved_match_len) + { + tdefl_record_literal(d, (mz_uint8)d->m_saved_lit); + if (cur_match_len >= 128) + { + tdefl_record_match(d, cur_match_len, cur_match_dist); + d->m_saved_match_len = 0; + len_to_move = cur_match_len; + } + else + { + d->m_saved_lit = d->m_dict[cur_pos]; + d->m_saved_match_dist = cur_match_dist; + d->m_saved_match_len = cur_match_len; + } + } + else + { + tdefl_record_match(d, d->m_saved_match_len, d->m_saved_match_dist); + len_to_move = d->m_saved_match_len - 1; + d->m_saved_match_len = 0; + } + } + else if (!cur_match_dist) + tdefl_record_literal(d, d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]); + else if ((d->m_greedy_parsing) || (d->m_flags & TDEFL_RLE_MATCHES) || (cur_match_len >= 128)) + { + tdefl_record_match(d, cur_match_len, cur_match_dist); + len_to_move = cur_match_len; + } + else + { + d->m_saved_lit = d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]; + d->m_saved_match_dist = cur_match_dist; + d->m_saved_match_len = cur_match_len; + } + /* Move the lookahead forward by len_to_move bytes. */ + d->m_lookahead_pos += len_to_move; + MZ_ASSERT(d->m_lookahead_size >= len_to_move); + d->m_lookahead_size -= len_to_move; + d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE); + /* Check if it's time to flush the current LZ codes to the internal output buffer. */ + if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) || + ((d->m_total_lz_bytes > 31 * 1024) && (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))) + { + int n; + d->m_pSrc = pSrc; + d->m_src_buf_left = src_buf_left; + if ((n = tdefl_flush_block(d, 0)) != 0) + return (n < 0) ? MZ_FALSE : MZ_TRUE; + } + } + + d->m_pSrc = pSrc; + d->m_src_buf_left = src_buf_left; + return MZ_TRUE; +} + +static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d) +{ + if (d->m_pIn_buf_size) + { + *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf; + } + + if (d->m_pOut_buf_size) + { + size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, d->m_output_flush_remaining); + memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n); + d->m_output_flush_ofs += (mz_uint)n; + d->m_output_flush_remaining -= (mz_uint)n; + d->m_out_buf_ofs += n; + + *d->m_pOut_buf_size = d->m_out_buf_ofs; + } + + return (d->m_finished && !d->m_output_flush_remaining) ? TDEFL_STATUS_DONE : TDEFL_STATUS_OKAY; +} + +tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush) +{ + if (!d) + { + if (pIn_buf_size) + *pIn_buf_size = 0; + if (pOut_buf_size) + *pOut_buf_size = 0; + return TDEFL_STATUS_BAD_PARAM; + } + + d->m_pIn_buf = pIn_buf; + d->m_pIn_buf_size = pIn_buf_size; + d->m_pOut_buf = pOut_buf; + d->m_pOut_buf_size = pOut_buf_size; + d->m_pSrc = (const mz_uint8 *)(pIn_buf); + d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0; + d->m_out_buf_ofs = 0; + d->m_flush = flush; + + if (((d->m_pPut_buf_func != NULL) == ((pOut_buf != NULL) || (pOut_buf_size != NULL))) || (d->m_prev_return_status != TDEFL_STATUS_OKAY) || + (d->m_wants_to_finish && (flush != TDEFL_FINISH)) || (pIn_buf_size && *pIn_buf_size && !pIn_buf) || (pOut_buf_size && *pOut_buf_size && !pOut_buf)) + { + if (pIn_buf_size) + *pIn_buf_size = 0; + if (pOut_buf_size) + *pOut_buf_size = 0; + return (d->m_prev_return_status = TDEFL_STATUS_BAD_PARAM); + } + d->m_wants_to_finish |= (flush == TDEFL_FINISH); + + if ((d->m_output_flush_remaining) || (d->m_finished)) + return (d->m_prev_return_status = tdefl_flush_output_buffer(d)); + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN + if (((d->m_flags & TDEFL_MAX_PROBES_MASK) == 1) && + ((d->m_flags & TDEFL_GREEDY_PARSING_FLAG) != 0) && + ((d->m_flags & (TDEFL_FILTER_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS | TDEFL_RLE_MATCHES)) == 0)) + { + if (!tdefl_compress_fast(d)) + return d->m_prev_return_status; + } + else +#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */ + { + if (!tdefl_compress_normal(d)) + return d->m_prev_return_status; + } + + if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && (pIn_buf)) + d->m_adler32 = (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, d->m_pSrc - (const mz_uint8 *)pIn_buf); + + if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && (!d->m_output_flush_remaining)) + { + if (tdefl_flush_block(d, flush) < 0) + return d->m_prev_return_status; + d->m_finished = (flush == TDEFL_FINISH); + if (flush == TDEFL_FULL_FLUSH) + { + MZ_CLEAR_OBJ(d->m_hash); + MZ_CLEAR_OBJ(d->m_next); + d->m_dict_size = 0; + } + } + + return (d->m_prev_return_status = tdefl_flush_output_buffer(d)); +} + +tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush) +{ + MZ_ASSERT(d->m_pPut_buf_func); + return tdefl_compress(d, pIn_buf, &in_buf_size, NULL, NULL, flush); +} + +tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags) +{ + d->m_pPut_buf_func = pPut_buf_func; + d->m_pPut_buf_user = pPut_buf_user; + d->m_flags = (mz_uint)(flags); + d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3; + d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0; + d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3; + if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG)) + MZ_CLEAR_OBJ(d->m_hash); + d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0; + d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished = d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0; + d->m_pLZ_code_buf = d->m_lz_code_buf + 1; + d->m_pLZ_flags = d->m_lz_code_buf; + d->m_num_flags_left = 8; + d->m_pOutput_buf = d->m_output_buf; + d->m_pOutput_buf_end = d->m_output_buf; + d->m_prev_return_status = TDEFL_STATUS_OKAY; + d->m_saved_match_dist = d->m_saved_match_len = d->m_saved_lit = 0; + d->m_adler32 = 1; + d->m_pIn_buf = NULL; + d->m_pOut_buf = NULL; + d->m_pIn_buf_size = NULL; + d->m_pOut_buf_size = NULL; + d->m_flush = TDEFL_NO_FLUSH; + d->m_pSrc = NULL; + d->m_src_buf_left = 0; + d->m_out_buf_ofs = 0; + if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG)) + MZ_CLEAR_OBJ(d->m_dict); + memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0); + memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1); + return TDEFL_STATUS_OKAY; +} + +tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d) +{ + return d->m_prev_return_status; +} + +mz_uint32 tdefl_get_adler32(tdefl_compressor *d) +{ + return d->m_adler32; +} + +mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags) +{ + tdefl_compressor *pComp; + mz_bool succeeded; + if (((buf_len) && (!pBuf)) || (!pPut_buf_func)) + return MZ_FALSE; + pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); + if (!pComp) + return MZ_FALSE; + succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == TDEFL_STATUS_OKAY); + succeeded = succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == TDEFL_STATUS_DONE); + MZ_FREE(pComp); + return succeeded; +} + +typedef struct +{ + size_t m_size, m_capacity; + mz_uint8 *m_pBuf; + mz_bool m_expandable; +} tdefl_output_buffer; + +static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser) +{ + tdefl_output_buffer *p = (tdefl_output_buffer *)pUser; + size_t new_size = p->m_size + len; + if (new_size > p->m_capacity) + { + size_t new_capacity = p->m_capacity; + mz_uint8 *pNew_buf; + if (!p->m_expandable) + return MZ_FALSE; + do + { + new_capacity = MZ_MAX(128U, new_capacity << 1U); + } while (new_size > new_capacity); + pNew_buf = (mz_uint8 *)MZ_REALLOC(p->m_pBuf, new_capacity); + if (!pNew_buf) + return MZ_FALSE; + p->m_pBuf = pNew_buf; + p->m_capacity = new_capacity; + } + memcpy((mz_uint8 *)p->m_pBuf + p->m_size, pBuf, len); + p->m_size = new_size; + return MZ_TRUE; +} + +void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags) +{ + tdefl_output_buffer out_buf; + MZ_CLEAR_OBJ(out_buf); + if (!pOut_len) + return MZ_FALSE; + else + *pOut_len = 0; + out_buf.m_expandable = MZ_TRUE; + if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags)) + return NULL; + *pOut_len = out_buf.m_size; + return out_buf.m_pBuf; +} + +size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags) +{ + tdefl_output_buffer out_buf; + MZ_CLEAR_OBJ(out_buf); + if (!pOut_buf) + return 0; + out_buf.m_pBuf = (mz_uint8 *)pOut_buf; + out_buf.m_capacity = out_buf_len; + if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags)) + return 0; + return out_buf.m_size; +} + +static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 }; + +/* level may actually range from [0,10] (10 is a "hidden" max level, where we want a bit more compression and it's fine if throughput to fall off a cliff on some files). */ +mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy) +{ + mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0); + if (window_bits > 0) + comp_flags |= TDEFL_WRITE_ZLIB_HEADER; + + if (!level) + comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS; + else if (strategy == MZ_FILTERED) + comp_flags |= TDEFL_FILTER_MATCHES; + else if (strategy == MZ_HUFFMAN_ONLY) + comp_flags &= ~TDEFL_MAX_PROBES_MASK; + else if (strategy == MZ_FIXED) + comp_flags |= TDEFL_FORCE_ALL_STATIC_BLOCKS; + else if (strategy == MZ_RLE) + comp_flags |= TDEFL_RLE_MATCHES; + + return comp_flags; +} + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4204) /* nonstandard extension used : non-constant aggregate initializer (also supported by GNU C and C99, so no big deal) */ +#endif + +/* Simple PNG writer function by Alex Evans, 2011. Released into the public domain: https://gist.github.com/908299, more context at + http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/. + This is actually a modification of Alex's original code so PNG files generated by this function pass pngcheck. */ +void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip) +{ + /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was defined. */ + static const mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 }; + tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); + tdefl_output_buffer out_buf; + int i, bpl = w * num_chans, y, z; + mz_uint32 c; + *pLen_out = 0; + if (!pComp) + return NULL; + MZ_CLEAR_OBJ(out_buf); + out_buf.m_expandable = MZ_TRUE; + out_buf.m_capacity = 57 + MZ_MAX(64, (1 + bpl) * h); + if (NULL == (out_buf.m_pBuf = (mz_uint8 *)MZ_MALLOC(out_buf.m_capacity))) + { + MZ_FREE(pComp); + return NULL; + } + /* write dummy header */ + for (z = 41; z; --z) + tdefl_output_buffer_putter(&z, 1, &out_buf); + /* compress image data */ + tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf, s_tdefl_png_num_probes[MZ_MIN(10, level)] | TDEFL_WRITE_ZLIB_HEADER); + for (y = 0; y < h; ++y) + { + tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH); + tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH); + } + if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE) + { + MZ_FREE(pComp); + MZ_FREE(out_buf.m_pBuf); + return NULL; + } + /* write real header */ + *pLen_out = out_buf.m_size - 41; + { + static const mz_uint8 chans[] = { 0x00, 0x00, 0x04, 0x02, 0x06 }; + mz_uint8 pnghdr[41] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, + 0x0a, 0x1a, 0x0a, 0x00, 0x00, + 0x00, 0x0d, 0x49, 0x48, 0x44, + 0x52, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x44, 0x41, + 0x54 }; + pnghdr[18] = (mz_uint8)(w >> 8); + pnghdr[19] = (mz_uint8)w; + pnghdr[22] = (mz_uint8)(h >> 8); + pnghdr[23] = (mz_uint8)h; + pnghdr[25] = chans[num_chans]; + pnghdr[33] = (mz_uint8)(*pLen_out >> 24); + pnghdr[34] = (mz_uint8)(*pLen_out >> 16); + pnghdr[35] = (mz_uint8)(*pLen_out >> 8); + pnghdr[36] = (mz_uint8)*pLen_out; + c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17); + for (i = 0; i < 4; ++i, c <<= 8) + ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24); + memcpy(out_buf.m_pBuf, pnghdr, 41); + } + /* write footer (IDAT CRC-32, followed by IEND chunk) */ + if (!tdefl_output_buffer_putter("\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf)) + { + *pLen_out = 0; + MZ_FREE(pComp); + MZ_FREE(out_buf.m_pBuf); + return NULL; + } + c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, out_buf.m_pBuf + 41 - 4, *pLen_out + 4); + for (i = 0; i < 4; ++i, c <<= 8) + (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24); + /* compute final size of file, grab compressed data buffer and return */ + *pLen_out += 57; + MZ_FREE(pComp); + return out_buf.m_pBuf; +} +void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out) +{ + /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's where #defined out) */ + return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans, pLen_out, 6, MZ_FALSE); +} + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that */ +/* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +tdefl_compressor *tdefl_compressor_alloc() +{ + return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); +} + +void tdefl_compressor_free(tdefl_compressor *pComp) +{ + MZ_FREE(pComp); +} +#endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + +#ifdef __cplusplus +} +#endif +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + + + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- Low-level Decompression (completely independent from all compression API's) */ + +#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l) +#define TINFL_MEMSET(p, c, l) memset(p, c, l) + +#define TINFL_CR_BEGIN \ + switch (r->m_state) \ + { \ + case 0: +#define TINFL_CR_RETURN(state_index, result) \ + do \ + { \ + status = result; \ + r->m_state = state_index; \ + goto common_exit; \ + case state_index:; \ + } \ + MZ_MACRO_END +#define TINFL_CR_RETURN_FOREVER(state_index, result) \ + do \ + { \ + for (;;) \ + { \ + TINFL_CR_RETURN(state_index, result); \ + } \ + } \ + MZ_MACRO_END +#define TINFL_CR_FINISH } + +#define TINFL_GET_BYTE(state_index, c) \ + do \ + { \ + while (pIn_buf_cur >= pIn_buf_end) \ + { \ + TINFL_CR_RETURN(state_index, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); \ + } \ + c = *pIn_buf_cur++; \ + } \ + MZ_MACRO_END + +#define TINFL_NEED_BITS(state_index, n) \ + do \ + { \ + mz_uint c; \ + TINFL_GET_BYTE(state_index, c); \ + bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \ + num_bits += 8; \ + } while (num_bits < (mz_uint)(n)) +#define TINFL_SKIP_BITS(state_index, n) \ + do \ + { \ + if (num_bits < (mz_uint)(n)) \ + { \ + TINFL_NEED_BITS(state_index, n); \ + } \ + bit_buf >>= (n); \ + num_bits -= (n); \ + } \ + MZ_MACRO_END +#define TINFL_GET_BITS(state_index, b, n) \ + do \ + { \ + if (num_bits < (mz_uint)(n)) \ + { \ + TINFL_NEED_BITS(state_index, n); \ + } \ + b = bit_buf & ((1 << (n)) - 1); \ + bit_buf >>= (n); \ + num_bits -= (n); \ + } \ + MZ_MACRO_END + +/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */ +/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */ +/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */ +/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */ +#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff) \ + do \ + { \ + temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]; \ + if (temp >= 0) \ + { \ + code_len = temp >> 9; \ + if ((code_len) && (num_bits >= code_len)) \ + break; \ + } \ + else if (num_bits > TINFL_FAST_LOOKUP_BITS) \ + { \ + code_len = TINFL_FAST_LOOKUP_BITS; \ + do \ + { \ + temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \ + } while ((temp < 0) && (num_bits >= (code_len + 1))); \ + if (temp >= 0) \ + break; \ + } \ + TINFL_GET_BYTE(state_index, c); \ + bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \ + num_bits += 8; \ + } while (num_bits < 15); + +/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */ +/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */ +/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */ +/* The slow path is only executed at the very end of the input buffer. */ +/* v1.16: The original macro handled the case at the very end of the passed-in input buffer, but we also need to handle the case where the user passes in 1+zillion bytes */ +/* following the deflate data and our non-conservative read-ahead path won't kick in here on this code. This is much trickier. */ +#define TINFL_HUFF_DECODE(state_index, sym, pHuff) \ + do \ + { \ + int temp; \ + mz_uint code_len, c; \ + if (num_bits < 15) \ + { \ + if ((pIn_buf_end - pIn_buf_cur) < 2) \ + { \ + TINFL_HUFF_BITBUF_FILL(state_index, pHuff); \ + } \ + else \ + { \ + bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); \ + pIn_buf_cur += 2; \ + num_bits += 16; \ + } \ + } \ + if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) \ + code_len = temp >> 9, temp &= 511; \ + else \ + { \ + code_len = TINFL_FAST_LOOKUP_BITS; \ + do \ + { \ + temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \ + } while (temp < 0); \ + } \ + sym = temp; \ + bit_buf >>= code_len; \ + num_bits -= code_len; \ + } \ + MZ_MACRO_END + +tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags) +{ + static const int s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 }; + static const int s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 }; + static const int s_dist_base[32] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0 }; + static const int s_dist_extra[32] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 }; + static const mz_uint8 s_length_dezigzag[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; + static const int s_min_table_sizes[3] = { 257, 1, 4 }; + + tinfl_status status = TINFL_STATUS_FAILED; + mz_uint32 num_bits, dist, counter, num_extra; + tinfl_bit_buf_t bit_buf; + const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size; + mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size; + size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start; + + /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */ + if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start)) + { + *pIn_buf_size = *pOut_buf_size = 0; + return TINFL_STATUS_BAD_PARAM; + } + + num_bits = r->m_num_bits; + bit_buf = r->m_bit_buf; + dist = r->m_dist; + counter = r->m_counter; + num_extra = r->m_num_extra; + dist_from_out_buf_start = r->m_dist_from_out_buf_start; + TINFL_CR_BEGIN + + bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0; + r->m_z_adler32 = r->m_check_adler32 = 1; + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) + { + TINFL_GET_BYTE(1, r->m_zhdr0); + TINFL_GET_BYTE(2, r->m_zhdr1); + counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8)); + if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) + counter |= (((1ULL << (8ULL + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1ULL << (8ULL + (r->m_zhdr0 >> 4))))); + if (counter) + { + TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED); + } + } + + do + { + TINFL_GET_BITS(3, r->m_final, 3); + r->m_type = r->m_final >> 1; + if (r->m_type == 0) + { + TINFL_SKIP_BITS(5, num_bits & 7); + for (counter = 0; counter < 4; ++counter) + { + if (num_bits) + TINFL_GET_BITS(6, r->m_raw_header[counter], 8); + else + TINFL_GET_BYTE(7, r->m_raw_header[counter]); + } + if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) + { + TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); + } + while ((counter) && (num_bits)) + { + TINFL_GET_BITS(51, dist, 8); + while (pOut_buf_cur >= pOut_buf_end) + { + TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = (mz_uint8)dist; + counter--; + } + while (counter) + { + size_t n; + while (pOut_buf_cur >= pOut_buf_end) + { + TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT); + } + while (pIn_buf_cur >= pIn_buf_end) + { + TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); + } + n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter); + TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); + pIn_buf_cur += n; + pOut_buf_cur += n; + counter -= (mz_uint)n; + } + } + else if (r->m_type == 3) + { + TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED); + } + else + { + if (r->m_type == 1) + { + mz_uint8 *p = r->m_tables[0].m_code_size; + mz_uint i; + r->m_table_sizes[0] = 288; + r->m_table_sizes[1] = 32; + TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32); + for (i = 0; i <= 143; ++i) + *p++ = 8; + for (; i <= 255; ++i) + *p++ = 9; + for (; i <= 279; ++i) + *p++ = 7; + for (; i <= 287; ++i) + *p++ = 8; + } + else + { + for (counter = 0; counter < 3; counter++) + { + TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); + r->m_table_sizes[counter] += s_min_table_sizes[counter]; + } + MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); + for (counter = 0; counter < r->m_table_sizes[2]; counter++) + { + mz_uint s; + TINFL_GET_BITS(14, s, 3); + r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; + } + r->m_table_sizes[2] = 19; + } + for (; (int)r->m_type >= 0; r->m_type--) + { + int tree_next, tree_cur; + tinfl_huff_table *pTable; + mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; + pTable = &r->m_tables[r->m_type]; + MZ_CLEAR_OBJ(total_syms); + MZ_CLEAR_OBJ(pTable->m_look_up); + MZ_CLEAR_OBJ(pTable->m_tree); + for (i = 0; i < r->m_table_sizes[r->m_type]; ++i) + total_syms[pTable->m_code_size[i]]++; + used_syms = 0, total = 0; + next_code[0] = next_code[1] = 0; + for (i = 1; i <= 15; ++i) + { + used_syms += total_syms[i]; + next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); + } + if ((65536 != total) && (used_syms > 1)) + { + TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED); + } + for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index) + { + mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index]; + if (!code_size) + continue; + cur_code = next_code[code_size]++; + for (l = code_size; l > 0; l--, cur_code >>= 1) + rev_code = (rev_code << 1) | (cur_code & 1); + if (code_size <= TINFL_FAST_LOOKUP_BITS) + { + mz_int16 k = (mz_int16)((code_size << 9) | sym_index); + while (rev_code < TINFL_FAST_LOOKUP_SIZE) + { + pTable->m_look_up[rev_code] = k; + rev_code += (1 << code_size); + } + continue; + } + if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) + { + pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next; + tree_cur = tree_next; + tree_next -= 2; + } + rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1); + for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--) + { + tree_cur -= ((rev_code >>= 1) & 1); + if (!pTable->m_tree[-tree_cur - 1]) + { + pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next; + tree_cur = tree_next; + tree_next -= 2; + } + else + tree_cur = pTable->m_tree[-tree_cur - 1]; + } + tree_cur -= ((rev_code >>= 1) & 1); + pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index; + } + if (r->m_type == 2) + { + for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);) + { + mz_uint s; + TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); + if (dist < 16) + { + r->m_len_codes[counter++] = (mz_uint8)dist; + continue; + } + if ((dist == 16) && (!counter)) + { + TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED); + } + num_extra = "\02\03\07"[dist - 16]; + TINFL_GET_BITS(18, s, num_extra); + s += "\03\03\013"[dist - 16]; + TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s); + counter += s; + } + if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter) + { + TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED); + } + TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes, r->m_table_sizes[0]); + TINFL_MEMCPY(r->m_tables[1].m_code_size, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]); + } + } + for (;;) + { + mz_uint8 *pSrc; + for (;;) + { + if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2)) + { + TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]); + if (counter >= 256) + break; + while (pOut_buf_cur >= pOut_buf_end) + { + TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = (mz_uint8)counter; + } + else + { + int sym2; + mz_uint code_len; +#if TINFL_USE_64BIT_BITBUF + if (num_bits < 30) + { + bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 4; + num_bits += 32; + } +#else + if (num_bits < 15) + { + bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 2; + num_bits += 16; + } +#endif + if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) + code_len = sym2 >> 9; + else + { + code_len = TINFL_FAST_LOOKUP_BITS; + do + { + sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; + } while (sym2 < 0); + } + counter = sym2; + bit_buf >>= code_len; + num_bits -= code_len; + if (counter & 256) + break; + +#if !TINFL_USE_64BIT_BITBUF + if (num_bits < 15) + { + bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); + pIn_buf_cur += 2; + num_bits += 16; + } +#endif + if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) + code_len = sym2 >> 9; + else + { + code_len = TINFL_FAST_LOOKUP_BITS; + do + { + sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; + } while (sym2 < 0); + } + bit_buf >>= code_len; + num_bits -= code_len; + + pOut_buf_cur[0] = (mz_uint8)counter; + if (sym2 & 256) + { + pOut_buf_cur++; + counter = sym2; + break; + } + pOut_buf_cur[1] = (mz_uint8)sym2; + pOut_buf_cur += 2; + } + } + if ((counter &= 511) == 256) + break; + + num_extra = s_length_extra[counter - 257]; + counter = s_length_base[counter - 257]; + if (num_extra) + { + mz_uint extra_bits; + TINFL_GET_BITS(25, extra_bits, num_extra); + counter += extra_bits; + } + + TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]); + num_extra = s_dist_extra[dist]; + dist = s_dist_base[dist]; + if (num_extra) + { + mz_uint extra_bits; + TINFL_GET_BITS(27, extra_bits, num_extra); + dist += extra_bits; + } + + dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start; + if ((dist > dist_from_out_buf_start) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) + { + TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED); + } + + pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask); + + if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end) + { + while (counter--) + { + while (pOut_buf_cur >= pOut_buf_end) + { + TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT); + } + *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask]; + } + continue; + } +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES + else if ((counter >= 9) && (counter <= dist)) + { + const mz_uint8 *pSrc_end = pSrc + (counter & ~7); + do + { +#ifdef MINIZ_UNALIGNED_USE_MEMCPY + memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32)*2); +#else + ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0]; + ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1]; +#endif + pOut_buf_cur += 8; + } while ((pSrc += 8) < pSrc_end); + if ((counter &= 7) < 3) + { + if (counter) + { + pOut_buf_cur[0] = pSrc[0]; + if (counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + continue; + } + } +#endif + while(counter>2) + { + pOut_buf_cur[0] = pSrc[0]; + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur[2] = pSrc[2]; + pOut_buf_cur += 3; + pSrc += 3; + counter -= 3; + } + if (counter > 0) + { + pOut_buf_cur[0] = pSrc[0]; + if (counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + } + } + } while (!(r->m_final & 1)); + + /* Ensure byte alignment and put back any bytes from the bitbuf if we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */ + /* I'm being super conservative here. A number of simplifications can be made to the byte alignment part, and the Adler32 check shouldn't ever need to worry about reading from the bitbuf now. */ + TINFL_SKIP_BITS(32, num_bits & 7); + while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) + { + --pIn_buf_cur; + num_bits -= 8; + } + bit_buf &= (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1); + MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end of non-deflate/zlib streams with following data (such as gzip streams). */ + + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) + { + for (counter = 0; counter < 4; ++counter) + { + mz_uint s; + if (num_bits) + TINFL_GET_BITS(41, s, 8); + else + TINFL_GET_BYTE(42, s); + r->m_z_adler32 = (r->m_z_adler32 << 8) | s; + } + } + TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE); + + TINFL_CR_FINISH + +common_exit: + /* As long as we aren't telling the caller that we NEED more input to make forward progress: */ + /* Put back any bytes from the bitbuf in case we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */ + /* We need to be very careful here to NOT push back any bytes we definitely know we need to make forward progress, though, or we'll lock the caller up into an inf loop. */ + if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) && (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS)) + { + while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8)) + { + --pIn_buf_cur; + num_bits -= 8; + } + } + r->m_num_bits = num_bits; + r->m_bit_buf = bit_buf & (tinfl_bit_buf_t)((((mz_uint64)1) << num_bits) - (mz_uint64)1); + r->m_dist = dist; + r->m_counter = counter; + r->m_num_extra = num_extra; + r->m_dist_from_out_buf_start = dist_from_out_buf_start; + *pIn_buf_size = pIn_buf_cur - pIn_buf_next; + *pOut_buf_size = pOut_buf_cur - pOut_buf_next; + if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0)) + { + const mz_uint8 *ptr = pOut_buf_next; + size_t buf_len = *pOut_buf_size; + mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16; + size_t block_len = buf_len % 5552; + while (buf_len) + { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) + { + s1 += ptr[0], s2 += s1; + s1 += ptr[1], s2 += s1; + s1 += ptr[2], s2 += s1; + s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; + s1 += ptr[5], s2 += s1; + s1 += ptr[6], s2 += s1; + s1 += ptr[7], s2 += s1; + } + for (; i < block_len; ++i) + s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; + buf_len -= block_len; + block_len = 5552; + } + r->m_check_adler32 = (s2 << 16) + s1; + if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32)) + status = TINFL_STATUS_ADLER32_MISMATCH; + } + return status; +} + +/* Higher level helper functions. */ +void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags) +{ + tinfl_decompressor decomp; + void *pBuf = NULL, *pNew_buf; + size_t src_buf_ofs = 0, out_buf_capacity = 0; + *pOut_len = 0; + tinfl_init(&decomp); + for (;;) + { + size_t src_buf_size = src_buf_len - src_buf_ofs, dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity; + tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size, (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL, &dst_buf_size, + (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF); + if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT)) + { + MZ_FREE(pBuf); + *pOut_len = 0; + return NULL; + } + src_buf_ofs += src_buf_size; + *pOut_len += dst_buf_size; + if (status == TINFL_STATUS_DONE) + break; + new_out_buf_capacity = out_buf_capacity * 2; + if (new_out_buf_capacity < 128) + new_out_buf_capacity = 128; + pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity); + if (!pNew_buf) + { + MZ_FREE(pBuf); + *pOut_len = 0; + return NULL; + } + pBuf = pNew_buf; + out_buf_capacity = new_out_buf_capacity; + } + return pBuf; +} + +size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags) +{ + tinfl_decompressor decomp; + tinfl_status status; + tinfl_init(&decomp); + status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len, (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF); + return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED : out_buf_len; +} + +int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags) +{ + int result = 0; + tinfl_decompressor decomp; + mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE); + size_t in_buf_ofs = 0, dict_ofs = 0; + if (!pDict) + return TINFL_STATUS_FAILED; + tinfl_init(&decomp); + for (;;) + { + size_t in_buf_size = *pIn_buf_size - in_buf_ofs, dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs; + tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size, + (flags & ~(TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))); + in_buf_ofs += in_buf_size; + if ((dst_buf_size) && (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user))) + break; + if (status != TINFL_STATUS_HAS_MORE_OUTPUT) + { + result = (status == TINFL_STATUS_DONE); + break; + } + dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1); + } + MZ_FREE(pDict); + *pIn_buf_size = in_buf_ofs; + return result; +} + +#ifndef MINIZ_NO_MALLOC +tinfl_decompressor *tinfl_decompressor_alloc() +{ + tinfl_decompressor *pDecomp = (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor)); + if (pDecomp) + tinfl_init(pDecomp); + return pDecomp; +} + +void tinfl_decompressor_free(tinfl_decompressor *pDecomp) +{ + MZ_FREE(pDecomp); +} +#endif + +#ifdef __cplusplus +} +#endif +/************************************************************************** + * + * Copyright 2013-2014 RAD Game Tools and Valve Software + * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC + * Copyright 2016 Martin Raiber + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + + +#ifndef MINIZ_NO_ARCHIVE_APIS + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- .ZIP archive reading */ + +#ifdef MINIZ_NO_STDIO +#define MZ_FILE void * +#else +#include + +#if defined(_MSC_VER) || defined(__MINGW64__) +static FILE *mz_fopen(const char *pFilename, const char *pMode) +{ + FILE *pFile = NULL; + fopen_s(&pFile, pFilename, pMode); + return pFile; +} +static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream) +{ + FILE *pFile = NULL; + if (freopen_s(&pFile, pPath, pMode, pStream)) + return NULL; + return pFile; +} +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN mz_fopen +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 _ftelli64 +#define MZ_FSEEK64 _fseeki64 +#define MZ_FILE_STAT_STRUCT _stat64 +#define MZ_FILE_STAT _stat64 +#define MZ_FFLUSH fflush +#define MZ_FREOPEN mz_freopen +#define MZ_DELETE_FILE remove +#elif defined(__MINGW32__) +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftello64 +#define MZ_FSEEK64 fseeko64 +#define MZ_FILE_STAT_STRUCT _stat +#define MZ_FILE_STAT _stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#elif defined(__TINYC__) +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftell +#define MZ_FSEEK64 fseek +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#elif defined(__GNUC__) && defined(_LARGEFILE64_SOURCE) +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN(f, m) fopen64(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftello64 +#define MZ_FSEEK64 fseeko64 +#define MZ_FILE_STAT_STRUCT stat64 +#define MZ_FILE_STAT stat64 +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(p, m, s) freopen64(p, m, s) +#define MZ_DELETE_FILE remove +#elif defined(__APPLE__) +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#define MZ_FTELL64 ftello +#define MZ_FSEEK64 fseeko +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(p, m, s) freopen(p, m, s) +#define MZ_DELETE_FILE remove + +#else +#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.") +#ifndef MINIZ_NO_TIME +#include +#endif +#define MZ_FOPEN(f, m) fopen(f, m) +#define MZ_FCLOSE fclose +#define MZ_FREAD fread +#define MZ_FWRITE fwrite +#ifdef __STRICT_ANSI__ +#define MZ_FTELL64 ftell +#define MZ_FSEEK64 fseek +#else +#define MZ_FTELL64 ftello +#define MZ_FSEEK64 fseeko +#endif +#define MZ_FILE_STAT_STRUCT stat +#define MZ_FILE_STAT stat +#define MZ_FFLUSH fflush +#define MZ_FREOPEN(f, m, s) freopen(f, m, s) +#define MZ_DELETE_FILE remove +#endif /* #ifdef _MSC_VER */ +#endif /* #ifdef MINIZ_NO_STDIO */ + +#define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c)) + +/* Various ZIP archive enums. To completely avoid cross platform compiler alignment and platform endian issues, miniz.c doesn't use structs for any of this stuff. */ +enum +{ + /* ZIP archive identifiers and record sizes */ + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50, + MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50, + MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50, + MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, + + /* ZIP64 archive identifier and record sizes */ + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, + MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, + MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, + MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, + MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, + MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, + + /* Central directory header record offsets */ + MZ_ZIP_CDH_SIG_OFS = 0, + MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, + MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6, + MZ_ZIP_CDH_BIT_FLAG_OFS = 8, + MZ_ZIP_CDH_METHOD_OFS = 10, + MZ_ZIP_CDH_FILE_TIME_OFS = 12, + MZ_ZIP_CDH_FILE_DATE_OFS = 14, + MZ_ZIP_CDH_CRC32_OFS = 16, + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS = 20, + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS = 24, + MZ_ZIP_CDH_FILENAME_LEN_OFS = 28, + MZ_ZIP_CDH_EXTRA_LEN_OFS = 30, + MZ_ZIP_CDH_COMMENT_LEN_OFS = 32, + MZ_ZIP_CDH_DISK_START_OFS = 34, + MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36, + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38, + MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42, + + /* Local directory header offsets */ + MZ_ZIP_LDH_SIG_OFS = 0, + MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4, + MZ_ZIP_LDH_BIT_FLAG_OFS = 6, + MZ_ZIP_LDH_METHOD_OFS = 8, + MZ_ZIP_LDH_FILE_TIME_OFS = 10, + MZ_ZIP_LDH_FILE_DATE_OFS = 12, + MZ_ZIP_LDH_CRC32_OFS = 14, + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS = 18, + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22, + MZ_ZIP_LDH_FILENAME_LEN_OFS = 26, + MZ_ZIP_LDH_EXTRA_LEN_OFS = 28, + MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3, + + /* End of central directory offsets */ + MZ_ZIP_ECDH_SIG_OFS = 0, + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4, + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6, + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 8, + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS = 10, + MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, + MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, + MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, + + /* ZIP64 End of central directory locator offsets */ + MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ + MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ + + /* ZIP64 End of central directory header offsets */ + MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ + MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ + MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, + MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, + MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 +}; + +typedef struct +{ + void *m_p; + size_t m_size, m_capacity; + mz_uint m_element_size; +} mz_zip_array; + +struct mz_zip_internal_state_tag +{ + mz_zip_array m_central_dir; + mz_zip_array m_central_dir_offsets; + mz_zip_array m_sorted_central_dir_offsets; + + /* The flags passed in when the archive is initially opened. */ + uint32_t m_init_flags; + + /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. */ + mz_bool m_zip64; + + /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 will also be slammed to true too, even if we didn't find a zip64 end of central dir header, etc.) */ + mz_bool m_zip64_has_extended_info_fields; + + /* These fields are used by the file, FILE, memory, and memory/heap read/write helpers. */ + MZ_FILE *m_pFile; + mz_uint64 m_file_archive_start_ofs; + + void *m_pMem; + size_t m_mem_size; + size_t m_mem_capacity; +}; + +#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) (array_ptr)->m_element_size = element_size + +#if defined(DEBUG) || defined(_DEBUG) || defined(NDEBUG) +static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index) +{ + MZ_ASSERT(index < pArray->m_size); + return index; +} +#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[mz_zip_array_range_check(array_ptr, index)] +#else +#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[index] +#endif + +static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray, mz_uint32 element_size) +{ + memset(pArray, 0, sizeof(mz_zip_array)); + pArray->m_element_size = element_size; +} + +static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, mz_zip_array *pArray) +{ + pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p); + memset(pArray, 0, sizeof(mz_zip_array)); +} + +static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *pArray, size_t min_new_capacity, mz_uint growing) +{ + void *pNew_p; + size_t new_capacity = min_new_capacity; + MZ_ASSERT(pArray->m_element_size); + if (pArray->m_capacity >= min_new_capacity) + return MZ_TRUE; + if (growing) + { + new_capacity = MZ_MAX(1, pArray->m_capacity); + while (new_capacity < min_new_capacity) + new_capacity *= 2; + } + if (NULL == (pNew_p = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pArray->m_p, pArray->m_element_size, new_capacity))) + return MZ_FALSE; + pArray->m_p = pNew_p; + pArray->m_capacity = new_capacity; + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_capacity, mz_uint growing) +{ + if (new_capacity > pArray->m_capacity) + { + if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing)) + return MZ_FALSE; + } + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_size, mz_uint growing) +{ + if (new_size > pArray->m_capacity) + { + if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing)) + return MZ_FALSE; + } + pArray->m_size = new_size; + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, mz_zip_array *pArray, size_t n) +{ + return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE); +} + +static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, mz_zip_array *pArray, const void *pElements, size_t n) +{ + size_t orig_size = pArray->m_size; + if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE)) + return MZ_FALSE; + if (n > 0) + memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size); + return MZ_TRUE; +} + +#ifndef MINIZ_NO_TIME +static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date) +{ + struct tm tm; + memset(&tm, 0, sizeof(tm)); + tm.tm_isdst = -1; + tm.tm_year = ((dos_date >> 9) & 127) + 1980 - 1900; + tm.tm_mon = ((dos_date >> 5) & 15) - 1; + tm.tm_mday = dos_date & 31; + tm.tm_hour = (dos_time >> 11) & 31; + tm.tm_min = (dos_time >> 5) & 63; + tm.tm_sec = (dos_time << 1) & 62; + return mktime(&tm); +} + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS +static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date) +{ +#ifdef _MSC_VER + struct tm tm_struct; + struct tm *tm = &tm_struct; + errno_t err = localtime_s(tm, &time); + if (err) + { + *pDOS_date = 0; + *pDOS_time = 0; + return; + } +#else + struct tm *tm = localtime(&time); +#endif /* #ifdef _MSC_VER */ + + *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1)); + *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday); +} +#endif /* MINIZ_NO_ARCHIVE_WRITING_APIS */ + +#ifndef MINIZ_NO_STDIO +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS +static mz_bool mz_zip_get_file_modified_time(const char *pFilename, MZ_TIME_T *pTime) +{ + struct MZ_FILE_STAT_STRUCT file_stat; + + /* On Linux with x86 glibc, this call will fail on large files (I think >= 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh. */ + if (MZ_FILE_STAT(pFilename, &file_stat) != 0) + return MZ_FALSE; + + *pTime = file_stat.st_mtime; + + return MZ_TRUE; +} +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/ + +static mz_bool mz_zip_set_file_times(const char *pFilename, MZ_TIME_T access_time, MZ_TIME_T modified_time) +{ + struct utimbuf t; + + memset(&t, 0, sizeof(t)); + t.actime = access_time; + t.modtime = modified_time; + + return !utime(pFilename, &t); +} +#endif /* #ifndef MINIZ_NO_STDIO */ +#endif /* #ifndef MINIZ_NO_TIME */ + +static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, mz_zip_error err_num) +{ + if (pZip) + pZip->m_last_error = err_num; + return MZ_FALSE; +} + +static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint flags) +{ + (void)flags; + if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!pZip->m_pAlloc) + pZip->m_pAlloc = miniz_def_alloc_func; + if (!pZip->m_pFree) + pZip->m_pFree = miniz_def_free_func; + if (!pZip->m_pRealloc) + pZip->m_pRealloc = miniz_def_realloc_func; + + pZip->m_archive_size = 0; + pZip->m_central_directory_file_ofs = 0; + pZip->m_total_files = 0; + pZip->m_last_error = MZ_ZIP_NO_ERROR; + + if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32)); + pZip->m_pState->m_init_flags = flags; + pZip->m_pState->m_zip64 = MZ_FALSE; + pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE; + + pZip->m_zip_mode = MZ_ZIP_MODE_READING; + + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, mz_uint r_index) +{ + const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE; + const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index)); + mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS); + mz_uint8 l = 0, r = 0; + pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pE = pL + MZ_MIN(l_len, r_len); + while (pL < pE) + { + if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR))) + break; + pL++; + pR++; + } + return (pL == pE) ? (l_len < r_len) : (l < r); +} + +#define MZ_SWAP_UINT32(a, b) \ + do \ + { \ + mz_uint32 t = a; \ + a = b; \ + b = t; \ + } \ + MZ_MACRO_END + +/* Heap sort of lowercased filenames, used to help accelerate plain central directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.) */ +static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) +{ + mz_zip_internal_state *pState = pZip->m_pState; + const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets; + const mz_zip_array *pCentral_dir = &pState->m_central_dir; + mz_uint32 *pIndices; + mz_uint32 start, end; + const mz_uint32 size = pZip->m_total_files; + + if (size <= 1U) + return; + + pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0); + + start = (size - 2U) >> 1U; + for (;;) + { + mz_uint64 child, root = start; + for (;;) + { + if ((child = (root << 1U) + 1U) >= size) + break; + child += (((child + 1U) < size) && (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U]))); + if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child])) + break; + MZ_SWAP_UINT32(pIndices[root], pIndices[child]); + root = child; + } + if (!start) + break; + start--; + } + + end = size - 1; + while (end > 0) + { + mz_uint64 child, root = 0; + MZ_SWAP_UINT32(pIndices[end], pIndices[0]); + for (;;) + { + if ((child = (root << 1U) + 1U) >= end) + break; + child += (((child + 1U) < end) && mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U])); + if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child])) + break; + MZ_SWAP_UINT32(pIndices[root], pIndices[child]); + root = child; + } + end--; + } +} + +static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, mz_uint32 record_sig, mz_uint32 record_size, mz_int64 *pOfs) +{ + mz_int64 cur_file_ofs; + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; + + /* Basic sanity checks - reject files which are too small */ + if (pZip->m_archive_size < record_size) + return MZ_FALSE; + + /* Find the record by scanning the file from the end towards the beginning. */ + cur_file_ofs = MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); + for (;;) + { + int i, n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); + + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) + return MZ_FALSE; + + for (i = n - 4; i >= 0; --i) + { + mz_uint s = MZ_READ_LE32(pBuf + i); + if (s == record_sig) + { + if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) + break; + } + } + + if (i >= 0) + { + cur_file_ofs += i; + break; + } + + /* Give up if we've searched the entire file, or we've gone back "too far" (~64kb) */ + if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= (MZ_UINT16_MAX + record_size))) + return MZ_FALSE; + + cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); + } + + *pOfs = cur_file_ofs; + return MZ_TRUE; +} + +static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint flags) +{ + mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, cdir_disk_index = 0; + mz_uint64 cdir_ofs = 0; + mz_int64 cur_file_ofs = 0; + const mz_uint8 *p; + + mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; + mz_uint8 *pBuf = (mz_uint8 *)buf_u32; + mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); + mz_uint32 zip64_end_of_central_dir_locator_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; + + mz_uint32 zip64_end_of_central_dir_header_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pZip64_end_of_central_dir = (mz_uint8 *)zip64_end_of_central_dir_header_u32; + + mz_uint64 zip64_end_of_central_dir_ofs = 0; + + /* Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there. */ + if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (!mz_zip_reader_locate_header_sig(pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) + return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); + + /* Read and verify the end of central directory record. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) + { + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, pZip64_locator, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) + { + if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) + { + zip64_end_of_central_dir_ofs = MZ_READ_LE64(pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); + if (zip64_end_of_central_dir_ofs > (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, pZip64_end_of_central_dir, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) + { + if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) + { + pZip->m_pState->m_zip64 = MZ_TRUE; + } + } + } + } + } + + pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); + cdir_entries_on_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); + cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); + cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); + cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); + + if (pZip->m_pState->m_zip64) + { + mz_uint32 zip64_total_num_of_disks = MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); + mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); + mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); + mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); + mz_uint64 zip64_size_of_central_directory = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); + + if (zip64_size_of_end_of_central_dir_record < (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (zip64_total_num_of_disks != 1U) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + /* Check for miniz's practical limits */ + if (zip64_cdir_total_entries > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; + + if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + cdir_entries_on_this_disk = (mz_uint32)zip64_cdir_total_entries_on_this_disk; + + /* Check for miniz's current practical limits (sorry, this should be enough for millions of files) */ + if (zip64_size_of_central_directory > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + cdir_size = (mz_uint32)zip64_size_of_central_directory; + + num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); + + cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); + + cdir_ofs = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); + } + + if (pZip->m_total_files != cdir_entries_on_this_disk) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (((num_this_disk | cdir_disk_index) != 0) && ((num_this_disk != 1) || (cdir_disk_index != 1))) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pZip->m_central_directory_file_ofs = cdir_ofs; + + if (pZip->m_total_files) + { + mz_uint i, n; + /* Read the entire central directory into a heap block, and allocate another heap block to hold the unsorted central dir file record offsets, and possibly another to hold the sorted indices. */ + if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) || + (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (sort_central_dir) + { + if (!mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, pZip->m_pState->m_central_dir.m_p, cdir_size) != cdir_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + /* Now create an index into the central directory file records, do some basic sanity checking on each record */ + p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; + for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) + { + mz_uint total_header_size, disk_index, bit_flags, filename_size, ext_data_size; + mz_uint64 comp_size, decomp_size, local_header_ofs; + + if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, i) = (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); + + if (sort_central_dir) + MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, mz_uint32, i) = i; + + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); + filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); + + if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && + (ext_data_size) && + (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == MZ_UINT32_MAX)) + { + /* Attempt to find zip64 extended information field in the entry's extra data */ + mz_uint32 extra_size_remaining = ext_data_size; + + if (extra_size_remaining) + { + const mz_uint8 *pExtra_data; + void* buf = NULL; + + if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > n) + { + buf = MZ_MALLOC(ext_data_size); + if(buf==NULL) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size, buf, ext_data_size) != ext_data_size) + { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + pExtra_data = (mz_uint8*)buf; + } + else + { + pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; + } + + do + { + mz_uint32 field_id; + mz_uint32 field_data_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + + if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining) + { + MZ_FREE(buf); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) + { + /* Ok, the archive didn't have any zip64 headers but it uses a zip64 extended information field so mark it as zip64 anyway (this can occur with infozip's zip util when it reads compresses files from stdin). */ + pZip->m_pState->m_zip64 = MZ_TRUE; + pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; + break; + } + + pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; + extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; + } while (extra_size_remaining); + + MZ_FREE(buf); + } + } + + /* I've seen archives that aren't marked as zip64 that uses zip64 ext data, argh */ + if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX)) + { + if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && (decomp_size != comp_size)) || (decomp_size && !comp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS); + if ((disk_index == MZ_UINT16_MAX) || ((disk_index != num_this_disk) && (disk_index != 1))) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); + + if (comp_size != MZ_UINT32_MAX) + { + if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > n) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + n -= total_header_size; + p += total_header_size; + } + } + + if (sort_central_dir) + mz_zip_reader_sort_central_dir_offsets_by_filename(pZip); + + return MZ_TRUE; +} + +void mz_zip_zero_struct(mz_zip_archive *pZip) +{ + if (pZip) + MZ_CLEAR_OBJ(*pZip); +} + +static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip, mz_bool set_last_error) +{ + mz_bool status = MZ_TRUE; + + if (!pZip) + return MZ_FALSE; + + if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) + { + if (set_last_error) + pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER; + + return MZ_FALSE; + } + + if (pZip->m_pState) + { + mz_zip_internal_state *pState = pZip->m_pState; + pZip->m_pState = NULL; + + mz_zip_array_clear(pZip, &pState->m_central_dir); + mz_zip_array_clear(pZip, &pState->m_central_dir_offsets); + mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets); + +#ifndef MINIZ_NO_STDIO + if (pState->m_pFile) + { + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) + { + if (MZ_FCLOSE(pState->m_pFile) == EOF) + { + if (set_last_error) + pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED; + status = MZ_FALSE; + } + } + pState->m_pFile = NULL; + } +#endif /* #ifndef MINIZ_NO_STDIO */ + + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + } + pZip->m_zip_mode = MZ_ZIP_MODE_INVALID; + + return status; +} + +mz_bool mz_zip_reader_end(mz_zip_archive *pZip) +{ + return mz_zip_reader_end_internal(pZip, MZ_TRUE); +} +mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags) +{ + if ((!pZip) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_USER; + pZip->m_archive_size = size; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) + { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n) +{ + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + size_t s = (file_ofs >= pZip->m_archive_size) ? 0 : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n); + memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s); + return s; +} + +mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags) +{ + if (!pMem) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY; + pZip->m_archive_size = size; + pZip->m_pRead = mz_zip_mem_read_func; + pZip->m_pIO_opaque = pZip; + pZip->m_pNeeds_keepalive = NULL; + +#ifdef __cplusplus + pZip->m_pState->m_pMem = const_cast(pMem); +#else + pZip->m_pState->m_pMem = (void *)pMem; +#endif + + pZip->m_pState->m_mem_size = size; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) + { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n) +{ + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile); + + file_ofs += pZip->m_pState->m_file_archive_start_ofs; + + if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET)))) + return 0; + + return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile); +} + +mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags) +{ + return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0); +} + +mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size) +{ + mz_uint64 file_size; + MZ_FILE *pFile; + + if ((!pZip) || (!pFilename) || ((archive_size) && (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pFile = MZ_FOPEN(pFilename, "rb"); + if (!pFile) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + file_size = archive_size; + if (!file_size) + { + if (MZ_FSEEK64(pFile, 0, SEEK_END)) + { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + } + + file_size = MZ_FTELL64(pFile); + } + + /* TODO: Better sanity check archive_size and the # of actual remaining bytes */ + + if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + { + MZ_FCLOSE(pFile); + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + } + + if (!mz_zip_reader_init_internal(pZip, flags)) + { + MZ_FCLOSE(pFile); + return MZ_FALSE; + } + + pZip->m_zip_type = MZ_ZIP_TYPE_FILE; + pZip->m_pRead = mz_zip_file_read_func; + pZip->m_pIO_opaque = pZip; + pZip->m_pState->m_pFile = pFile; + pZip->m_archive_size = file_size; + pZip->m_pState->m_file_archive_start_ofs = file_start_ofs; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) + { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags) +{ + mz_uint64 cur_file_ofs; + + if ((!pZip) || (!pFile)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + cur_file_ofs = MZ_FTELL64(pFile); + + if (!archive_size) + { + if (MZ_FSEEK64(pFile, 0, SEEK_END)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + + archive_size = MZ_FTELL64(pFile) - cur_file_ofs; + + if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); + } + + if (!mz_zip_reader_init_internal(pZip, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_CFILE; + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + pZip->m_pState->m_pFile = pFile; + pZip->m_archive_size = archive_size; + pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs; + + if (!mz_zip_reader_read_central_dir(pZip, flags)) + { + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +#endif /* #ifndef MINIZ_NO_STDIO */ + +static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip, mz_uint file_index) +{ + if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files)) + return NULL; + return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index)); +} + +mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index) +{ + mz_uint m_bit_flag; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + return (m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0; +} + +mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index) +{ + mz_uint bit_flag; + mz_uint method; + + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS); + bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + + if ((method != 0) && (method != MZ_DEFLATED)) + { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + return MZ_FALSE; + } + + if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) + { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + return MZ_FALSE; + } + + if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG) + { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index) +{ + mz_uint filename_len, attribute_mapping_id, external_attr; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + if (filename_len) + { + if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/') + return MZ_TRUE; + } + + /* Bugfix: This code was also checking if the internal attribute was non-zero, which wasn't correct. */ + /* Most/all zip writers (hopefully) set DOS file/directory attributes in the low 16-bits, so check for the DOS directory flag and ignore the source OS ID in the created by field. */ + /* FIXME: Remove this check? Is it necessary - we already check the filename. */ + attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8; + (void)attribute_mapping_id; + + external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS); + if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0) + { + return MZ_TRUE; + } + + return MZ_FALSE; +} + +static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, mz_uint file_index, const mz_uint8 *pCentral_dir_header, mz_zip_archive_file_stat *pStat, mz_bool *pFound_zip64_extra_data) +{ + mz_uint n; + const mz_uint8 *p = pCentral_dir_header; + + if (pFound_zip64_extra_data) + *pFound_zip64_extra_data = MZ_FALSE; + + if ((!p) || (!pStat)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Extract fields from the central directory record. */ + pStat->m_file_index = file_index; + pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index); + pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS); + pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS); + pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); + pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS); +#ifndef MINIZ_NO_TIME + pStat->m_time = mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS)); +#endif + pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS); + pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + pStat->m_uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + pStat->m_internal_attr = MZ_READ_LE16(p + MZ_ZIP_CDH_INTERNAL_ATTR_OFS); + pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS); + pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); + + /* Copy as much of the filename and comment as possible. */ + n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1); + memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n); + pStat->m_filename[n] = '\0'; + + n = MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS); + n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE - 1); + pStat->m_comment_size = n; + memcpy(pStat->m_comment, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS), n); + pStat->m_comment[n] = '\0'; + + /* Set some flags for convienance */ + pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index); + pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index); + pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index); + + /* See if we need to read any zip64 extended information fields. */ + /* Confusingly, these zip64 fields can be present even on non-zip64 archives (Debian zip on a huge files from stdin piped to stdout creates them). */ + if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size), pStat->m_local_header_ofs) == MZ_UINT32_MAX) + { + /* Attempt to find zip64 extended information field in the entry's extra data */ + mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); + + if (extra_size_remaining) + { + const mz_uint8 *pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + + do + { + mz_uint32 field_id; + mz_uint32 field_data_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + + if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) + { + const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2; + mz_uint32 field_data_remaining = field_data_size; + + if (pFound_zip64_extra_data) + *pFound_zip64_extra_data = MZ_TRUE; + + if (pStat->m_uncomp_size == MZ_UINT32_MAX) + { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_uncomp_size = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + field_data_remaining -= sizeof(mz_uint64); + } + + if (pStat->m_comp_size == MZ_UINT32_MAX) + { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_comp_size = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + field_data_remaining -= sizeof(mz_uint64); + } + + if (pStat->m_local_header_ofs == MZ_UINT32_MAX) + { + if (field_data_remaining < sizeof(mz_uint64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + pStat->m_local_header_ofs = MZ_READ_LE64(pField_data); + pField_data += sizeof(mz_uint64); + field_data_remaining -= sizeof(mz_uint64); + } + + break; + } + + pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; + extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; + } while (extra_size_remaining); + } + } + + return MZ_TRUE; +} + +static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA, const char *pB, mz_uint len, mz_uint flags) +{ + mz_uint i; + if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE) + return 0 == memcmp(pA, pB, len); + for (i = 0; i < len; ++i) + if (MZ_TOLOWER(pA[i]) != MZ_TOLOWER(pB[i])) + return MZ_FALSE; + return MZ_TRUE; +} + +static MZ_FORCEINLINE int mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, const char *pR, mz_uint r_len) +{ + const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE; + mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS); + mz_uint8 l = 0, r = 0; + pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + pE = pL + MZ_MIN(l_len, r_len); + while (pL < pE) + { + if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR))) + break; + pL++; + pR++; + } + return (pL == pE) ? (int)(l_len - r_len) : (l - r); +} + +static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip, const char *pFilename, mz_uint32 *pIndex) +{ + mz_zip_internal_state *pState = pZip->m_pState; + const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets; + const mz_zip_array *pCentral_dir = &pState->m_central_dir; + mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0); + const uint32_t size = pZip->m_total_files; + const mz_uint filename_len = (mz_uint)strlen(pFilename); + + if (pIndex) + *pIndex = 0; + + if (size) + { + /* yes I could use uint32_t's, but then we would have to add some special case checks in the loop, argh, and */ + /* honestly the major expense here on 32-bit CPU's will still be the filename compare */ + mz_int64 l = 0, h = (mz_int64)size - 1; + + while (l <= h) + { + mz_int64 m = l + ((h - l) >> 1); + uint32_t file_index = pIndices[(uint32_t)m]; + + int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len); + if (!comp) + { + if (pIndex) + *pIndex = file_index; + return MZ_TRUE; + } + else if (comp < 0) + l = m + 1; + else + h = m - 1; + } + } + + return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND); +} + +int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags) +{ + mz_uint32 index; + if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index)) + return -1; + else + return (int)index; +} + +mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *pIndex) +{ + mz_uint file_index; + size_t name_len, comment_len; + + if (pIndex) + *pIndex = 0; + + if ((!pZip) || (!pZip->m_pState) || (!pName)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* See if we can use a binary search */ + if (((pZip->m_pState->m_init_flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) && + (pZip->m_zip_mode == MZ_ZIP_MODE_READING) && + ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size)) + { + return mz_zip_locate_file_binary_search(pZip, pName, pIndex); + } + + /* Locate the entry by scanning the entire central directory */ + name_len = strlen(pName); + if (name_len > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + comment_len = pComment ? strlen(pComment) : 0; + if (comment_len > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + for (file_index = 0; file_index < pZip->m_total_files; file_index++) + { + const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index)); + mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS); + const char *pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; + if (filename_len < name_len) + continue; + if (comment_len) + { + mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS); + const char *pFile_comment = pFilename + filename_len + file_extra_len; + if ((file_comment_len != comment_len) || (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len, flags))) + continue; + } + if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len)) + { + int ofs = filename_len - 1; + do + { + if ((pFilename[ofs] == '/') || (pFilename[ofs] == '\\') || (pFilename[ofs] == ':')) + break; + } while (--ofs >= 0); + ofs++; + pFilename += ofs; + filename_len -= ofs; + } + if ((filename_len == name_len) && (mz_zip_string_equal(pName, pFilename, filename_len, flags))) + { + if (pIndex) + *pIndex = file_index; + return MZ_TRUE; + } + } + + return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND); +} + +mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size) +{ + int status = TINFL_STATUS_DONE; + mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail; + mz_zip_archive_file_stat file_stat; + void *pRead_buf; + mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + tinfl_decompressor inflator; + + if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) || ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + /* A directory or zero length file */ + if ((file_stat.m_is_directory) || (!file_stat.m_comp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + /* Ensure supplied output buffer is large enough. */ + needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size; + if (buf_size < needed_size) + return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL); + + /* Read and parse the local directory entry. */ + cur_file_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) + { + /* The file is stored or the caller has requested the compressed data. */ + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, (size_t)needed_size) != needed_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0) + { + if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32) + return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED); + } +#endif + + return MZ_TRUE; + } + + /* Decompress the file either directly from memory or from a file input buffer. */ + tinfl_init(&inflator); + + if (pZip->m_pState->m_pMem) + { + /* Read directly from the archive in memory. */ + pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs; + read_buf_size = read_buf_avail = file_stat.m_comp_size; + comp_remaining = 0; + } + else if (pUser_read_buf) + { + /* Use a user provided read buffer. */ + if (!user_read_buf_size) + return MZ_FALSE; + pRead_buf = (mz_uint8 *)pUser_read_buf; + read_buf_size = user_read_buf_size; + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } + else + { + /* Temporarily allocate a read buffer. */ + read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } + + do + { + /* The size_t cast here should be OK because we've verified that the output buffer is >= file_stat.m_uncomp_size above */ + size_t in_buf_size, out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs); + if ((!read_buf_avail) && (!pZip->m_pState->m_pMem)) + { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail) + { + status = TINFL_STATUS_FAILED; + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + break; + } + cur_file_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + read_buf_ofs = 0; + } + in_buf_size = (size_t)read_buf_avail; + status = tinfl_decompress(&inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0)); + read_buf_avail -= in_buf_size; + read_buf_ofs += in_buf_size; + out_buf_ofs += out_buf_size; + } while (status == TINFL_STATUS_NEEDS_MORE_INPUT); + + if (status == TINFL_STATUS_DONE) + { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (out_buf_ofs != file_stat.m_uncomp_size) + { + mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32) + { + mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED); + status = TINFL_STATUS_FAILED; + } +#endif + } + + if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf)) + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + + return status == TINFL_STATUS_DONE; +} + +mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size) +{ + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return MZ_FALSE; + return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size); +} + +mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags) +{ + return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, NULL, 0); +} + +mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags) +{ + return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0); +} + +void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags) +{ + mz_uint64 comp_size, uncomp_size, alloc_size; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + void *pBuf; + + if (pSize) + *pSize = 0; + + if (!p) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return NULL; + } + + comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); + uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); + + alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size; + if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF)) + { + mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + return NULL; + } + + if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size))) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return NULL; + } + + if (!mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size, flags)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return NULL; + } + + if (pSize) + *pSize = (size_t)alloc_size; + return pBuf; +} + +void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags) +{ + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + { + if (pSize) + *pSize = 0; + return MZ_FALSE; + } + return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags); +} + +mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags) +{ + int status = TINFL_STATUS_DONE; + mz_uint file_crc32 = MZ_CRC32_INIT; + mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs; + mz_zip_archive_file_stat file_stat; + void *pRead_buf = NULL; + void *pWrite_buf = NULL; + mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + + if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + /* A directory or zero length file */ + if ((file_stat.m_is_directory) || (!file_stat.m_comp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + /* Read and do some minimal validation of the local directory entry (this doesn't crack the zip64 stuff, which we already have from the central dir) */ + cur_file_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + /* Decompress the file either directly from memory or from a file input buffer. */ + if (pZip->m_pState->m_pMem) + { + pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs; + read_buf_size = read_buf_avail = file_stat.m_comp_size; + comp_remaining = 0; + } + else + { + read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + read_buf_avail = 0; + comp_remaining = file_stat.m_comp_size; + } + + if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method)) + { + /* The file is stored or the caller has requested the compressed data. */ + if (pZip->m_pState->m_pMem) + { + if (((sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)file_stat.m_comp_size) != file_stat.m_comp_size) + { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + } + else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + { +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size); +#endif + } + + cur_file_ofs += file_stat.m_comp_size; + out_buf_ofs += file_stat.m_comp_size; + comp_remaining = 0; + } + else + { + while (comp_remaining) + { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + { + file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail); + } +#endif + + if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail) + { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + + cur_file_ofs += read_buf_avail; + out_buf_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + } + } + } + else + { + tinfl_decompressor inflator; + tinfl_init(&inflator); + + if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE))) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + status = TINFL_STATUS_FAILED; + } + else + { + do + { + mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + if ((!read_buf_avail) && (!pZip->m_pState->m_pMem)) + { + read_buf_avail = MZ_MIN(read_buf_size, comp_remaining); + if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + cur_file_ofs += read_buf_avail; + comp_remaining -= read_buf_avail; + read_buf_ofs = 0; + } + + in_buf_size = (size_t)read_buf_avail; + status = tinfl_decompress(&inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0); + read_buf_avail -= in_buf_size; + read_buf_ofs += in_buf_size; + + if (out_buf_size) + { + if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) != out_buf_size) + { + mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + file_crc32 = (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size); +#endif + if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size) + { + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + status = TINFL_STATUS_FAILED; + break; + } + } + } while ((status == TINFL_STATUS_NEEDS_MORE_INPUT) || (status == TINFL_STATUS_HAS_MORE_OUTPUT)); + } + } + + if ((status == TINFL_STATUS_DONE) && (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) + { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (out_buf_ofs != file_stat.m_uncomp_size) + { + mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (file_crc32 != file_stat.m_crc32) + { + mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED); + status = TINFL_STATUS_FAILED; + } +#endif + } + + if (!pZip->m_pState->m_pMem) + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + + if (pWrite_buf) + pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf); + + return status == TINFL_STATUS_DONE; +} + +mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags) +{ + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags); +} + +mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags) +{ + mz_zip_reader_extract_iter_state *pState; + mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + + /* Argument sanity check */ + if ((!pZip) || (!pZip->m_pState)) + return NULL; + + /* Allocate an iterator status structure */ + pState = (mz_zip_reader_extract_iter_state*)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state)); + if (!pState) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return NULL; + } + + /* Fetch file details */ + if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Encryption and patch files are not supported. */ + if (pState->file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)) + { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* This function only supports decompressing stored and deflate. */ + if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (pState->file_stat.m_method != 0) && (pState->file_stat.m_method != MZ_DEFLATED)) + { + mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Init state - save args */ + pState->pZip = pZip; + pState->flags = flags; + + /* Init state - reset variables to defaults */ + pState->status = TINFL_STATUS_DONE; +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + pState->file_crc32 = MZ_CRC32_INIT; +#endif + pState->read_buf_ofs = 0; + pState->out_buf_ofs = 0; + pState->pRead_buf = NULL; + pState->pWrite_buf = NULL; + pState->out_blk_remain = 0; + + /* Read and parse the local directory entry. */ + pState->cur_file_ofs = pState->file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + pState->cur_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) > pZip->m_archive_size) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + + /* Decompress the file either directly from memory or from a file input buffer. */ + if (pZip->m_pState->m_pMem) + { + pState->pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs; + pState->read_buf_size = pState->read_buf_avail = pState->file_stat.m_comp_size; + pState->comp_remaining = pState->file_stat.m_comp_size; + } + else + { + if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))) + { + /* Decompression required, therefore intermediate read buffer required */ + pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE); + if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size))) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + } + else + { + /* Decompression not required - we will be reading directly into user buffer, no temp buf required */ + pState->read_buf_size = 0; + } + pState->read_buf_avail = 0; + pState->comp_remaining = pState->file_stat.m_comp_size; + } + + if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))) + { + /* Decompression required, init decompressor */ + tinfl_init( &pState->inflator ); + + /* Allocate write buffer */ + if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE))) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + if (pState->pRead_buf) + pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf); + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + return NULL; + } + } + + return pState; +} + +mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags) +{ + mz_uint32 file_index; + + /* Locate file index by name */ + if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index)) + return NULL; + + /* Construct iterator */ + return mz_zip_reader_extract_iter_new(pZip, file_index, flags); +} + +size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size) +{ + size_t copied_to_caller = 0; + + /* Argument sanity check */ + if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf)) + return 0; + + if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)) + { + /* The file is stored or the caller has requested the compressed data, calc amount to return. */ + copied_to_caller = (size_t)MZ_MIN( buf_size, pState->comp_remaining ); + + /* Zip is in memory....or requires reading from a file? */ + if (pState->pZip->m_pState->m_pMem) + { + /* Copy data to caller's buffer */ + memcpy( pvBuf, pState->pRead_buf, copied_to_caller ); + pState->pRead_buf = ((mz_uint8*)pState->pRead_buf) + copied_to_caller; + } + else + { + /* Read directly into caller's buffer */ + if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pvBuf, copied_to_caller) != copied_to_caller) + { + /* Failed to read all that was asked for, flag failure and alert user */ + mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED); + pState->status = TINFL_STATUS_FAILED; + copied_to_caller = 0; + } + } + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + /* Compute CRC if not returning compressed data only */ + if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller); +#endif + + /* Advance offsets, dec counters */ + pState->cur_file_ofs += copied_to_caller; + pState->out_buf_ofs += copied_to_caller; + pState->comp_remaining -= copied_to_caller; + } + else + { + do + { + /* Calc ptr to write buffer - given current output pos and block size */ + mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pState->pWrite_buf + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + + /* Calc max output size - given current output pos and block size */ + size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1)); + + if (!pState->out_blk_remain) + { + /* Read more data from file if none available (and reading from file) */ + if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem)) + { + /* Calc read size */ + pState->read_buf_avail = MZ_MIN(pState->read_buf_size, pState->comp_remaining); + if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pState->pRead_buf, (size_t)pState->read_buf_avail) != pState->read_buf_avail) + { + mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED); + pState->status = TINFL_STATUS_FAILED; + break; + } + + /* Advance offsets, dec counters */ + pState->cur_file_ofs += pState->read_buf_avail; + pState->comp_remaining -= pState->read_buf_avail; + pState->read_buf_ofs = 0; + } + + /* Perform decompression */ + in_buf_size = (size_t)pState->read_buf_avail; + pState->status = tinfl_decompress(&pState->inflator, (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs, &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur, &out_buf_size, pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0); + pState->read_buf_avail -= in_buf_size; + pState->read_buf_ofs += in_buf_size; + + /* Update current output block size remaining */ + pState->out_blk_remain = out_buf_size; + } + + if (pState->out_blk_remain) + { + /* Calc amount to return. */ + size_t to_copy = MZ_MIN( (buf_size - copied_to_caller), pState->out_blk_remain ); + + /* Copy data to caller's buffer */ + memcpy( (uint8_t*)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy ); + +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + /* Perform CRC */ + pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy); +#endif + + /* Decrement data consumed from block */ + pState->out_blk_remain -= to_copy; + + /* Inc output offset, while performing sanity check */ + if ((pState->out_buf_ofs += to_copy) > pState->file_stat.m_uncomp_size) + { + mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED); + pState->status = TINFL_STATUS_FAILED; + break; + } + + /* Increment counter of data copied to caller */ + copied_to_caller += to_copy; + } + } while ( (copied_to_caller < buf_size) && ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) || (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT)) ); + } + + /* Return how many bytes were copied into user buffer */ + return copied_to_caller; +} + +mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState) +{ + int status; + + /* Argument sanity check */ + if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState)) + return MZ_FALSE; + + /* Was decompression completed and requested? */ + if ((pState->status == TINFL_STATUS_DONE) && (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) + { + /* Make sure the entire file was decompressed, and check its CRC. */ + if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size) + { + mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE); + pState->status = TINFL_STATUS_FAILED; + } +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + else if (pState->file_crc32 != pState->file_stat.m_crc32) + { + mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED); + pState->status = TINFL_STATUS_FAILED; + } +#endif + } + + /* Free buffers */ + if (!pState->pZip->m_pState->m_pMem) + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf); + if (pState->pWrite_buf) + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf); + + /* Save status */ + status = pState->status; + + /* Free context */ + pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState); + + return status == TINFL_STATUS_DONE; +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, const void *pBuf, size_t n) +{ + (void)ofs; + + return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque); +} + +mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags) +{ + mz_bool status; + mz_zip_archive_file_stat file_stat; + MZ_FILE *pFile; + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + if ((file_stat.m_is_directory) || (!file_stat.m_is_supported)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + pFile = MZ_FOPEN(pDst_filename, "wb"); + if (!pFile) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + status = mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags); + + if (MZ_FCLOSE(pFile) == EOF) + { + if (status) + mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); + + status = MZ_FALSE; + } + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO) + if (status) + mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time); +#endif + + return status; +} + +mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags) +{ + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags); +} + +mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *pFile, mz_uint flags) +{ + mz_zip_archive_file_stat file_stat; + + if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat)) + return MZ_FALSE; + + if ((file_stat.m_is_directory) || (!file_stat.m_is_supported)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + return mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags); +} + +mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags) +{ + mz_uint32 file_index; + if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index)) + return MZ_FALSE; + + return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags); +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n) +{ + mz_uint32 *p = (mz_uint32 *)pOpaque; + (void)file_ofs; + *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n); + return n; +} + +mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags) +{ + mz_zip_archive_file_stat file_stat; + mz_zip_internal_state *pState; + const mz_uint8 *pCentral_dir_header; + mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE; + mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE; + mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + mz_uint64 local_header_ofs = 0; + mz_uint32 local_header_filename_len, local_header_extra_len, local_header_crc32; + mz_uint64 local_header_comp_size, local_header_uncomp_size; + mz_uint32 uncomp_crc32 = MZ_CRC32_INIT; + mz_bool has_data_descriptor; + mz_uint32 local_header_bit_flags; + + mz_zip_array file_data_array; + mz_zip_array_init(&file_data_array, 1); + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (file_index > pZip->m_total_files) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + pCentral_dir_header = mz_zip_get_cdh(pZip, file_index); + + if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header, &file_stat, &found_zip64_ext_data_in_cdir)) + return MZ_FALSE; + + /* A directory or zero length file */ + if ((file_stat.m_is_directory) || (!file_stat.m_uncomp_size)) + return MZ_TRUE; + + /* Encryption and patch files are not supported. */ + if (file_stat.m_is_encrypted) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); + + /* This function only supports stored and deflate. */ + if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED)) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD); + + if (!file_stat.m_is_supported) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE); + + /* Read and parse the local directory entry. */ + local_header_ofs = file_stat.m_local_header_ofs; + if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + local_header_filename_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS); + local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS); + local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS); + local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS); + local_header_bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS); + has_data_descriptor = (local_header_bit_flags & 8) != 0; + + if (local_header_filename_len != strlen(file_stat.m_filename)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size) > pZip->m_archive_size) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (!mz_zip_array_resize(pZip, &file_data_array, MZ_MAX(local_header_filename_len, local_header_extra_len), MZ_FALSE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (local_header_filename_len) + { + if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE, file_data_array.m_p, local_header_filename_len) != local_header_filename_len) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + /* I've seen 1 archive that had the same pathname, but used backslashes in the local dir and forward slashes in the central dir. Do we care about this? For now, this case will fail validation. */ + if (memcmp(file_stat.m_filename, file_data_array.m_p, local_header_filename_len) != 0) + { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } + + if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX))) + { + mz_uint32 extra_size_remaining = local_header_extra_len; + const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p; + + if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len, file_data_array.m_p, local_header_extra_len) != local_header_extra_len) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + do + { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) + { + const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32); + + if (field_data_size < sizeof(mz_uint64) * 2) + { + mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + goto handle_failure; + } + + local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data); + local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); + + found_zip64_ext_data_in_ldir = MZ_TRUE; + break; + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + } + + /* TODO: parse local header extra data when local_header_comp_size is 0xFFFFFFFF! (big_descriptor.zip) */ + /* I've seen zips in the wild with the data descriptor bit set, but proper local header values and bogus data descriptors */ + if ((has_data_descriptor) && (!local_header_comp_size) && (!local_header_crc32)) + { + mz_uint8 descriptor_buf[32]; + mz_bool has_id; + const mz_uint8 *pSrc; + mz_uint32 file_crc32; + mz_uint64 comp_size = 0, uncomp_size = 0; + + mz_uint32 num_descriptor_uint32s = ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4; + + if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size, descriptor_buf, sizeof(mz_uint32) * num_descriptor_uint32s) != (sizeof(mz_uint32) * num_descriptor_uint32s)) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + goto handle_failure; + } + + has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID); + pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf; + + file_crc32 = MZ_READ_LE32(pSrc); + + if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) + { + comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32)); + uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64)); + } + else + { + comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32)); + uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32)); + } + + if ((file_crc32 != file_stat.m_crc32) || (comp_size != file_stat.m_comp_size) || (uncomp_size != file_stat.m_uncomp_size)) + { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } + else + { + if ((local_header_crc32 != file_stat.m_crc32) || (local_header_comp_size != file_stat.m_comp_size) || (local_header_uncomp_size != file_stat.m_uncomp_size)) + { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + goto handle_failure; + } + } + + mz_zip_array_clear(pZip, &file_data_array); + + if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0) + { + if (!mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0)) + return MZ_FALSE; + + /* 1 more check to be sure, although the extract checks too. */ + if (uncomp_crc32 != file_stat.m_crc32) + { + mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + return MZ_FALSE; + } + } + + return MZ_TRUE; + +handle_failure: + mz_zip_array_clear(pZip, &file_data_array); + return MZ_FALSE; +} + +mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags) +{ + mz_zip_internal_state *pState; + uint32_t i; + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + /* Basic sanity checks */ + if (!pState->m_zip64) + { + if (pZip->m_total_files > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (pZip->m_archive_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } + else + { + if (pZip->m_total_files >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (pState->m_central_dir.m_size >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } + + for (i = 0; i < pZip->m_total_files; i++) + { + if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags) + { + mz_uint32 found_index; + mz_zip_archive_file_stat stat; + + if (!mz_zip_reader_file_stat(pZip, i, &stat)) + return MZ_FALSE; + + if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0, &found_index)) + return MZ_FALSE; + + /* This check can fail if there are duplicate filenames in the archive (which we don't check for when writing - that's up to the user) */ + if (found_index != i) + return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED); + } + + if (!mz_zip_validate_file(pZip, i, flags)) + return MZ_FALSE; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr) +{ + mz_bool success = MZ_TRUE; + mz_zip_archive zip; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + if ((!pMem) || (!size)) + { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + mz_zip_zero_struct(&zip); + + if (!mz_zip_reader_init_mem(&zip, pMem, size, flags)) + { + if (pErr) + *pErr = zip.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_validate_archive(&zip, flags)) + { + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (!mz_zip_reader_end_internal(&zip, success)) + { + if (!actual_err) + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (pErr) + *pErr = actual_err; + + return success; +} + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr) +{ + mz_bool success = MZ_TRUE; + mz_zip_archive zip; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + if (!pFilename) + { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + mz_zip_zero_struct(&zip); + + if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0)) + { + if (pErr) + *pErr = zip.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_validate_archive(&zip, flags)) + { + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (!mz_zip_reader_end_internal(&zip, success)) + { + if (!actual_err) + actual_err = zip.m_last_error; + success = MZ_FALSE; + } + + if (pErr) + *pErr = actual_err; + + return success; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +/* ------------------- .ZIP archive writing */ + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v) +{ + p[0] = (mz_uint8)v; + p[1] = (mz_uint8)(v >> 8); +} +static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v) +{ + p[0] = (mz_uint8)v; + p[1] = (mz_uint8)(v >> 8); + p[2] = (mz_uint8)(v >> 16); + p[3] = (mz_uint8)(v >> 24); +} +static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v) +{ + mz_write_le32(p, (mz_uint32)v); + mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32)); +} + +#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v)) +#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v)) +#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v)) + +static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n) +{ + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_zip_internal_state *pState = pZip->m_pState; + mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size); + + if (!n) + return 0; + + /* An allocation this big is likely to just fail on 32-bit systems, so don't even go there. */ + if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + return 0; + } + + if (new_size > pState->m_mem_capacity) + { + void *pNew_block; + size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity); + + while (new_capacity < new_size) + new_capacity *= 2; + + if (NULL == (pNew_block = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity))) + { + mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + return 0; + } + + pState->m_pMem = pNew_block; + pState->m_mem_capacity = new_capacity; + } + memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n); + pState->m_mem_size = (size_t)new_size; + return n; +} + +static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip, mz_bool set_last_error) +{ + mz_zip_internal_state *pState; + mz_bool status = MZ_TRUE; + + if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))) + { + if (set_last_error) + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return MZ_FALSE; + } + + pState = pZip->m_pState; + pZip->m_pState = NULL; + mz_zip_array_clear(pZip, &pState->m_central_dir); + mz_zip_array_clear(pZip, &pState->m_central_dir_offsets); + mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets); + +#ifndef MINIZ_NO_STDIO + if (pState->m_pFile) + { + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) + { + if (MZ_FCLOSE(pState->m_pFile) == EOF) + { + if (set_last_error) + mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); + status = MZ_FALSE; + } + } + + pState->m_pFile = NULL; + } +#endif /* #ifndef MINIZ_NO_STDIO */ + + if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem); + pState->m_pMem = NULL; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pState); + pZip->m_zip_mode = MZ_ZIP_MODE_INVALID; + return status; +} + +mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags) +{ + mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0; + + if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + { + if (!pZip->m_pRead) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + if (pZip->m_file_offset_alignment) + { + /* Ensure user specified file offset alignment is a power of 2. */ + if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + if (!pZip->m_pAlloc) + pZip->m_pAlloc = miniz_def_alloc_func; + if (!pZip->m_pFree) + pZip->m_pFree = miniz_def_free_func; + if (!pZip->m_pRealloc) + pZip->m_pRealloc = miniz_def_realloc_func; + + pZip->m_archive_size = existing_size; + pZip->m_central_directory_file_ofs = 0; + pZip->m_total_files = 0; + + if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state)); + + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32)); + MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32)); + + pZip->m_pState->m_zip64 = zip64; + pZip->m_pState->m_zip64_has_extended_info_fields = zip64; + + pZip->m_zip_type = MZ_ZIP_TYPE_USER; + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size) +{ + return mz_zip_writer_init_v2(pZip, existing_size, 0); +} + +mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags) +{ + pZip->m_pWrite = mz_zip_heap_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_mem_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags)) + return MZ_FALSE; + + pZip->m_zip_type = MZ_ZIP_TYPE_HEAP; + + if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, size_to_reserve_at_beginning))) + { + if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, initial_allocation_size))) + { + mz_zip_writer_end_internal(pZip, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + pZip->m_pState->m_mem_capacity = initial_allocation_size; + } + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size) +{ + return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning, initial_allocation_size, 0); +} + +#ifndef MINIZ_NO_STDIO +static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n) +{ + mz_zip_archive *pZip = (mz_zip_archive *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile); + + file_ofs += pZip->m_pState->m_file_archive_start_ofs; + + if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET)))) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED); + return 0; + } + + return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile); +} + +mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning) +{ + return mz_zip_writer_init_file_v2(pZip, pFilename, size_to_reserve_at_beginning, 0); +} + +mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags) +{ + MZ_FILE *pFile; + + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags)) + return MZ_FALSE; + + if (NULL == (pFile = MZ_FOPEN(pFilename, (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb"))) + { + mz_zip_writer_end(pZip); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + } + + pZip->m_pState->m_pFile = pFile; + pZip->m_zip_type = MZ_ZIP_TYPE_FILE; + + if (size_to_reserve_at_beginning) + { + mz_uint64 cur_ofs = 0; + char buf[4096]; + + MZ_CLEAR_OBJ(buf); + + do + { + size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning); + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n) + { + mz_zip_writer_end(pZip); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_ofs += n; + size_to_reserve_at_beginning -= n; + } while (size_to_reserve_at_beginning); + } + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags) +{ + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; + + if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) + pZip->m_pRead = mz_zip_file_read_func; + + pZip->m_pIO_opaque = pZip; + + if (!mz_zip_writer_init_v2(pZip, 0, flags)) + return MZ_FALSE; + + pZip->m_pState->m_pFile = pFile; + pZip->m_pState->m_file_archive_start_ofs = MZ_FTELL64(pZip->m_pState->m_pFile); + pZip->m_zip_type = MZ_ZIP_TYPE_CFILE; + + return MZ_TRUE; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags) +{ + mz_zip_internal_state *pState; + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (flags & MZ_ZIP_FLAG_WRITE_ZIP64) + { + /* We don't support converting a non-zip64 file to zip64 - this seems like more trouble than it's worth. (What about the existing 32-bit data descriptors that could follow the compressed data?) */ + if (!pZip->m_pState->m_zip64) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + /* No sense in trying to write to an archive that's already at the support max size */ + if (pZip->m_pState->m_zip64) + { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + else + { + if (pZip->m_total_files == MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + + if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + } + + pState = pZip->m_pState; + + if (pState->m_pFile) + { +#ifdef MINIZ_NO_STDIO + (void)pFilename; + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); +#else + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE) + { + if (!pFilename) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Archive is being read from stdio and was originally opened only for reading. Try to reopen as writable. */ + if (NULL == (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile))) + { + /* The mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it. */ + mz_zip_reader_end_internal(pZip, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + } + } + + pZip->m_pWrite = mz_zip_file_write_func; + pZip->m_pNeeds_keepalive = NULL; +#endif /* #ifdef MINIZ_NO_STDIO */ + } + else if (pState->m_pMem) + { + /* Archive lives in a memory block. Assume it's from the heap that we can resize using the realloc callback. */ + if (pZip->m_pIO_opaque != pZip) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState->m_mem_capacity = pState->m_mem_size; + pZip->m_pWrite = mz_zip_heap_write_func; + pZip->m_pNeeds_keepalive = NULL; + } + /* Archive is being read via a user provided read function - make sure the user has specified a write function too. */ + else if (!pZip->m_pWrite) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Start writing new files at the archive's current central directory location. */ + /* TODO: We could add a flag that lets the user start writing immediately AFTER the existing central dir - this would be safer. */ + pZip->m_archive_size = pZip->m_central_directory_file_ofs; + pZip->m_central_directory_file_ofs = 0; + + /* Clear the sorted central dir offsets, they aren't useful or maintained now. */ + /* Even though we're now in write mode, files can still be extracted and verified, but file locates will be slow. */ + /* TODO: We could easily maintain the sorted central directory offsets. */ + mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets); + + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename) +{ + return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0); +} + +/* TODO: pArchive_name is a terrible name here! */ +mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags) +{ + return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0); +} + +typedef struct +{ + mz_zip_archive *m_pZip; + mz_uint64 m_cur_archive_file_ofs; + mz_uint64 m_comp_size; +} mz_zip_writer_add_state; + +static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len, void *pUser) +{ + mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser; + if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, pState->m_cur_archive_file_ofs, pBuf, len) != len) + return MZ_FALSE; + + pState->m_cur_archive_file_ofs += len; + pState->m_comp_size += len; + return MZ_TRUE; +} + +#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2) +#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3) +static mz_uint32 mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size, mz_uint64 *pComp_size, mz_uint64 *pLocal_header_ofs) +{ + mz_uint8 *pDst = pBuf; + mz_uint32 field_size = 0; + + MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID); + MZ_WRITE_LE16(pDst + 2, 0); + pDst += sizeof(mz_uint16) * 2; + + if (pUncomp_size) + { + MZ_WRITE_LE64(pDst, *pUncomp_size); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + if (pComp_size) + { + MZ_WRITE_LE64(pDst, *pComp_size); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + if (pLocal_header_ofs) + { + MZ_WRITE_LE64(pDst, *pLocal_header_ofs); + pDst += sizeof(mz_uint64); + field_size += sizeof(mz_uint64); + } + + MZ_WRITE_LE16(pBuf + 2, field_size); + + return (mz_uint32)(pDst - pBuf); +} + +static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date) +{ + (void)pZip; + memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_SIG_OFS, MZ_ZIP_LOCAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_VERSION_NEEDED_OFS, method ? 20 : 0); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_BIT_FLAG_OFS, bit_flags); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_METHOD_OFS, method); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size); + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, + mz_uint16 filename_size, mz_uint16 extra_size, mz_uint16 comment_size, + mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, + mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date, + mz_uint64 local_header_ofs, mz_uint32 ext_attributes) +{ + (void)pZip; + memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX)); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size); + MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes); + MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_MIN(local_header_ofs, MZ_UINT32_MAX)); + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_add_to_central_dir(mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size, + const void *pExtra, mz_uint16 extra_size, const void *pComment, mz_uint16 comment_size, + mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, + mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date, + mz_uint64 local_header_ofs, mz_uint32 ext_attributes, + const char *user_extra_data, mz_uint user_extra_data_len) +{ + mz_zip_internal_state *pState = pZip->m_pState; + mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size; + size_t orig_central_dir_size = pState->m_central_dir.m_size; + mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE]; + + if (!pZip->m_pState->m_zip64) + { + if (local_header_ofs > 0xFFFFFFFF) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE); + } + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + user_extra_data_len + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, (mz_uint16)(extra_size + user_extra_data_len), comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data, user_extra_data_len)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) || + (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, ¢ral_dir_ofs, 1))) + { + /* Try to resize the central directory array back into its original state. */ + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + return MZ_TRUE; +} + +static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name) +{ + /* Basic ZIP archive filename validity checks: Valid filenames cannot start with a forward slash, cannot contain a drive letter, and cannot use DOS-style backward slashes. */ + if (*pArchive_name == '/') + return MZ_FALSE; + + /* Making sure the name does not contain drive letters or DOS style backward slashes is the responsibility of the program using miniz*/ + + return MZ_TRUE; +} + +static mz_uint mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip) +{ + mz_uint32 n; + if (!pZip->m_file_offset_alignment) + return 0; + n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1)); + return (mz_uint)((pZip->m_file_offset_alignment - n) & (pZip->m_file_offset_alignment - 1)); +} + +static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_file_ofs, mz_uint32 n) +{ + char buf[4096]; + memset(buf, 0, MZ_MIN(sizeof(buf), n)); + while (n) + { + mz_uint32 s = MZ_MIN(sizeof(buf), n); + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_file_ofs += s; + n -= s; + } + return MZ_TRUE; +} + +mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + mz_uint64 uncomp_size, mz_uint32 uncomp_crc32) +{ + return mz_zip_writer_add_mem_ex_v2(pZip, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0); +} + +mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, + mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified, + const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len) +{ + mz_uint16 method = 0, dos_time = 0, dos_date = 0; + mz_uint level, ext_attributes = 0, num_alignment_padding_bytes; + mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0; + size_t archive_name_size; + mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE]; + tdefl_compressor *pComp = NULL; + mz_bool store_data_uncompressed; + mz_zip_internal_state *pState; + mz_uint8 *pExtra_data = NULL; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_uint16 bit_flags = 0; + + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + + if (uncomp_size || (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))) + bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR; + + if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) + bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; + + level = level_and_flags & 0xF; + store_data_uncompressed = ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)); + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + if (pState->m_zip64) + { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + else + { + if (pZip->m_total_files == MZ_UINT16_MAX) + { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */ + } + if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF)) + { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + + if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + +#ifndef MINIZ_NO_TIME + if (last_modified != NULL) + { + mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date); + } + else + { + MZ_TIME_T cur_time; + time(&cur_time); + mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date); + } +#endif /* #ifndef MINIZ_NO_TIME */ + + if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + { + uncomp_crc32 = (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, buf_size); + uncomp_size = buf_size; + if (uncomp_size <= 3) + { + level = 0; + store_data_uncompressed = MZ_TRUE; + } + } + + archive_name_size = strlen(pArchive_name); + if (archive_name_size > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!pState->m_zip64) + { + /* Bail early if the archive would obviously become too large */ + if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len + + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len + + MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF) + { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + + if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/')) + { + /* Set DOS Subdirectory attribute bit. */ + ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG; + + /* Subdirectories cannot contain data. */ + if ((buf_size) || (uncomp_size)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + } + + /* Try to do any allocations before writing to the archive, so if an allocation fails the file remains unmodified. (A good idea if we're doing an in-place modification.) */ + if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) || (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if ((!store_data_uncompressed) && (buf_size)) + { + if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor)))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return MZ_FALSE; + } + + local_dir_header_ofs += num_alignment_padding_bytes; + if (pZip->m_file_offset_alignment) + { + MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0); + } + cur_archive_file_ofs += num_alignment_padding_bytes; + + MZ_CLEAR_OBJ(local_dir_header); + + if (!store_data_uncompressed || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) + { + method = MZ_DEFLATED; + } + + if (pState->m_zip64) + { + if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) + { + pExtra_data = extra_data; + extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, bit_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_archive_file_ofs += archive_name_size; + + if (pExtra_data != NULL) + { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += extra_size; + } + } + else + { + if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_archive_file_ofs += archive_name_size; + } + + if (user_extra_data_len > 0) + { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += user_extra_data_len; + } + + if (store_data_uncompressed) + { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf, buf_size) != buf_size) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += buf_size; + comp_size = buf_size; + } + else if (buf_size) + { + mz_zip_writer_add_state state; + + state.m_pZip = pZip; + state.m_cur_archive_file_ofs = cur_archive_file_ofs; + state.m_comp_size = 0; + + if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) || + (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != TDEFL_STATUS_DONE)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED); + } + + comp_size = state.m_comp_size; + cur_archive_file_ofs = state.m_cur_archive_file_ofs; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + pComp = NULL; + + if (uncomp_size) + { + mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64]; + mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32; + + MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR); + + MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID); + MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32); + if (pExtra_data == NULL) + { + if (comp_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(local_dir_footer + 8, comp_size); + MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size); + } + else + { + MZ_WRITE_LE64(local_dir_footer + 8, comp_size); + MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size); + local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64; + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size) + return MZ_FALSE; + + cur_archive_file_ofs += local_dir_footer_size; + } + + if (pExtra_data != NULL) + { + extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment, + comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes, + user_extra_data_central, user_extra_data_central_len)) + return MZ_FALSE; + + pZip->m_total_files++; + pZip->m_archive_size = cur_archive_file_ofs; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 size_to_add, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len) +{ + mz_uint16 gen_flags = MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR; + mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes; + mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0; + mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = size_to_add, comp_size = 0; + size_t archive_name_size; + mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE]; + mz_uint8 *pExtra_data = NULL; + mz_uint32 extra_size = 0; + mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE]; + mz_zip_internal_state *pState; + mz_uint64 file_ofs = 0; + + if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME)) + gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; + + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + level = level_and_flags & 0xF; + + /* Sanity checks */ + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + if ((!pState->m_zip64) && (uncomp_size > MZ_UINT32_MAX)) + { + /* Source file is too large for non-zip64 */ + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + pState->m_zip64 = MZ_TRUE; + } + + /* We could support this, but why? */ + if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + if (pState->m_zip64) + { + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + else + { + if (pZip->m_total_files == MZ_UINT16_MAX) + { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */ + } + } + + archive_name_size = strlen(pArchive_name); + if (archive_name_size > MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME); + + num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */ + if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + if (!pState->m_zip64) + { + /* Bail early if the archive would obviously become too large */ + if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + + archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024 + + MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF) + { + pState->m_zip64 = MZ_TRUE; + /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */ + } + } + +#ifndef MINIZ_NO_TIME + if (pFile_time) + { + mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date); + } +#endif + + if (uncomp_size <= 3) + level = 0; + + if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes)) + { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += num_alignment_padding_bytes; + local_dir_header_ofs = cur_archive_file_ofs; + + if (pZip->m_file_offset_alignment) + { + MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) == 0); + } + + if (uncomp_size && level) + { + method = MZ_DEFLATED; + } + + MZ_CLEAR_OBJ(local_dir_header); + if (pState->m_zip64) + { + if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX) + { + pExtra_data = extra_data; + extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, gen_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size) + { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += archive_name_size; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += extra_size; + } + else + { + if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags, dos_time, dos_date)) + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += sizeof(local_dir_header); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size) + { + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_archive_file_ofs += archive_name_size; + } + + if (user_extra_data_len > 0) + { + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_archive_file_ofs += user_extra_data_len; + } + + if (uncomp_size) + { + mz_uint64 uncomp_remaining = uncomp_size; + void *pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE); + if (!pRead_buf) + { + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!level) + { + while (uncomp_remaining) + { + mz_uint n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, uncomp_remaining); + if ((read_callback(callback_opaque, file_ofs, pRead_buf, n) != n) || (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, n) != n)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + file_ofs += n; + uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n); + uncomp_remaining -= n; + cur_archive_file_ofs += n; + } + comp_size = uncomp_size; + } + else + { + mz_bool result = MZ_FALSE; + mz_zip_writer_add_state state; + tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor)); + if (!pComp) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + state.m_pZip = pZip; + state.m_cur_archive_file_ofs = cur_archive_file_ofs; + state.m_comp_size = 0; + + if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR); + } + + for (;;) + { + size_t in_buf_size = (mz_uint32)MZ_MIN(uncomp_remaining, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE); + tdefl_status status; + tdefl_flush flush = TDEFL_NO_FLUSH; + + if (read_callback(callback_opaque, file_ofs, pRead_buf, in_buf_size)!= in_buf_size) + { + mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + break; + } + + file_ofs += in_buf_size; + uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, in_buf_size); + uncomp_remaining -= in_buf_size; + + if (pZip->m_pNeeds_keepalive != NULL && pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque)) + flush = TDEFL_FULL_FLUSH; + + status = tdefl_compress_buffer(pComp, pRead_buf, in_buf_size, uncomp_remaining ? flush : TDEFL_FINISH); + if (status == TDEFL_STATUS_DONE) + { + result = MZ_TRUE; + break; + } + else if (status != TDEFL_STATUS_OKAY) + { + mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED); + break; + } + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pComp); + + if (!result) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + return MZ_FALSE; + } + + comp_size = state.m_comp_size; + cur_archive_file_ofs = state.m_cur_archive_file_ofs; + } + + pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf); + } + + { + mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64]; + mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32; + + MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID); + MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32); + if (pExtra_data == NULL) + { + if (comp_size > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(local_dir_footer + 8, comp_size); + MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size); + } + else + { + MZ_WRITE_LE64(local_dir_footer + 8, comp_size); + MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size); + local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64; + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size) + return MZ_FALSE; + + cur_archive_file_ofs += local_dir_footer_size; + } + + if (pExtra_data != NULL) + { + extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL, + (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL); + } + + if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment, comment_size, + uncomp_size, comp_size, uncomp_crc32, method, gen_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes, + user_extra_data_central, user_extra_data_central_len)) + return MZ_FALSE; + + pZip->m_total_files++; + pZip->m_archive_size = cur_archive_file_ofs; + + return MZ_TRUE; +} + +#ifndef MINIZ_NO_STDIO + +static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n) +{ + MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque; + mz_int64 cur_ofs = MZ_FTELL64(pSrc_file); + + if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET)))) + return 0; + + return MZ_FREAD(pBuf, 1, n, pSrc_file); +} + +mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 size_to_add, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len) +{ + return mz_zip_writer_add_read_buf_callback(pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, size_to_add, pFile_time, pComment, comment_size, level_and_flags, + user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len); +} + +mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags) +{ + MZ_FILE *pSrc_file = NULL; + mz_uint64 uncomp_size = 0; + MZ_TIME_T file_modified_time; + MZ_TIME_T *pFile_time = NULL; + mz_bool status; + + memset(&file_modified_time, 0, sizeof(file_modified_time)); + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO) + pFile_time = &file_modified_time; + if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED); +#endif + + pSrc_file = MZ_FOPEN(pSrc_filename, "rb"); + if (!pSrc_file) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED); + + MZ_FSEEK64(pSrc_file, 0, SEEK_END); + uncomp_size = MZ_FTELL64(pSrc_file); + MZ_FSEEK64(pSrc_file, 0, SEEK_SET); + + status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0); + + MZ_FCLOSE(pSrc_file); + + return status; +} +#endif /* #ifndef MINIZ_NO_STDIO */ + +static mz_bool mz_zip_writer_update_zip64_extension_block(mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt, uint32_t ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size, mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start) +{ + /* + 64 should be enough for any new zip64 data */ + if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE); + + if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start)) + { + mz_uint8 new_ext_block[64]; + mz_uint8 *pDst = new_ext_block; + mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID); + mz_write_le16(pDst + sizeof(mz_uint16), 0); + pDst += sizeof(mz_uint16) * 2; + + if (pUncomp_size) + { + mz_write_le64(pDst, *pUncomp_size); + pDst += sizeof(mz_uint64); + } + + if (pComp_size) + { + mz_write_le64(pDst, *pComp_size); + pDst += sizeof(mz_uint64); + } + + if (pLocal_header_ofs) + { + mz_write_le64(pDst, *pLocal_header_ofs); + pDst += sizeof(mz_uint64); + } + + if (pDisk_start) + { + mz_write_le32(pDst, *pDisk_start); + pDst += sizeof(mz_uint32); + } + + mz_write_le16(new_ext_block + sizeof(mz_uint16), (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2)); + + if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block, pDst - new_ext_block)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if ((pExt) && (ext_len)) + { + mz_uint32 extra_size_remaining = ext_len; + const mz_uint8 *pExtra_data = pExt; + + do + { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) + { + if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data, field_total_size)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + } + + return MZ_TRUE; +} + +/* TODO: This func is now pretty freakin complex due to zip64, split it up? */ +mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index) +{ + mz_uint n, bit_flags, num_alignment_padding_bytes, src_central_dir_following_data_size; + mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs; + mz_uint64 cur_src_file_ofs, cur_dst_file_ofs; + mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; + mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32; + mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE]; + size_t orig_central_dir_size; + mz_zip_internal_state *pState; + void *pBuf; + const mz_uint8 *pSrc_central_header; + mz_zip_archive_file_stat src_file_stat; + mz_uint32 src_filename_len, src_comment_len, src_ext_len; + mz_uint32 local_header_filename_size, local_header_extra_len; + mz_uint64 local_header_comp_size, local_header_uncomp_size; + mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE; + + /* Sanity checks */ + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + /* Don't support copying files from zip64 archives to non-zip64, even though in some cases this is possible */ + if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + /* Get pointer to the source central dir header and crack it */ + if (NULL == (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index))) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + src_filename_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS); + src_comment_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS); + src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS); + src_central_dir_following_data_size = src_filename_len + src_ext_len + src_comment_len; + + /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32 fudge factor in case we need to add more extra data) */ + if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + + num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip); + + if (!pState->m_zip64) + { + if (pZip->m_total_files == MZ_UINT16_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + else + { + /* TODO: Our zip64 support still has some 32-bit limits that may not be worth fixing. */ + if (pZip->m_total_files == MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + + if (!mz_zip_file_stat_internal(pSource_zip, src_file_index, pSrc_central_header, &src_file_stat, NULL)) + return MZ_FALSE; + + cur_src_file_ofs = src_file_stat.m_local_header_ofs; + cur_dst_file_ofs = pZip->m_archive_size; + + /* Read the source archive's local dir header */ + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + + if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + + cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE; + + /* Compute the total size we need to copy (filename+extra data+compressed data) */ + local_header_filename_size = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS); + local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS); + local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS); + local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS); + src_archive_bytes_remaining = local_header_filename_size + local_header_extra_len + src_file_stat.m_comp_size; + + /* Try to find a zip64 extended information field */ + if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX))) + { + mz_zip_array file_data_array; + const mz_uint8 *pExtra_data; + mz_uint32 extra_size_remaining = local_header_extra_len; + + mz_zip_array_init(&file_data_array, 1); + if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len, MZ_FALSE)) + { + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, src_file_stat.m_local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_size, file_data_array.m_p, local_header_extra_len) != local_header_extra_len) + { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + pExtra_data = (const mz_uint8 *)file_data_array.m_p; + + do + { + mz_uint32 field_id, field_data_size, field_total_size; + + if (extra_size_remaining < (sizeof(mz_uint16) * 2)) + { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + field_id = MZ_READ_LE16(pExtra_data); + field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); + field_total_size = field_data_size + sizeof(mz_uint16) * 2; + + if (field_total_size > extra_size_remaining) + { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) + { + const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32); + + if (field_data_size < sizeof(mz_uint64) * 2) + { + mz_zip_array_clear(pZip, &file_data_array); + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); + } + + local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data); + local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); /* may be 0 if there's a descriptor */ + + found_zip64_ext_data_in_ldir = MZ_TRUE; + break; + } + + pExtra_data += field_total_size; + extra_size_remaining -= field_total_size; + } while (extra_size_remaining); + + mz_zip_array_clear(pZip, &file_data_array); + } + + if (!pState->m_zip64) + { + /* Try to detect if the new archive will most likely wind up too big and bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which could be present, +64 is a fudge factor). */ + /* We also check when the archive is finalized so this doesn't need to be perfect. */ + mz_uint64 approx_new_archive_size = cur_dst_file_ofs + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining + (sizeof(mz_uint32) * 4) + + pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64; + + if (approx_new_archive_size >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + } + + /* Write dest archive padding */ + if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes)) + return MZ_FALSE; + + cur_dst_file_ofs += num_alignment_padding_bytes; + + local_dir_header_ofs = cur_dst_file_ofs; + if (pZip->m_file_offset_alignment) + { + MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0); + } + + /* The original zip's local header+ext block doesn't change, even with zip64, so we can just copy it over to the dest zip */ + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE; + + /* Copy over the source archive bytes to the dest archive, also ensure we have enough buf space to handle optional data descriptor */ + if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining))))) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + while (src_archive_bytes_remaining) + { + n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining); + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, n) != n) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + cur_src_file_ofs += n; + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + cur_dst_file_ofs += n; + + src_archive_bytes_remaining -= n; + } + + /* Now deal with the optional data descriptor */ + bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS); + if (bit_flags & 8) + { + /* Copy data descriptor */ + if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir)) + { + /* src is zip64, dest must be zip64 */ + + /* name uint32_t's */ + /* id 1 (optional in zip64?) */ + /* crc 1 */ + /* comp_size 2 */ + /* uncomp_size 2 */ + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, (sizeof(mz_uint32) * 6)) != (sizeof(mz_uint32) * 6)) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5); + } + else + { + /* src is NOT zip64 */ + mz_bool has_id; + + if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); + } + + has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID); + + if (pZip->m_pState->m_zip64) + { + /* dest is zip64, so upgrade the data descriptor */ + const mz_uint32 *pSrc_descriptor = (const mz_uint32 *)((const mz_uint8 *)pBuf + (has_id ? sizeof(mz_uint32) : 0)); + const mz_uint32 src_crc32 = pSrc_descriptor[0]; + const mz_uint64 src_comp_size = pSrc_descriptor[1]; + const mz_uint64 src_uncomp_size = pSrc_descriptor[2]; + + mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID); + mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32); + mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size); + mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4, src_uncomp_size); + + n = sizeof(mz_uint32) * 6; + } + else + { + /* dest is NOT zip64, just copy it as-is */ + n = sizeof(mz_uint32) * (has_id ? 4 : 3); + } + } + + if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n) + { + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + } + + cur_src_file_ofs += n; + cur_dst_file_ofs += n; + } + pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf); + + /* Finally, add the new central dir header */ + orig_central_dir_size = pState->m_central_dir.m_size; + + memcpy(new_central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE); + + if (pState->m_zip64) + { + /* This is the painful part: We need to write a new central dir header + ext block with updated zip64 fields, and ensure the old fields (if any) are not included. */ + const mz_uint8 *pSrc_ext = pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len; + mz_zip_array new_ext_block; + + mz_zip_array_init(&new_ext_block, sizeof(mz_uint8)); + + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_UINT32_MAX); + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_UINT32_MAX); + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_UINT32_MAX); + + if (!mz_zip_writer_update_zip64_extension_block(&new_ext_block, pZip, pSrc_ext, src_ext_len, &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size, &local_dir_header_ofs, NULL)) + { + mz_zip_array_clear(pZip, &new_ext_block); + return MZ_FALSE; + } + + MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS, new_ext_block.m_size); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) + { + mz_zip_array_clear(pZip, &new_ext_block); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_filename_len)) + { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p, new_ext_block.m_size)) + { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len + src_ext_len, src_comment_len)) + { + mz_zip_array_clear(pZip, &new_ext_block); + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + mz_zip_array_clear(pZip, &new_ext_block); + } + else + { + /* sanity checks */ + if (cur_dst_file_ofs > MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + if (local_dir_header_ofs >= MZ_UINT32_MAX) + return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); + + MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_dir_header_ofs); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_central_dir_following_data_size)) + { + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + } + + /* This shouldn't trigger unless we screwed up during the initial sanity checks */ + if (pState->m_central_dir.m_size >= MZ_UINT32_MAX) + { + /* TODO: Support central dirs >= 32-bits in size */ + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); + } + + n = (mz_uint32)orig_central_dir_size; + if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1)) + { + mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); + return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); + } + + pZip->m_total_files++; + pZip->m_archive_size = cur_dst_file_ofs; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip) +{ + mz_zip_internal_state *pState; + mz_uint64 central_dir_ofs, central_dir_size; + mz_uint8 hdr[256]; + + if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + pState = pZip->m_pState; + + if (pState->m_zip64) + { + if ((pZip->m_total_files > MZ_UINT32_MAX) || (pState->m_central_dir.m_size >= MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + else + { + if ((pZip->m_total_files > MZ_UINT16_MAX) || ((pZip->m_archive_size + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)) + return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); + } + + central_dir_ofs = 0; + central_dir_size = 0; + if (pZip->m_total_files) + { + /* Write central directory */ + central_dir_ofs = pZip->m_archive_size; + central_dir_size = pState->m_central_dir.m_size; + pZip->m_central_directory_file_ofs = central_dir_ofs; + if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs, pState->m_central_dir.m_p, (size_t)central_dir_size) != central_dir_size) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += central_dir_size; + } + + if (pState->m_zip64) + { + /* Write zip64 end of central directory header */ + mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size; + + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) - sizeof(mz_uint64)); + MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS, 0x031E); /* TODO: always Unix */ + MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, pZip->m_total_files); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS, pZip->m_total_files); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs); + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE; + + /* Write zip64 end of central directory locator */ + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG); + MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS, rel_ofs_to_zip64_ecdr); + MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1); + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + + pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE; + } + + /* Write end of central directory record */ + MZ_CLEAR_OBJ(hdr); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG); + MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files)); + MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files)); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_size)); + MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_ofs)); + + if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED); + +#ifndef MINIZ_NO_STDIO + if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF)) + return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED); +#endif /* #ifndef MINIZ_NO_STDIO */ + + pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE; + + pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED; + return MZ_TRUE; +} + +mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize) +{ + if ((!ppBuf) || (!pSize)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + *ppBuf = NULL; + *pSize = 0; + + if ((!pZip) || (!pZip->m_pState)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (pZip->m_pWrite != mz_zip_heap_write_func) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + if (!mz_zip_writer_finalize_archive(pZip)) + return MZ_FALSE; + + *ppBuf = pZip->m_pState->m_pMem; + *pSize = pZip->m_pState->m_mem_size; + pZip->m_pState->m_pMem = NULL; + pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0; + + return MZ_TRUE; +} + +mz_bool mz_zip_writer_end(mz_zip_archive *pZip) +{ + return mz_zip_writer_end_internal(pZip, MZ_TRUE); +} + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags) +{ + return mz_zip_add_mem_to_archive_file_in_place_v2(pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, NULL); +} + +mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr) +{ + mz_bool status, created_new_archive = MZ_FALSE; + mz_zip_archive zip_archive; + struct MZ_FILE_STAT_STRUCT file_stat; + mz_zip_error actual_err = MZ_ZIP_NO_ERROR; + + mz_zip_zero_struct(&zip_archive); + if ((int)level_and_flags < 0) + level_and_flags = MZ_DEFAULT_LEVEL; + + if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || ((comment_size) && (!pComment)) || ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION)) + { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + return MZ_FALSE; + } + + if (!mz_zip_writer_validate_archive_name(pArchive_name)) + { + if (pErr) + *pErr = MZ_ZIP_INVALID_FILENAME; + return MZ_FALSE; + } + + /* Important: The regular non-64 bit version of stat() can fail here if the file is very large, which could cause the archive to be overwritten. */ + /* So be sure to compile with _LARGEFILE64_SOURCE 1 */ + if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0) + { + /* Create a new archive. */ + if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0, level_and_flags)) + { + if (pErr) + *pErr = zip_archive.m_last_error; + return MZ_FALSE; + } + + created_new_archive = MZ_TRUE; + } + else + { + /* Append to an existing archive. */ + if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) + { + if (pErr) + *pErr = zip_archive.m_last_error; + return MZ_FALSE; + } + + if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename, level_and_flags)) + { + if (pErr) + *pErr = zip_archive.m_last_error; + + mz_zip_reader_end_internal(&zip_archive, MZ_FALSE); + + return MZ_FALSE; + } + } + + status = mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0); + actual_err = zip_archive.m_last_error; + + /* Always finalize, even if adding failed for some reason, so we have a valid central directory. (This may not always succeed, but we can try.) */ + if (!mz_zip_writer_finalize_archive(&zip_archive)) + { + if (!actual_err) + actual_err = zip_archive.m_last_error; + + status = MZ_FALSE; + } + + if (!mz_zip_writer_end_internal(&zip_archive, status)) + { + if (!actual_err) + actual_err = zip_archive.m_last_error; + + status = MZ_FALSE; + } + + if ((!status) && (created_new_archive)) + { + /* It's a new archive and something went wrong, so just delete it. */ + int ignoredStatus = MZ_DELETE_FILE(pZip_filename); + (void)ignoredStatus; + } + + if (pErr) + *pErr = actual_err; + + return status; +} + +void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr) +{ + mz_uint32 file_index; + mz_zip_archive zip_archive; + void *p = NULL; + + if (pSize) + *pSize = 0; + + if ((!pZip_filename) || (!pArchive_name)) + { + if (pErr) + *pErr = MZ_ZIP_INVALID_PARAMETER; + + return NULL; + } + + mz_zip_zero_struct(&zip_archive); + if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0)) + { + if (pErr) + *pErr = zip_archive.m_last_error; + + return NULL; + } + + if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags, &file_index)) + { + p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags); + } + + mz_zip_reader_end_internal(&zip_archive, p != NULL); + + if (pErr) + *pErr = zip_archive.m_last_error; + + return p; +} + +void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags) +{ + return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name, NULL, pSize, flags, NULL); +} + +#endif /* #ifndef MINIZ_NO_STDIO */ + +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */ + +/* ------------------- Misc utils */ + +mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip) +{ + return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID; +} + +mz_zip_type mz_zip_get_type(mz_zip_archive *pZip) +{ + return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID; +} + +mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num) +{ + mz_zip_error prev_err; + + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + prev_err = pZip->m_last_error; + + pZip->m_last_error = err_num; + return prev_err; +} + +mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip) +{ + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + return pZip->m_last_error; +} + +mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip) +{ + return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR); +} + +mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip) +{ + mz_zip_error prev_err; + + if (!pZip) + return MZ_ZIP_INVALID_PARAMETER; + + prev_err = pZip->m_last_error; + + pZip->m_last_error = MZ_ZIP_NO_ERROR; + return prev_err; +} + +const char *mz_zip_get_error_string(mz_zip_error mz_err) +{ + switch (mz_err) + { + case MZ_ZIP_NO_ERROR: + return "no error"; + case MZ_ZIP_UNDEFINED_ERROR: + return "undefined error"; + case MZ_ZIP_TOO_MANY_FILES: + return "too many files"; + case MZ_ZIP_FILE_TOO_LARGE: + return "file too large"; + case MZ_ZIP_UNSUPPORTED_METHOD: + return "unsupported method"; + case MZ_ZIP_UNSUPPORTED_ENCRYPTION: + return "unsupported encryption"; + case MZ_ZIP_UNSUPPORTED_FEATURE: + return "unsupported feature"; + case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR: + return "failed finding central directory"; + case MZ_ZIP_NOT_AN_ARCHIVE: + return "not a ZIP archive"; + case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED: + return "invalid header or archive is corrupted"; + case MZ_ZIP_UNSUPPORTED_MULTIDISK: + return "unsupported multidisk archive"; + case MZ_ZIP_DECOMPRESSION_FAILED: + return "decompression failed or archive is corrupted"; + case MZ_ZIP_COMPRESSION_FAILED: + return "compression failed"; + case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE: + return "unexpected decompressed size"; + case MZ_ZIP_CRC_CHECK_FAILED: + return "CRC-32 check failed"; + case MZ_ZIP_UNSUPPORTED_CDIR_SIZE: + return "unsupported central directory size"; + case MZ_ZIP_ALLOC_FAILED: + return "allocation failed"; + case MZ_ZIP_FILE_OPEN_FAILED: + return "file open failed"; + case MZ_ZIP_FILE_CREATE_FAILED: + return "file create failed"; + case MZ_ZIP_FILE_WRITE_FAILED: + return "file write failed"; + case MZ_ZIP_FILE_READ_FAILED: + return "file read failed"; + case MZ_ZIP_FILE_CLOSE_FAILED: + return "file close failed"; + case MZ_ZIP_FILE_SEEK_FAILED: + return "file seek failed"; + case MZ_ZIP_FILE_STAT_FAILED: + return "file stat failed"; + case MZ_ZIP_INVALID_PARAMETER: + return "invalid parameter"; + case MZ_ZIP_INVALID_FILENAME: + return "invalid filename"; + case MZ_ZIP_BUF_TOO_SMALL: + return "buffer too small"; + case MZ_ZIP_INTERNAL_ERROR: + return "internal error"; + case MZ_ZIP_FILE_NOT_FOUND: + return "file not found"; + case MZ_ZIP_ARCHIVE_TOO_LARGE: + return "archive is too large"; + case MZ_ZIP_VALIDATION_FAILED: + return "validation failed"; + case MZ_ZIP_WRITE_CALLBACK_FAILED: + return "write calledback failed"; + default: + break; + } + + return "unknown error"; +} + +/* Note: Just because the archive is not zip64 doesn't necessarily mean it doesn't have Zip64 extended information extra field, argh. */ +mz_bool mz_zip_is_zip64(mz_zip_archive *pZip) +{ + if ((!pZip) || (!pZip->m_pState)) + return MZ_FALSE; + + return pZip->m_pState->m_zip64; +} + +size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip) +{ + if ((!pZip) || (!pZip->m_pState)) + return 0; + + return pZip->m_pState->m_central_dir.m_size; +} + +mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip) +{ + return pZip ? pZip->m_total_files : 0; +} + +mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip) +{ + if (!pZip) + return 0; + return pZip->m_archive_size; +} + +mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip) +{ + if ((!pZip) || (!pZip->m_pState)) + return 0; + return pZip->m_pState->m_file_archive_start_ofs; +} + +MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip) +{ + if ((!pZip) || (!pZip->m_pState)) + return 0; + return pZip->m_pState->m_pFile; +} + +size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n) +{ + if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead)) + return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + + return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n); +} + +mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size) +{ + mz_uint n; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) + { + if (filename_buf_size) + pFilename[0] = '\0'; + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return 0; + } + n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + if (filename_buf_size) + { + n = MZ_MIN(n, filename_buf_size - 1); + memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n); + pFilename[n] = '\0'; + } + return n + 1; +} + +mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat) +{ + return mz_zip_file_stat_internal(pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL); +} + +mz_bool mz_zip_end(mz_zip_archive *pZip) +{ + if (!pZip) + return MZ_FALSE; + + if (pZip->m_zip_mode == MZ_ZIP_MODE_READING) + return mz_zip_reader_end(pZip); +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) || (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)) + return mz_zip_writer_end(pZip); +#endif + + return MZ_FALSE; +} + +#ifdef __cplusplus +} +#endif + +#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/ diff --git a/launchers/win32/libs/miniz.h b/launchers/win32/libs/miniz.h new file mode 100644 index 0000000000..7db62811e5 --- /dev/null +++ b/launchers/win32/libs/miniz.h @@ -0,0 +1,1338 @@ +/* miniz.c 2.1.0 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing + See "unlicense" statement at the end of this file. + Rich Geldreich , last updated Oct. 13, 2013 + Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt + + Most API's defined in miniz.c are optional. For example, to disable the archive related functions just define + MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros). + + * Low-level Deflate/Inflate implementation notes: + + Compression: Use the "tdefl" API's. The compressor supports raw, static, and dynamic blocks, lazy or + greedy parsing, match length filtering, RLE-only, and Huffman-only streams. It performs and compresses + approximately as well as zlib. + + Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function + coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory + block large enough to hold the entire file. + + The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation. + + * zlib-style API notes: + + miniz.c implements a fairly large subset of zlib. There's enough functionality present for it to be a drop-in + zlib replacement in many apps: + The z_stream struct, optional memory allocation callbacks + deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound + inflateInit/inflateInit2/inflate/inflateReset/inflateEnd + compress, compress2, compressBound, uncompress + CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly routines. + Supports raw deflate streams or standard zlib streams with adler-32 checking. + + Limitations: + The callback API's are not implemented yet. No support for gzip headers or zlib static dictionaries. + I've tried to closely emulate zlib's various flavors of stream flushing and return status codes, but + there are no guarantees that miniz.c pulls this off perfectly. + + * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, originally written by + Alex Evans. Supports 1-4 bytes/pixel images. + + * ZIP archive API notes: + + The ZIP archive API's where designed with simplicity and efficiency in mind, with just enough abstraction to + get the job done with minimal fuss. There are simple API's to retrieve file information, read files from + existing archives, create new archives, append new files to existing archives, or clone archive data from + one archive to another. It supports archives located in memory or the heap, on disk (using stdio.h), + or you can specify custom file read/write callbacks. + + - Archive reading: Just call this function to read a single file from a disk archive: + + void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, + size_t *pSize, mz_uint zip_flags); + + For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central + directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files. + + - Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file: + + int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags); + + The locate operation can optionally check file comments too, which (as one example) can be used to identify + multiple versions of the same file in an archive. This function uses a simple linear search through the central + directory, so it's not very fast. + + Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and + retrieve detailed info on each file by calling mz_zip_reader_file_stat(). + + - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data + to disk and builds an exact image of the central directory in memory. The central directory image is written + all at once at the end of the archive file when the archive is finalized. + + The archive writer can optionally align each file's local header and file data to any power of 2 alignment, + which can be useful when the archive will be read from optical media. Also, the writer supports placing + arbitrary data blobs at the very beginning of ZIP archives. Archives written using either feature are still + readable by any ZIP tool. + + - Archive appending: The simple way to add a single file to an archive is to call this function: + + mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, + const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); + + The archive will be created if it doesn't already exist, otherwise it'll be appended to. + Note the appending is done in-place and is not an atomic operation, so if something goes wrong + during the operation it's possible the archive could be left without a central directory (although the local + file headers and file data will be fine, so the archive will be recoverable). + + For more complex archive modification scenarios: + 1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to + preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the + compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and + you're done. This is safe but requires a bunch of temporary disk space or heap memory. + + 2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(), + append new files as needed, then finalize the archive which will write an updated central directory to the + original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a + possibility that the archive's central directory could be lost with this method if anything goes wrong, though. + + - ZIP archive support limitations: + No zip64 or spanning support. Extraction functions can only handle unencrypted, stored or deflated files. + Requires streams capable of seeking. + + * This is a header file library, like stb_image.c. To get only a header file, either cut and paste the + below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it. + + * Important: For best perf. be sure to customize the below macros for your target platform: + #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 + #define MINIZ_LITTLE_ENDIAN 1 + #define MINIZ_HAS_64BIT_REGISTERS 1 + + * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before including miniz.c to ensure miniz + uses the 64-bit variants: fopen64(), stat64(), etc. Otherwise you won't be able to process large files + (i.e. 32-bit stat() fails for me on files > 0x7FFFFFFF bytes). +*/ +#pragma once + + + + + +/* Defines to completely disable specific portions of miniz.c: + If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. */ + +/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */ +/*#define MINIZ_NO_STDIO */ + +/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */ +/* get/set file times, and the C run-time funcs that get/set times won't be called. */ +/* The current downside is the times written to your archives will be from 1979. */ +/*#define MINIZ_NO_TIME */ + +/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */ +/*#define MINIZ_NO_ARCHIVE_APIS */ + +/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP archive API's. */ +/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */ + +/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression API's. */ +/*#define MINIZ_NO_ZLIB_APIS */ + +/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */ +/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ + +/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. + Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc + callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user + functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */ +/*#define MINIZ_NO_MALLOC */ + +#if defined(__TINYC__) && (defined(__linux) || defined(__linux__)) +/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc on Linux */ +#define MINIZ_NO_TIME +#endif + +#include + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS) +#include +#endif + +#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__) +/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */ +#define MINIZ_X86_OR_X64_CPU 1 +#else +#define MINIZ_X86_OR_X64_CPU 0 +#endif + +#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU +/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */ +#define MINIZ_LITTLE_ENDIAN 1 +#else +#define MINIZ_LITTLE_ENDIAN 0 +#endif + +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ +#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) +#if MINIZ_X86_OR_X64_CPU +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 +#define MINIZ_UNALIGNED_USE_MEMCPY +#else +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 +#endif +#endif + +#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__) +/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). */ +#define MINIZ_HAS_64BIT_REGISTERS 1 +#else +#define MINIZ_HAS_64BIT_REGISTERS 0 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------- zlib-style API Definitions. */ + +/* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */ +typedef unsigned long mz_ulong; + +/* mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap. */ +void mz_free(void *p); + +#define MZ_ADLER32_INIT (1) +/* mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL. */ +mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len); + +#define MZ_CRC32_INIT (0) +/* mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL. */ +mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len); + +/* Compression strategies. */ +enum +{ + MZ_DEFAULT_STRATEGY = 0, + MZ_FILTERED = 1, + MZ_HUFFMAN_ONLY = 2, + MZ_RLE = 3, + MZ_FIXED = 4 +}; + +/* Method */ +#define MZ_DEFLATED 8 + +/* Heap allocation callbacks. +Note that mz_alloc_func parameter types purpsosely differ from zlib's: items/size is size_t, not unsigned long. */ +typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size); +typedef void (*mz_free_func)(void *opaque, void *address); +typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size); + +/* Compression levels: 0-9 are the standard zlib-style levels, 10 is best possible compression (not zlib compatible, and may be very slow), MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */ +enum +{ + MZ_NO_COMPRESSION = 0, + MZ_BEST_SPEED = 1, + MZ_BEST_COMPRESSION = 9, + MZ_UBER_COMPRESSION = 10, + MZ_DEFAULT_LEVEL = 6, + MZ_DEFAULT_COMPRESSION = -1 +}; + +#define MZ_VERSION "10.1.0" +#define MZ_VERNUM 0xA100 +#define MZ_VER_MAJOR 10 +#define MZ_VER_MINOR 1 +#define MZ_VER_REVISION 0 +#define MZ_VER_SUBREVISION 0 + +#ifndef MINIZ_NO_ZLIB_APIS + +/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other values are for advanced use (refer to the zlib docs). */ +enum +{ + MZ_NO_FLUSH = 0, + MZ_PARTIAL_FLUSH = 1, + MZ_SYNC_FLUSH = 2, + MZ_FULL_FLUSH = 3, + MZ_FINISH = 4, + MZ_BLOCK = 5 +}; + +/* Return status codes. MZ_PARAM_ERROR is non-standard. */ +enum +{ + MZ_OK = 0, + MZ_STREAM_END = 1, + MZ_NEED_DICT = 2, + MZ_ERRNO = -1, + MZ_STREAM_ERROR = -2, + MZ_DATA_ERROR = -3, + MZ_MEM_ERROR = -4, + MZ_BUF_ERROR = -5, + MZ_VERSION_ERROR = -6, + MZ_PARAM_ERROR = -10000 +}; + +/* Window bits */ +#define MZ_DEFAULT_WINDOW_BITS 15 + +struct mz_internal_state; + +/* Compression/decompression stream struct. */ +typedef struct mz_stream_s +{ + const unsigned char *next_in; /* pointer to next byte to read */ + unsigned int avail_in; /* number of bytes available at next_in */ + mz_ulong total_in; /* total number of bytes consumed so far */ + + unsigned char *next_out; /* pointer to next byte to write */ + unsigned int avail_out; /* number of bytes that can be written to next_out */ + mz_ulong total_out; /* total number of bytes produced so far */ + + char *msg; /* error msg (unused) */ + struct mz_internal_state *state; /* internal state, allocated by zalloc/zfree */ + + mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */ + mz_free_func zfree; /* optional heap free function (defaults to free) */ + void *opaque; /* heap alloc function user pointer */ + + int data_type; /* data_type (unused) */ + mz_ulong adler; /* adler32 of the source or uncompressed data */ + mz_ulong reserved; /* not used */ +} mz_stream; + +typedef mz_stream *mz_streamp; + +/* Returns the version string of miniz.c. */ +const char *mz_version(void); + +/* mz_deflateInit() initializes a compressor with default options: */ +/* Parameters: */ +/* pStream must point to an initialized mz_stream struct. */ +/* level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */ +/* level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio. */ +/* (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */ +/* Return values: */ +/* MZ_OK on success. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_PARAM_ERROR if the input parameters are bogus. */ +/* MZ_MEM_ERROR on out of memory. */ +int mz_deflateInit(mz_streamp pStream, int level); + +/* mz_deflateInit2() is like mz_deflate(), except with more control: */ +/* Additional parameters: */ +/* method must be MZ_DEFLATED */ +/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer) */ +/* mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */ +int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy); + +/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */ +int mz_deflateReset(mz_streamp pStream); + +/* mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible. */ +/* Parameters: */ +/* pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */ +/* flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH. */ +/* Return values: */ +/* MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full). */ +/* MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_PARAM_ERROR if one of the parameters is invalid. */ +/* MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.) */ +int mz_deflate(mz_streamp pStream, int flush); + +/* mz_deflateEnd() deinitializes a compressor: */ +/* Return values: */ +/* MZ_OK on success. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +int mz_deflateEnd(mz_streamp pStream); + +/* mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH. */ +mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len); + +/* Single-call compression functions mz_compress() and mz_compress2(): */ +/* Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure. */ +int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len); +int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level); + +/* mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress(). */ +mz_ulong mz_compressBound(mz_ulong source_len); + +/* Initializes a decompressor. */ +int mz_inflateInit(mz_streamp pStream); + +/* mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer: */ +/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate). */ +int mz_inflateInit2(mz_streamp pStream, int window_bits); + +/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */ +int mz_inflateReset(mz_streamp pStream); + +/* Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible. */ +/* Parameters: */ +/* pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */ +/* flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */ +/* On the first call, if flush is MZ_FINISH it's assumed the input and output buffers are both sized large enough to decompress the entire stream in a single call (this is slightly faster). */ +/* MZ_FINISH implies that there are no more source bytes available beside what's already in the input buffer, and that the output buffer is large enough to hold the rest of the decompressed data. */ +/* Return values: */ +/* MZ_OK on success. Either more input is needed but not available, and/or there's more output to be written but the output buffer is full. */ +/* MZ_STREAM_END if all needed input has been consumed and all output bytes have been written. For zlib streams, the adler-32 of the decompressed data has also been verified. */ +/* MZ_STREAM_ERROR if the stream is bogus. */ +/* MZ_DATA_ERROR if the deflate stream is invalid. */ +/* MZ_PARAM_ERROR if one of the parameters is invalid. */ +/* MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again */ +/* with more input data, or with more room in the output buffer (except when using single call decompression, described above). */ +int mz_inflate(mz_streamp pStream, int flush); + +/* Deinitializes a decompressor. */ +int mz_inflateEnd(mz_streamp pStream); + +/* Single-call decompression. */ +/* Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. */ +int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len); + +/* Returns a string description of the specified error code, or NULL if the error code is invalid. */ +const char *mz_error(int err); + +/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports. */ +/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project. */ +#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES +typedef unsigned char Byte; +typedef unsigned int uInt; +typedef mz_ulong uLong; +typedef Byte Bytef; +typedef uInt uIntf; +typedef char charf; +typedef int intf; +typedef void *voidpf; +typedef uLong uLongf; +typedef void *voidp; +typedef void *const voidpc; +#define Z_NULL 0 +#define Z_NO_FLUSH MZ_NO_FLUSH +#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH +#define Z_SYNC_FLUSH MZ_SYNC_FLUSH +#define Z_FULL_FLUSH MZ_FULL_FLUSH +#define Z_FINISH MZ_FINISH +#define Z_BLOCK MZ_BLOCK +#define Z_OK MZ_OK +#define Z_STREAM_END MZ_STREAM_END +#define Z_NEED_DICT MZ_NEED_DICT +#define Z_ERRNO MZ_ERRNO +#define Z_STREAM_ERROR MZ_STREAM_ERROR +#define Z_DATA_ERROR MZ_DATA_ERROR +#define Z_MEM_ERROR MZ_MEM_ERROR +#define Z_BUF_ERROR MZ_BUF_ERROR +#define Z_VERSION_ERROR MZ_VERSION_ERROR +#define Z_PARAM_ERROR MZ_PARAM_ERROR +#define Z_NO_COMPRESSION MZ_NO_COMPRESSION +#define Z_BEST_SPEED MZ_BEST_SPEED +#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION +#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION +#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY +#define Z_FILTERED MZ_FILTERED +#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY +#define Z_RLE MZ_RLE +#define Z_FIXED MZ_FIXED +#define Z_DEFLATED MZ_DEFLATED +#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS +#define alloc_func mz_alloc_func +#define free_func mz_free_func +#define internal_state mz_internal_state +#define z_stream mz_stream +#define deflateInit mz_deflateInit +#define deflateInit2 mz_deflateInit2 +#define deflateReset mz_deflateReset +#define deflate mz_deflate +#define deflateEnd mz_deflateEnd +#define deflateBound mz_deflateBound +#define compress mz_compress +#define compress2 mz_compress2 +#define compressBound mz_compressBound +#define inflateInit mz_inflateInit +#define inflateInit2 mz_inflateInit2 +#define inflateReset mz_inflateReset +#define inflate mz_inflate +#define inflateEnd mz_inflateEnd +#define uncompress mz_uncompress +#define crc32 mz_crc32 +#define adler32 mz_adler32 +#define MAX_WBITS 15 +#define MAX_MEM_LEVEL 9 +#define zError mz_error +#define ZLIB_VERSION MZ_VERSION +#define ZLIB_VERNUM MZ_VERNUM +#define ZLIB_VER_MAJOR MZ_VER_MAJOR +#define ZLIB_VER_MINOR MZ_VER_MINOR +#define ZLIB_VER_REVISION MZ_VER_REVISION +#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION +#define zlibVersion mz_version +#define zlib_version mz_version() +#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ + +#endif /* MINIZ_NO_ZLIB_APIS */ + +#ifdef __cplusplus +} +#endif +#pragma once +#include +#include +#include +#include + +/* ------------------- Types and macros */ +typedef unsigned char mz_uint8; +typedef signed short mz_int16; +typedef unsigned short mz_uint16; +typedef unsigned int mz_uint32; +typedef unsigned int mz_uint; +typedef int64_t mz_int64; +typedef uint64_t mz_uint64; +typedef int mz_bool; + +#define MZ_FALSE (0) +#define MZ_TRUE (1) + +/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */ +#ifdef _MSC_VER +#define MZ_MACRO_END while (0, 0) +#else +#define MZ_MACRO_END while (0) +#endif + +#ifdef MINIZ_NO_STDIO +#define MZ_FILE void * +#else +#include +#define MZ_FILE FILE +#endif /* #ifdef MINIZ_NO_STDIO */ + +#ifdef MINIZ_NO_TIME +typedef struct mz_dummy_time_t_tag +{ + int m_dummy; +} mz_dummy_time_t; +#define MZ_TIME_T mz_dummy_time_t +#else +#define MZ_TIME_T time_t +#endif + +#define MZ_ASSERT(x) assert(x) + +#ifdef MINIZ_NO_MALLOC +#define MZ_MALLOC(x) NULL +#define MZ_FREE(x) (void)x, ((void)0) +#define MZ_REALLOC(p, x) NULL +#else +#define MZ_MALLOC(x) malloc(x) +#define MZ_FREE(x) free(x) +#define MZ_REALLOC(p, x) realloc(p, x) +#endif + +#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b)) +#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj)) + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN +#define MZ_READ_LE16(p) *((const mz_uint16 *)(p)) +#define MZ_READ_LE32(p) *((const mz_uint32 *)(p)) +#else +#define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U)) +#define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) +#endif + +#define MZ_READ_LE64(p) (((mz_uint64)MZ_READ_LE32(p)) | (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) << 32U)) + +#ifdef _MSC_VER +#define MZ_FORCEINLINE __forceinline +#elif defined(__GNUC__) +#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__)) +#else +#define MZ_FORCEINLINE inline +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +extern void *miniz_def_alloc_func(void *opaque, size_t items, size_t size); +extern void miniz_def_free_func(void *opaque, void *address); +extern void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size); + +#define MZ_UINT16_MAX (0xFFFFU) +#define MZ_UINT32_MAX (0xFFFFFFFFU) + +#ifdef __cplusplus +} +#endif +#pragma once + + +#ifdef __cplusplus +extern "C" { +#endif +/* ------------------- Low-level Compression API Definitions */ + +/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly slower, and raw/dynamic blocks will be output more frequently). */ +#define TDEFL_LESS_MEMORY 0 + +/* tdefl_init() compression flags logically OR'd together (low 12 bits contain the max. number of probes per dictionary search): */ +/* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ (slowest/best compression). */ +enum +{ + TDEFL_HUFFMAN_ONLY = 0, + TDEFL_DEFAULT_MAX_PROBES = 128, + TDEFL_MAX_PROBES_MASK = 0xFFF +}; + +/* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before the deflate data, and the Adler-32 of the source data at the end. Otherwise, you'll get raw deflate data. */ +/* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even when not writing zlib headers). */ +/* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more efficient lazy parsing. */ +/* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's initialization time to the minimum, but the output may vary from run to run given the same input (depending on the contents of memory). */ +/* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) */ +/* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */ +/* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */ +/* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */ +/* The low 12 bits are reserved to control the max # of hash probes per dictionary lookup (see TDEFL_MAX_PROBES_MASK). */ +enum +{ + TDEFL_WRITE_ZLIB_HEADER = 0x01000, + TDEFL_COMPUTE_ADLER32 = 0x02000, + TDEFL_GREEDY_PARSING_FLAG = 0x04000, + TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000, + TDEFL_RLE_MATCHES = 0x10000, + TDEFL_FILTER_MATCHES = 0x20000, + TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000, + TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000 +}; + +/* High level compression functions: */ +/* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block allocated via malloc(). */ +/* On entry: */ +/* pSrc_buf, src_buf_len: Pointer and size of source block to compress. */ +/* flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. */ +/* On return: */ +/* Function returns a pointer to the compressed data, or NULL on failure. */ +/* *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. */ +/* The caller must free() the returned block when it's no longer needed. */ +void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); + +/* tdefl_compress_mem_to_mem() compresses a block in memory to another block in memory. */ +/* Returns 0 on failure. */ +size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags); + +/* Compresses an image to a compressed PNG file in memory. */ +/* On entry: */ +/* pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. */ +/* The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory. */ +/* level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */ +/* If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps). */ +/* On return: */ +/* Function returns a pointer to the compressed data, or NULL on failure. */ +/* *pLen_out will be set to the size of the PNG image file. */ +/* The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed. */ +void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip); +void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out); + +/* Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */ +typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser); + +/* tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally. */ +mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +enum +{ + TDEFL_MAX_HUFF_TABLES = 3, + TDEFL_MAX_HUFF_SYMBOLS_0 = 288, + TDEFL_MAX_HUFF_SYMBOLS_1 = 32, + TDEFL_MAX_HUFF_SYMBOLS_2 = 19, + TDEFL_LZ_DICT_SIZE = 32768, + TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1, + TDEFL_MIN_MATCH_LEN = 3, + TDEFL_MAX_MATCH_LEN = 258 +}; + +/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed output block (using static/fixed Huffman codes). */ +#if TDEFL_LESS_MEMORY +enum +{ + TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024, + TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10, + TDEFL_MAX_HUFF_SYMBOLS = 288, + TDEFL_LZ_HASH_BITS = 12, + TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, + TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, + TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS +}; +#else +enum +{ + TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024, + TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10, + TDEFL_MAX_HUFF_SYMBOLS = 288, + TDEFL_LZ_HASH_BITS = 15, + TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, + TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, + TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS +}; +#endif + +/* The low-level tdefl functions below may be used directly if the above helper functions aren't flexible enough. The low-level functions don't make any heap allocations, unlike the above helper functions. */ +typedef enum { + TDEFL_STATUS_BAD_PARAM = -2, + TDEFL_STATUS_PUT_BUF_FAILED = -1, + TDEFL_STATUS_OKAY = 0, + TDEFL_STATUS_DONE = 1 +} tdefl_status; + +/* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */ +typedef enum { + TDEFL_NO_FLUSH = 0, + TDEFL_SYNC_FLUSH = 2, + TDEFL_FULL_FLUSH = 3, + TDEFL_FINISH = 4 +} tdefl_flush; + +/* tdefl's compression state structure. */ +typedef struct +{ + tdefl_put_buf_func_ptr m_pPut_buf_func; + void *m_pPut_buf_user; + mz_uint m_flags, m_max_probes[2]; + int m_greedy_parsing; + mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size; + mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end; + mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer; + mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish; + tdefl_status m_prev_return_status; + const void *m_pIn_buf; + void *m_pOut_buf; + size_t *m_pIn_buf_size, *m_pOut_buf_size; + tdefl_flush m_flush; + const mz_uint8 *m_pSrc; + size_t m_src_buf_left, m_out_buf_ofs; + mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1]; + mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE]; + mz_uint16 m_next[TDEFL_LZ_DICT_SIZE]; + mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE]; + mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE]; +} tdefl_compressor; + +/* Initializes the compressor. */ +/* There is no corresponding deinit() function because the tdefl API's do not dynamically allocate memory. */ +/* pBut_buf_func: If NULL, output data will be supplied to the specified callback. In this case, the user should call the tdefl_compress_buffer() API for compression. */ +/* If pBut_buf_func is NULL the user should always call the tdefl_compress() API. */ +/* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.) */ +tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +/* Compresses a block of data, consuming as much of the specified input buffer as possible, and writing as much compressed data to the specified output buffer as possible. */ +tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush); + +/* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a non-NULL tdefl_put_buf_func_ptr. */ +/* tdefl_compress_buffer() always consumes the entire input buffer. */ +tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush); + +tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d); +mz_uint32 tdefl_get_adler32(tdefl_compressor *d); + +/* Create tdefl_compress() flags given zlib-style compression parameters. */ +/* level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files) */ +/* window_bits may be -15 (raw deflate) or 15 (zlib) */ +/* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED */ +mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy); + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tdefl_compressor structure in C so that */ +/* non-C language bindings to tdefl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +tdefl_compressor *tdefl_compressor_alloc(void); +void tdefl_compressor_free(tdefl_compressor *pComp); +#endif + +#ifdef __cplusplus +} +#endif +#pragma once + +/* ------------------- Low-level Decompression API Definitions */ + +#ifdef __cplusplus +extern "C" { +#endif +/* Decompression flags used by tinfl_decompress(). */ +/* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream. */ +/* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input. */ +/* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB). */ +/* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the decompressed bytes. */ +enum +{ + TINFL_FLAG_PARSE_ZLIB_HEADER = 1, + TINFL_FLAG_HAS_MORE_INPUT = 2, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4, + TINFL_FLAG_COMPUTE_ADLER32 = 8 +}; + +/* High level decompression functions: */ +/* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc(). */ +/* On entry: */ +/* pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. */ +/* On return: */ +/* Function returns a pointer to the decompressed data, or NULL on failure. */ +/* *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. */ +/* The caller must call mz_free() on the returned block when it's no longer needed. */ +void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); + +/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory. */ +/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success. */ +#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1)) +size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags); + +/* tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer. */ +/* Returns 1 on success or 0 on failure. */ +typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser); +int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +struct tinfl_decompressor_tag; +typedef struct tinfl_decompressor_tag tinfl_decompressor; + +#ifndef MINIZ_NO_MALLOC +/* Allocate the tinfl_decompressor structure in C so that */ +/* non-C language bindings to tinfl_ API don't need to worry about */ +/* structure size and allocation mechanism. */ +tinfl_decompressor *tinfl_decompressor_alloc(void); +void tinfl_decompressor_free(tinfl_decompressor *pDecomp); +#endif + +/* Max size of LZ dictionary. */ +#define TINFL_LZ_DICT_SIZE 32768 + +/* Return status. */ +typedef enum { + /* This flags indicates the inflator needs 1 or more input bytes to make forward progress, but the caller is indicating that no more are available. The compressed data */ + /* is probably corrupted. If you call the inflator again with more bytes it'll try to continue processing the input but this is a BAD sign (either the data is corrupted or you called it incorrectly). */ + /* If you call it again with no input you'll just get TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */ + TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4, + + /* This flag indicates that one or more of the input parameters was obviously bogus. (You can try calling it again, but if you get this error the calling code is wrong.) */ + TINFL_STATUS_BAD_PARAM = -3, + + /* This flags indicate the inflator is finished but the adler32 check of the uncompressed data didn't match. If you call it again it'll return TINFL_STATUS_DONE. */ + TINFL_STATUS_ADLER32_MISMATCH = -2, + + /* This flags indicate the inflator has somehow failed (bad code, corrupted input, etc.). If you call it again without resetting via tinfl_init() it it'll just keep on returning the same status failure code. */ + TINFL_STATUS_FAILED = -1, + + /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */ + + /* This flag indicates the inflator has returned every byte of uncompressed data that it can, has consumed every byte that it needed, has successfully reached the end of the deflate stream, and */ + /* if zlib headers and adler32 checking enabled that it has successfully checked the uncompressed data's adler32. If you call it again you'll just get TINFL_STATUS_DONE over and over again. */ + TINFL_STATUS_DONE = 0, + + /* This flag indicates the inflator MUST have more input data (even 1 byte) before it can make any more forward progress, or you need to clear the TINFL_FLAG_HAS_MORE_INPUT */ + /* flag on the next call if you don't have any more source data. If the source data was somehow corrupted it's also possible (but unlikely) for the inflator to keep on demanding input to */ + /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */ + TINFL_STATUS_NEEDS_MORE_INPUT = 1, + + /* This flag indicates the inflator definitely has 1 or more bytes of uncompressed data available, but it cannot write this data into the output buffer. */ + /* Note if the source compressed data was corrupted it's possible for the inflator to return a lot of uncompressed data to the caller. I've been assuming you know how much uncompressed data to expect */ + /* (either exact or worst case) and will stop calling the inflator and fail after receiving too much. In pure streaming scenarios where you have no idea how many bytes to expect this may not be possible */ + /* so I may need to add some code to address this. */ + TINFL_STATUS_HAS_MORE_OUTPUT = 2 +} tinfl_status; + +/* Initializes the decompressor to its initial state. */ +#define tinfl_init(r) \ + do \ + { \ + (r)->m_state = 0; \ + } \ + MZ_MACRO_END +#define tinfl_get_adler32(r) (r)->m_check_adler32 + +/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */ +/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */ +tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags); + +/* Internal/private bits follow. */ +enum +{ + TINFL_MAX_HUFF_TABLES = 3, + TINFL_MAX_HUFF_SYMBOLS_0 = 288, + TINFL_MAX_HUFF_SYMBOLS_1 = 32, + TINFL_MAX_HUFF_SYMBOLS_2 = 19, + TINFL_FAST_LOOKUP_BITS = 10, + TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS +}; + +typedef struct +{ + mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0]; + mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2]; +} tinfl_huff_table; + +#if MINIZ_HAS_64BIT_REGISTERS +#define TINFL_USE_64BIT_BITBUF 1 +#else +#define TINFL_USE_64BIT_BITBUF 0 +#endif + +#if TINFL_USE_64BIT_BITBUF +typedef mz_uint64 tinfl_bit_buf_t; +#define TINFL_BITBUF_SIZE (64) +#else +typedef mz_uint32 tinfl_bit_buf_t; +#define TINFL_BITBUF_SIZE (32) +#endif + +struct tinfl_decompressor_tag +{ + mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES]; + tinfl_bit_buf_t m_bit_buf; + size_t m_dist_from_out_buf_start; + tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES]; + mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137]; +}; + +#ifdef __cplusplus +} +#endif + +#pragma once + + +/* ------------------- ZIP archive reading/writing */ + +#ifndef MINIZ_NO_ARCHIVE_APIS + +#ifdef __cplusplus +extern "C" { +#endif + +enum +{ + /* Note: These enums can be reduced as needed to save memory or stack space - they are pretty conservative. */ + MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024, + MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512, + MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512 +}; + +typedef struct +{ + /* Central directory file index. */ + mz_uint32 m_file_index; + + /* Byte offset of this entry in the archive's central directory. Note we currently only support up to UINT_MAX or less bytes in the central dir. */ + mz_uint64 m_central_dir_ofs; + + /* These fields are copied directly from the zip's central dir. */ + mz_uint16 m_version_made_by; + mz_uint16 m_version_needed; + mz_uint16 m_bit_flag; + mz_uint16 m_method; + +#ifndef MINIZ_NO_TIME + MZ_TIME_T m_time; +#endif + + /* CRC-32 of uncompressed data. */ + mz_uint32 m_crc32; + + /* File's compressed size. */ + mz_uint64 m_comp_size; + + /* File's uncompressed size. Note, I've seen some old archives where directory entries had 512 bytes for their uncompressed sizes, but when you try to unpack them you actually get 0 bytes. */ + mz_uint64 m_uncomp_size; + + /* Zip internal and external file attributes. */ + mz_uint16 m_internal_attr; + mz_uint32 m_external_attr; + + /* Entry's local header file offset in bytes. */ + mz_uint64 m_local_header_ofs; + + /* Size of comment in bytes. */ + mz_uint32 m_comment_size; + + /* MZ_TRUE if the entry appears to be a directory. */ + mz_bool m_is_directory; + + /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip doesn't support) */ + mz_bool m_is_encrypted; + + /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a compression method we support. */ + mz_bool m_is_supported; + + /* Filename. If string ends in '/' it's a subdirectory entry. */ + /* Guaranteed to be zero terminated, may be truncated to fit. */ + char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE]; + + /* Comment field. */ + /* Guaranteed to be zero terminated, may be truncated to fit. */ + char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE]; + +} mz_zip_archive_file_stat; + +typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n); +typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n); +typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); + +struct mz_zip_internal_state_tag; +typedef struct mz_zip_internal_state_tag mz_zip_internal_state; + +typedef enum { + MZ_ZIP_MODE_INVALID = 0, + MZ_ZIP_MODE_READING = 1, + MZ_ZIP_MODE_WRITING = 2, + MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 +} mz_zip_mode; + +typedef enum { + MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100, + MZ_ZIP_FLAG_IGNORE_PATH = 0x0200, + MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400, + MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800, + MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each file as its validated to ensure the func finds the file in the central dir (intended for testing) */ + MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = 0x2000, /* validate the local headers, but don't decompress the entire file and check the crc32 */ + MZ_ZIP_FLAG_WRITE_ZIP64 = 0x4000, /* always use the zip64 file format, instead of the original zip file format with automatic switch to zip64. Use as flags parameter with mz_zip_writer_init*_v2 */ + MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000, + MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000 +} mz_zip_flags; + +typedef enum { + MZ_ZIP_TYPE_INVALID = 0, + MZ_ZIP_TYPE_USER, + MZ_ZIP_TYPE_MEMORY, + MZ_ZIP_TYPE_HEAP, + MZ_ZIP_TYPE_FILE, + MZ_ZIP_TYPE_CFILE, + MZ_ZIP_TOTAL_TYPES +} mz_zip_type; + +/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or modify this enum. */ +typedef enum { + MZ_ZIP_NO_ERROR = 0, + MZ_ZIP_UNDEFINED_ERROR, + MZ_ZIP_TOO_MANY_FILES, + MZ_ZIP_FILE_TOO_LARGE, + MZ_ZIP_UNSUPPORTED_METHOD, + MZ_ZIP_UNSUPPORTED_ENCRYPTION, + MZ_ZIP_UNSUPPORTED_FEATURE, + MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, + MZ_ZIP_NOT_AN_ARCHIVE, + MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, + MZ_ZIP_UNSUPPORTED_MULTIDISK, + MZ_ZIP_DECOMPRESSION_FAILED, + MZ_ZIP_COMPRESSION_FAILED, + MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, + MZ_ZIP_CRC_CHECK_FAILED, + MZ_ZIP_UNSUPPORTED_CDIR_SIZE, + MZ_ZIP_ALLOC_FAILED, + MZ_ZIP_FILE_OPEN_FAILED, + MZ_ZIP_FILE_CREATE_FAILED, + MZ_ZIP_FILE_WRITE_FAILED, + MZ_ZIP_FILE_READ_FAILED, + MZ_ZIP_FILE_CLOSE_FAILED, + MZ_ZIP_FILE_SEEK_FAILED, + MZ_ZIP_FILE_STAT_FAILED, + MZ_ZIP_INVALID_PARAMETER, + MZ_ZIP_INVALID_FILENAME, + MZ_ZIP_BUF_TOO_SMALL, + MZ_ZIP_INTERNAL_ERROR, + MZ_ZIP_FILE_NOT_FOUND, + MZ_ZIP_ARCHIVE_TOO_LARGE, + MZ_ZIP_VALIDATION_FAILED, + MZ_ZIP_WRITE_CALLBACK_FAILED, + MZ_ZIP_TOTAL_ERRORS +} mz_zip_error; + +typedef struct +{ + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; + + /* We only support up to UINT32_MAX files in zip64 mode. */ + mz_uint32 m_total_files; + mz_zip_mode m_zip_mode; + mz_zip_type m_zip_type; + mz_zip_error m_last_error; + + mz_uint64 m_file_offset_alignment; + + mz_alloc_func m_pAlloc; + mz_free_func m_pFree; + mz_realloc_func m_pRealloc; + void *m_pAlloc_opaque; + + mz_file_read_func m_pRead; + mz_file_write_func m_pWrite; + mz_file_needs_keepalive m_pNeeds_keepalive; + void *m_pIO_opaque; + + mz_zip_internal_state *m_pState; + +} mz_zip_archive; + +typedef struct +{ + mz_zip_archive *pZip; + mz_uint flags; + + int status; +#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS + mz_uint file_crc32; +#endif + mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining, out_buf_ofs, cur_file_ofs; + mz_zip_archive_file_stat file_stat; + void *pRead_buf; + void *pWrite_buf; + + size_t out_blk_remain; + + tinfl_decompressor inflator; + +} mz_zip_reader_extract_iter_state; + +/* -------- ZIP reading */ + +/* Inits a ZIP archive reader. */ +/* These functions read and validate the archive's central directory. */ +mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags); + +mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags); + +#ifndef MINIZ_NO_STDIO +/* Read a archive from a disk file. */ +/* file_start_ofs is the file offset where the archive actually begins, or 0. */ +/* actual_archive_size is the true total size of the archive, which may be smaller than the file's actual size on disk. If zero the entire file is treated as the archive. */ +mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags); +mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size); + +/* Read an archive from an already opened FILE, beginning at the current file position. */ +/* The archive is assumed to be archive_size bytes long. If archive_size is < 0, then the entire rest of the file is assumed to contain the archive. */ +/* The FILE will NOT be closed when mz_zip_reader_end() is called. */ +mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags); +#endif + +/* Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used. */ +mz_bool mz_zip_reader_end(mz_zip_archive *pZip); + +/* -------- ZIP reading or writing */ + +/* Clears a mz_zip_archive struct to all zeros. */ +/* Important: This must be done before passing the struct to any mz_zip functions. */ +void mz_zip_zero_struct(mz_zip_archive *pZip); + +mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip); +mz_zip_type mz_zip_get_type(mz_zip_archive *pZip); + +/* Returns the total number of files in the archive. */ +mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip); + +mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip); +mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip); +MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip); + +/* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf. */ +size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n); + +/* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct. These functions retrieve/manipulate this field. */ +/* Note that the m_last_error functionality is not thread safe. */ +mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num); +mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip); +mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip); +mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip); +const char *mz_zip_get_error_string(mz_zip_error mz_err); + +/* MZ_TRUE if the archive file entry is a directory entry. */ +mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index); + +/* MZ_TRUE if the file is encrypted/strong encrypted. */ +mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index); + +/* MZ_TRUE if the compression method is supported, and the file is not encrypted, and the file is not a compressed patch file. */ +mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index); + +/* Retrieves the filename of an archive file entry. */ +/* Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. */ +mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size); + +/* Attempts to locates a file in the archive's central directory. */ +/* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */ +/* Returns -1 if the file cannot be found. */ +int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags); +int mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *file_index); + +/* Returns detailed information about an archive file entry. */ +mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat); + +/* MZ_TRUE if the file is in zip64 format. */ +/* A file is considered zip64 if it contained a zip64 end of central directory marker, or if it contained any zip64 extended file information fields in the central directory. */ +mz_bool mz_zip_is_zip64(mz_zip_archive *pZip); + +/* Returns the total central directory size in bytes. */ +/* The current max supported size is <= MZ_UINT32_MAX. */ +size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip); + +/* Extracts a archive file to a memory buffer using no memory allocation. */ +/* There must be at least enough room on the stack to store the inflator's state (~34KB or so). */ +mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); +mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); + +/* Extracts a archive file to a memory buffer. */ +mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags); + +/* Extracts a archive file to a dynamically allocated heap buffer. */ +/* The memory will be allocated via the mz_zip_archive's alloc/realloc functions. */ +/* Returns NULL and sets the last error on failure. */ +void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags); +void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags); + +/* Extracts a archive file using a callback function to output the file's data. */ +mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags); + +/* Extract a file iteratively */ +mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags); +mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags); +size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size); +mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState); + +#ifndef MINIZ_NO_STDIO +/* Extracts a archive file to a disk file and sets its last accessed and modified times. */ +/* This function only extracts files, not archive directory records. */ +mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags); + +/* Extracts a archive file starting at the current position in the destination FILE stream. */ +mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *File, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags); +#endif + +#if 0 +/* TODO */ + typedef void *mz_zip_streaming_extract_state_ptr; + mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags); + uint64_t mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); + uint64_t mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); + mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, uint64_t new_ofs); + size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size); + mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState); +#endif + +/* This function compares the archive's local headers, the optional local zip64 extended information block, and the optional descriptor following the compressed data vs. the data in the central directory. */ +/* It also validates that each file can be successfully uncompressed unless the MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */ +mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags); + +/* Validates an entire archive by calling mz_zip_validate_file() on each file. */ +mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags); + +/* Misc utils/helpers, valid for ZIP reading or writing */ +mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr); +mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr); + +/* Universal end function - calls either mz_zip_reader_end() or mz_zip_writer_end(). */ +mz_bool mz_zip_end(mz_zip_archive *pZip); + +/* -------- ZIP writing */ + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +/* Inits a ZIP archive writer. */ +/*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init or mz_zip_writer_init_v2*/ +/*The output is streamable, i.e. file_ofs in mz_file_write_func always increases only by n*/ +mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size); +mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags); + +mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size); +mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags); + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning); +mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags); +mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags); +#endif + +/* Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive. */ +/* For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called. */ +/* For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it). */ +/* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL. */ +/* Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before */ +/* the archive is finalized the file's central directory will be hosed. */ +mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename); +mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags); + +/* Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive. */ +/* To add a directory entry, call this method with an archive name ending in a forwardslash with an empty buffer. */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */ +mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags); + +/* Like mz_zip_writer_add_mem(), except you can specify a file comment field, and optionally supply the function with already compressed data. */ +/* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA flag is specified. */ +mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + mz_uint64 uncomp_size, mz_uint32 uncomp_crc32); + +mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified, const char *user_extra_data_local, mz_uint user_extra_data_local_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len); + +/* Adds the contents of a file to an archive. This function also records the disk file's modified time into the archive. */ +/* File data is supplied via a read callback function. User mz_zip_writer_add_(c)file to add a file directly.*/ +mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 size_to_add, + const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len); + +#ifndef MINIZ_NO_STDIO +/* Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */ +mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); + +/* Like mz_zip_writer_add_file(), except the file data is read from the specified FILE stream. */ +mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 size_to_add, + const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len, + const char *user_extra_data_central, mz_uint user_extra_data_central_len); +#endif + +/* Adds a file to an archive by fully cloning the data from another archive. */ +/* This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data (it may add or modify the zip64 local header extra data field), and the optional descriptor following the compressed data. */ +mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index); + +/* Finalizes the archive by writing the central directory records followed by the end of central directory record. */ +/* After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end(). */ +/* An archive must be manually finalized by calling this function for it to be valid. */ +mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip); + +/* Finalizes a heap archive, returning a poiner to the heap block and its size. */ +/* The heap block will be allocated using the mz_zip_archive's alloc/realloc callbacks. */ +mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize); + +/* Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used. */ +/* Note for the archive to be valid, it *must* have been finalized before ending (this function will not do it for you). */ +mz_bool mz_zip_writer_end(mz_zip_archive *pZip); + +/* -------- Misc. high-level helper functions: */ + +/* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive. */ +/* Note this is NOT a fully safe operation. If it crashes or dies in some way your archive can be left in a screwed up state (without a central directory). */ +/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */ +/* TODO: Perhaps add an option to leave the existing central dir in place in case the add dies? We could then truncate the file (so the old central dir would be at the end) if something goes wrong. */ +mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); +mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr); + +/* Reads a single file from an archive into a heap block. */ +/* If pComment is not NULL, only the file with the specified comment will be extracted. */ +/* Returns NULL on failure. */ +void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags); +void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr); + +#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */ + +#ifdef __cplusplus +} +#endif + +#endif /* MINIZ_NO_ARCHIVE_APIS */ diff --git a/launchers/win32/res/Graphikbold.ttf b/launchers/win32/res/Graphikbold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1c0549830b68fdd1cffc1ea70084d0526ec4f147 GIT binary patch literal 147012 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 QyaqY=zQ0;$YUTg`0cb9NegFUf literal 0 HcmV?d00001 diff --git a/launchers/win32/res/HiFi_Logo_Large.png b/launchers/win32/res/HiFi_Logo_Large.png new file mode 100644 index 0000000000000000000000000000000000000000..d480da86ddc13c61dee02443563bfed4022ecdbc GIT binary patch literal 16487 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 literal 0 HcmV?d00001 diff --git a/launchers/win32/res/HiFi_Logo_Small.png b/launchers/win32/res/HiFi_Logo_Small.png new file mode 100644 index 0000000000000000000000000000000000000000..b8782dd226488ca46eda5755d54507177608592f GIT binary patch literal 4678 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 b7G-T4&!2i=qu;#rr^nXHp7Q6eBgg*-w6q($ literal 0 HcmV?d00001 diff --git a/launchers/win32/res/HiFi_Voxel.png b/launchers/win32/res/HiFi_Voxel.png new file mode 100644 index 0000000000000000000000000000000000000000..cd46b96c28c35dee45cf7b11d4d0a74352ab46f1 GIT binary patch literal 2988 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 literal 0 HcmV?d00001 diff --git a/launchers/win32/res/Launcher.rc2 b/launchers/win32/res/Launcher.rc2 new file mode 100644 index 0000000000..098b026372 --- /dev/null +++ b/launchers/win32/res/Launcher.rc2 @@ -0,0 +1,13 @@ +// +// Launcher.rc2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// diff --git a/launchers/win32/res/button.png b/launchers/win32/res/button.png new file mode 100644 index 0000000000000000000000000000000000000000..64d7cc8df97399f91ca53d6a175036bafa9f181c GIT binary patch literal 17324 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 gmvznqU}8cNn03iJXhF2un-^LKA^N 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 LtDnm{r-UW|V;oZm literal 0 HcmV?d00001 diff --git a/launchers/win32/resource.h b/launchers/win32/resource.h new file mode 100644 index 0000000000..51e6e7bd71 --- /dev/null +++ b/launchers/win32/resource.h @@ -0,0 +1,40 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Launcher.rc +// +#define IDD_LAUNCHER_DIALOG 102 +#define IDR_MAINFRAME 128 +#define IDB_PNG1 133 +#define IDB_PNG2 134 +#define IDB_PNG4 136 +#define IDR_FONT_REGULAR 140 +#define IDR_FONT_BOLD 141 +#define IDB_PNG5 144 +#define IDC_BACKGROUND 1009 +#define IDC_ORGNAME 1010 +#define IDC_USERNAME 1011 +#define IDC_PASSWORD 1012 +#define IDC_MESSAGE_LABEL 1013 +#define IDC_ACTION_LABEL 1014 +#define IDC_BUTTON_NEXT 1015 +#define IDC_MESSAGE2_LABEL 1016 +#define IDC_ACTION2_LABEL 1017 +#define IDC_ORGNAME_BANNER 1018 +#define IDC_USERNAME_BANNER 1019 +#define IDC_PASSWORD_BANNER 1020 +#define IDC_TERMS 1021 +#define IDC_TERMS2 1022 +#define IDC_TROUBLE 1023 +#define IDC_VOXEL 1024 +#define IDC_TROUBLE_LINK 1027 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 147 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1028 +#define _APS_NEXT_SYMED_VALUE 103 +#endif +#endif diff --git a/launchers/win32/stdafx.cpp b/launchers/win32/stdafx.cpp new file mode 100644 index 0000000000..d82fbd59e1 --- /dev/null +++ b/launchers/win32/stdafx.cpp @@ -0,0 +1,13 @@ +// +// stdafx.cpp +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "stdafx.h" + + diff --git a/launchers/win32/stdafx.h b/launchers/win32/stdafx.h new file mode 100644 index 0000000000..197fc4ef99 --- /dev/null +++ b/launchers/win32/stdafx.h @@ -0,0 +1,35 @@ +// +// stdafx.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +#ifndef VC_EXTRALEAN +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +#endif + +#include "targetver.h" + +#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit +#define _AFX_NO_MFC_CONTROLS_IN_DIALOGS // remove support for MFC controls in dialogs + +// turns off MFC's hiding of some common and often safely ignored warning messages +#define _AFX_ALL_WARNINGS + +#include // MFC core and standard components +#include // MFC extensions + +#ifndef _AFX_NO_OLE_SUPPORT +#include // MFC support for Internet Explorer 4 Common Controls +#endif +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + +#include // MFC support for ribbons and control bars diff --git a/launchers/win32/targetver.h b/launchers/win32/targetver.h new file mode 100644 index 0000000000..7c71a814f9 --- /dev/null +++ b/launchers/win32/targetver.h @@ -0,0 +1,18 @@ +// +// targetver.h +// +// Created by Luis Cuenca on 6/5/2019. +// Copyright 2019 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/tools/ci-scripts/postbuild.py b/tools/ci-scripts/postbuild.py index ab01e7c795..c78ae01e1b 100644 --- a/tools/ci-scripts/postbuild.py +++ b/tools/ci-scripts/postbuild.py @@ -29,10 +29,12 @@ elif sys.platform == "darwin": # Customize the output filename -def computeArchiveName(): +def computeArchiveName(prefix): RELEASE_TYPE = os.getenv("RELEASE_TYPE", "DEV") RELEASE_NUMBER = os.getenv("RELEASE_NUMBER", "") GIT_PR_COMMIT_SHORT = os.getenv("SHA7", "") + if GIT_PR_COMMIT_SHORT == '': + GIT_PR_COMMIT_SHORT = os.getenv("GIT_PR_COMMIT_SHORT", "") if RELEASE_TYPE == "PRODUCTION": BUILD_VERSION = "{}-{}".format(RELEASE_NUMBER, GIT_PR_COMMIT_SHORT) @@ -48,7 +50,7 @@ def computeArchiveName(): else: PLATFORM = "other" - ARCHIVE_NAME = "HighFidelity-Beta-Interface-{}-{}".format(BUILD_VERSION, PLATFORM) + ARCHIVE_NAME = "{}-{}-{}".format(prefix, BUILD_VERSION, PLATFORM) return ARCHIVE_NAME def wipeClientBuildPath(relativePath): @@ -109,12 +111,48 @@ def fixupWinZip(filename): print("Replacing {} with fixed {}".format(fullPath, outFullPath)) shutil.move(outFullPath, fullPath) +def buildLightLauncher(): + launcherSourcePath = os.path.join(SOURCE_PATH, 'launchers', sys.platform) + launcherBuildPath = os.path.join(BUILD_PATH, 'launcher') + if not os.path.exists(launcherBuildPath): + os.makedirs(launcherBuildPath) + # configure launcher build + cmakeArgs = [ 'cmake', '-S', launcherSourcePath ] + + if sys.platform == 'darwin': + cmakeArgs.append('-G') + cmakeArgs.append('Xcode') + elif sys.platform == 'win32': + cmakeArgs.append('-A') + cmakeArgs.append('x64') + + hifi_utils.executeSubprocess(cmakeArgs, folder=launcherBuildPath) + + buildTarget = 'package' + if sys.platform == 'win32': + buildTarget = 'ALL_BUILD' + hifi_utils.executeSubprocess([ + 'cmake', + '--build', launcherBuildPath, + '--config', 'Release', + '--target', buildTarget + ], folder=launcherBuildPath) + if sys.platform == 'darwin': + launcherDestFile = os.path.join(BUILD_PATH, "{}.dmg".format(computeArchiveName('Launcher'))) + launcherSourceFile = os.path.join(launcherBuildPath, "HQ Launcher.dmg") + elif sys.platform == 'win32': + # FIXME + launcherDestFile = os.path.join(BUILD_PATH, "{}.exe".format(computeArchiveName('Launcher'))) + launcherSourceFile = os.path.join(launcherBuildPath, "Launcher.exe") + print("Moving {} to {}".format(launcherSourceFile, launcherDestFile)) + shutil.move(launcherSourceFile, launcherDestFile) + for wipePath in WIPE_PATHS: wipeClientBuildPath(wipePath) # Need the archive name for ad-hoc zip file manipulation -archiveName = computeArchiveName() +archiveName = computeArchiveName('HighFidelity-Beta-Interface') cpackCommand = [ 'cpack', @@ -132,3 +170,5 @@ if sys.platform == "win32": elif sys.platform == "darwin": fixupMacZip(archiveName) +# FIXME enable when MFC is on the Windows build hosts +# buildLightLauncher() From 04f879be3e70ff2a911c6cdd895a3c56d5fe070a Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 5 Jun 2019 12:41:08 -0700 Subject: [PATCH 047/100] Add additional logging on socket send error --- libraries/networking/src/LimitedNodeList.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 13ebf7f9f6..48f08d6d2e 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -439,7 +439,14 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr packet, const HifiS } else { auto size = sendUnreliablePacket(*packet, sockAddr, hmacAuth); if (size < 0) { - + auto now = usecTimestampNow(); + eachNode([now](const SharedNodePointer & node) { + qCDebug(networking) << "Stats for " << node->getPublicSocket() << "\n" + << " Last Heard Microstamp: " << node->getLastHeardMicrostamp() << " (" << (now - node->getLastHeardMicrostamp()) << "usec ago)\n" + << " Outbound Kbps: " << node->getOutboundKbps() << "\n" + << " Inbound Kbps: " << node->getInboundKbps() << "\n" + << " Ping: " << node->getPingMs(); + }); } return size; } From eac7d298dc9e96b296024c888914429ae18933a2 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 6 Jun 2019 08:21:22 +1200 Subject: [PATCH 048/100] Change "privacy bubble" to "privacy shield" --- .../script-engine/src/UsersScriptingInterface.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/script-engine/src/UsersScriptingInterface.h b/libraries/script-engine/src/UsersScriptingInterface.h index b9857fbd86..3b0666481a 100644 --- a/libraries/script-engine/src/UsersScriptingInterface.h +++ b/libraries/script-engine/src/UsersScriptingInterface.h @@ -162,27 +162,27 @@ public slots: bool getCanKick(); /**jsdoc - * Toggles the state of the privacy bubble. + * Toggles the state of the privacy shield. * @function Users.toggleIgnoreRadius */ void toggleIgnoreRadius(); /**jsdoc - * Enables the privacy bubble. + * Enables the privacy shield. * @function Users.enableIgnoreRadius */ void enableIgnoreRadius(); /**jsdoc - * Disables the privacy bubble. + * Disables the privacy shield. * @function Users.disableIgnoreRadius */ void disableIgnoreRadius(); /**jsdoc - * Gets the status of the privacy bubble. + * Gets the status of the privacy shield. * @function Users.getIgnoreRadiusEnabled - * @returns {boolean} true if the privacy bubble is enabled, false if it is disabled. + * @returns {boolean} true if the privacy shield is enabled, false if it is disabled. */ bool getIgnoreRadiusEnabled(); @@ -197,15 +197,15 @@ signals: void canKickChanged(bool canKick); /**jsdoc - * Triggered when the privacy bubble status changes. + * Triggered when the privacy shield status changes. * @function Users.ignoreRadiusEnabledChanged - * @param {boolean} isEnabled - true if the privacy bubble is enabled, false if it isn't. + * @param {boolean} isEnabled - true if the privacy shield is enabled, false if it isn't. * @returns {Signal} */ void ignoreRadiusEnabledChanged(bool isEnabled); /**jsdoc - * Triggered when another user enters the privacy bubble. + * Triggered when another user enters the privacy shield. * @function Users.enteredIgnoreRadius * @returns {Signal} */ From 0ba849d65b9ae42936be996cbc3391a18bcd05b6 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 5 Jun 2019 13:25:28 -0700 Subject: [PATCH 049/100] BUGZ-530: Rename 'System Sounds' to 'UI FX' --- .../resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index 1f9aa5bcbc..7a19ab1a0f 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -126,7 +126,7 @@ Flickable { Layout.preferredWidth: parent.width Layout.preferredHeight: 30 Layout.topMargin: 2 - labelText: "System Sound Volume" + labelText: "UI FX Volume" from: simplifiedUI.numericConstants.mutedValue to: 20.0 defaultValue: 0.0 From 326d1615e08b286888d1fd56980ccc945973878e Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 5 Jun 2019 14:07:10 -0700 Subject: [PATCH 050/100] Change old UI too --- interface/resources/qml/hifi/audio/Audio.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index c603131b9c..af517be55d 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -664,7 +664,7 @@ Rectangle { } RalewayRegular { id: systemInjectorGainSliderText; - text: "System Sound volume"; + text: "UI FX volume"; size: 16; anchors.left: parent.left; color: hifi.colors.white; From 2f2e967a923cbacc25b8e484dbb02aa636fd3f9a Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 5 Jun 2019 14:08:26 -0700 Subject: [PATCH 051/100] log windows socket error code on socket error --- libraries/networking/src/udt/Socket.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index bec651a98b..2867e83a1c 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -227,6 +227,12 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc if (bytesWritten < 0) { qCDebug(networking) << "udt::writeDatagram (" << _udpSocket.state() << ") error - " << _udpSocket.error() << "(" << _udpSocket.errorString() << ")"; + +#ifdef WIN32 + int wsaError = WSAGetLastError(); + qCDebug(networking) << "windows socket error " << wsaError; +#endif + #ifdef DEBUG_EVENT_QUEUE int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); qCDebug(networking) << "Networking queue size - " << nodeListQueueSize; From 581c5fe554c0b0703f13a3a935acdb00b3a3c6fd Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Wed, 5 Jun 2019 14:23:47 -0700 Subject: [PATCH 052/100] removing warnings --- launchers/darwin/src/DownloadDomainContent.h | 2 +- launchers/darwin/src/DownloadDomainContent.m | 98 ++++++++------------ launchers/darwin/src/DownloadInterface.h | 2 +- launchers/darwin/src/DownloadInterface.m | 94 ++++++------------- launchers/darwin/src/ProcessScreen.m | 2 +- 5 files changed, 68 insertions(+), 130 deletions(-) diff --git a/launchers/darwin/src/DownloadDomainContent.h b/launchers/darwin/src/DownloadDomainContent.h index a714b201de..c35c8b8f09 100644 --- a/launchers/darwin/src/DownloadDomainContent.h +++ b/launchers/darwin/src/DownloadDomainContent.h @@ -1,6 +1,6 @@ #import -@interface DownloadDomainContent : NSObject { +@interface DownloadDomainContent : NSObject { } - (void) downloadDomainContent:(NSString*) domainContentUrl; diff --git a/launchers/darwin/src/DownloadDomainContent.m b/launchers/darwin/src/DownloadDomainContent.m index 8d1ad715f4..7b0247a6f4 100644 --- a/launchers/darwin/src/DownloadDomainContent.m +++ b/launchers/darwin/src/DownloadDomainContent.m @@ -6,79 +6,55 @@ - (void) downloadDomainContent:(NSString *)domainContentUrl { NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:domainContentUrl] - cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:60.0]; - NSURLDownload* theDownload = [[NSURLDownload alloc] initWithRequest:request delegate:self]; + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:60.0]; - /*NSURLSession *session = [NSURLSession sharedSession]; - NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithRequest:request - completionHandler: - ^(NSURL *location, NSURLResponse *response,NSError *error) { - NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:[response suggestedFilename]]; - [[NSFileManager defaultManager] moveItemAtURL:location - toURL:[NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]] - error:nil]; - Launcher* sharedLauncher = [Launcher sharedLauncher]; - [sharedLauncher setDownloadContextFilename:[response suggestedFilename]]; - NSLog(@"extracting domain content file"); - [sharedLauncher extractZipFileAtDestination:[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:@"content"] :[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:[sharedLauncher getDownloadContentFilename]]]; - - NSLog(@"finished extracting content file"); - dispatch_async(dispatch_get_main_queue(), ^{ - [sharedLauncher domainContentDownloadFinished]; - }); + NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration]; + NSURLSession *defaultSession = [NSURLSession sessionWithConfiguration: defaultConfigObject delegate: self delegateQueue: [NSOperationQueue mainQueue]]; + NSURLSessionDownloadTask *downloadTask = [defaultSession downloadTaskWithRequest:request]; + [downloadTask resume]; +} + +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite { + CGFloat prog = (float)totalBytesWritten/totalBytesExpectedToWrite; + NSLog(@"domain content downloaded %d%%", (int)(100.0*prog)); - }];*/ - - //[downloadTask resume]; - - if (!theDownload) { - NSLog(@"Download Failed"); - [[Launcher sharedLauncher] displayErrorPage]; +} + +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes { + // unused in this example +} + +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location { + NSLog(@"Did finish downloading to url"); + NSError *error; + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSString *destinationFileName = downloadTask.originalRequest.URL.lastPathComponent; + NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:destinationFileName]; + NSURL *destinationURL = [NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]] relativeToURL: [NSURL URLWithString:@"file://"]]; + if([fileManager fileExistsAtPath:[destinationURL path]]) + { + [fileManager removeItemAtURL:destinationURL error:nil]; } -} - -- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { - NSLog(@"download domain content: data received"); -} - -- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { - NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; - if([ne statusCode] == 200) { - NSLog(@"connection state is 200 - all okay"); - } else { - NSLog(@"connection state is NOT 200"); - [[Launcher sharedLauncher] displayErrorPage]; - } -} - --(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - NSLog(@"download domain content - Conn Err: %@", [error localizedDescription]); - [[Launcher sharedLauncher] displayErrorPage]; -} - -- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename -{ - NSString* finalFilePath = [[[Launcher sharedLauncher] getDownloadPathForContentAndScripts] stringByAppendingPathComponent:filename]; - [download setDestination:finalFilePath allowOverwrite:YES]; - [[Launcher sharedLauncher] setDownloadContextFilename:filename]; -} - -- (void)downloadDidFinish:(NSURLDownload*)download -{ + NSLog(@"%@", location.path); + NSLog(@"%@", destinationURL); + BOOL success = [fileManager moveItemAtURL:location toURL:destinationURL error:&error]; + + + NSLog(success ? @"TRUE" : @"FALSE"); Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher setDownloadContextFilename:destinationFileName]; NSLog(@"extracting domain content file"); [sharedLauncher extractZipFileAtDestination:[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:@"content"] :[[sharedLauncher getDownloadPathForContentAndScripts] stringByAppendingString:[sharedLauncher getDownloadContentFilename]]]; NSLog(@"finished extracting content file"); - [sharedLauncher domainContentDownloadFinished]; } -- (void)download:(NSURLDownload*)download didReceiveResponse:(NSURLResponse*)response -{ - NSLog(@"Download content set response"); +-(void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error { + NSLog(@"completed; error: %@", error); } + @end diff --git a/launchers/darwin/src/DownloadInterface.h b/launchers/darwin/src/DownloadInterface.h index 8edb75e8ad..08968f19f0 100644 --- a/launchers/darwin/src/DownloadInterface.h +++ b/launchers/darwin/src/DownloadInterface.h @@ -1,6 +1,6 @@ #import -@interface DownloadInterface : NSObject { +@interface DownloadInterface : NSObject { } @property (nonatomic, assign) NSString* finalFilePath; diff --git a/launchers/darwin/src/DownloadInterface.m b/launchers/darwin/src/DownloadInterface.m index 73d8663e48..00e132a91d 100644 --- a/launchers/darwin/src/DownloadInterface.m +++ b/launchers/darwin/src/DownloadInterface.m @@ -7,78 +7,39 @@ - (void) downloadInterface:(NSString*) downloadUrl { NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:downloadUrl] - cachePolicy:NSURLRequestUseProtocolCachePolicy - timeoutInterval:60.0]; + cachePolicy:NSURLRequestUseProtocolCachePolicy + timeoutInterval:60.0]; - NSURLDownload* theDownload = [[NSURLDownload alloc] initWithRequest:request delegate:self]; + NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration]; + NSURLSession *defaultSession = [NSURLSession sessionWithConfiguration: defaultConfigObject delegate: self delegateQueue: [NSOperationQueue mainQueue]]; + NSURLSessionDownloadTask *downloadTask = [defaultSession downloadTaskWithRequest:request]; - /*NSURLSession *session = [NSURLSession sharedSession]; - NSURLSessionDownloadTask *downloadTask = [session downloadTaskWithRequest:request - completionHandler: - ^(NSURL *location, NSURLResponse *response,NSError *error) { - Launcher* sharedLauncher = [Launcher sharedLauncher]; - NSString* finalFilePath = [[sharedLauncher getAppPath] stringByAppendingPathComponent:[response suggestedFilename]]; - [[Launcher sharedLauncher] setDownloadFilename:[response suggestedFilename]]; - - NSLog(@"----------->%@", location); - [[NSFileManager defaultManager] moveItemAtURL:location - toURL:[NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]] - error:nil]; - dispatch_async(dispatch_get_main_queue(), ^{ - - NSString* appPath = [sharedLauncher getAppPath]; - NSString* downloadFileName = [sharedLauncher getDownloadFilename]; - NSLog(@"!!!!!!%@", downloadFileName); - NSLog(@"extract interface zip"); - [sharedLauncher extractZipFileAtDestination:appPath :[appPath stringByAppendingString:downloadFileName]]; - NSLog(@"finished extracting interface zip"); - - NSLog(@"starting xattr"); - NSTask* quaratineTask = [[NSTask alloc] init]; - quaratineTask.launchPath = @"/usr/bin/xattr"; - quaratineTask.arguments = @[@"-d", @"com.apple.quarantine", [appPath stringByAppendingString:@"interface.app"]]; - - [quaratineTask launch]; - [quaratineTask waitUntilExit]; - NSLog(@"finished xattr"); - - NSString* launcherPath = [appPath stringByAppendingString:@"Launcher"]; - - [[Settings sharedSettings] setLauncherPath:launcherPath]; - [sharedLauncher interfaceFinishedDownloading]; - - }); - }]; - - [downloadTask resume];*/ + [downloadTask resume]; } -- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename -{ - self.finalFilePath = [[[Launcher sharedLauncher] getAppPath] stringByAppendingPathComponent:filename]; - [download setDestination:self.finalFilePath allowOverwrite:YES]; +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite { + CGFloat prog = (float)totalBytesWritten/totalBytesExpectedToWrite; + NSLog(@"interface downloaded %d%%", (int)(100.0*prog)); - [[Launcher sharedLauncher] setDownloadFilename:filename]; } +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes { + // unused in this example +} -- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { - NSHTTPURLResponse *ne = (NSHTTPURLResponse *)response; - if([ne statusCode] == 200) { - NSLog(@"download interface connection state is 200 - all okay"); - } else { - NSLog(@"download interface connection state is NOT 200"); - [[Launcher sharedLauncher] displayErrorPage]; +-(void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location { + NSLog(@"Did finish downloading to url"); + NSError *error; + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSString *destinationFileName = downloadTask.originalRequest.URL.lastPathComponent; + NSString* finalFilePath = [[[Launcher sharedLauncher] getAppPath] stringByAppendingPathComponent:destinationFileName]; + NSURL *destinationURL = [NSURL URLWithString: [finalFilePath stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]] relativeToURL: [NSURL URLWithString:@"file://"]]; + if([fileManager fileExistsAtPath:[destinationURL path]]) + { + [fileManager removeItemAtURL:destinationURL error:nil]; } -} - --(void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - NSLog(@"download interface content - Conn Err: %@", [error localizedDescription]); - [[Launcher sharedLauncher] displayErrorPage]; -} - -- (void)downloadDidFinish:(NSURLDownload*)download -{ + [fileManager moveItemAtURL:location toURL:destinationURL error:&error]; + Launcher* sharedLauncher = [Launcher sharedLauncher]; NSString* appPath = [sharedLauncher getAppPath]; NSString* downloadFileName = [sharedLauncher getDownloadFilename]; @@ -102,8 +63,9 @@ [sharedLauncher interfaceFinishedDownloading]; } -- (void)download:(NSURLDownload*)download didReceiveResponse:(NSURLResponse*)response -{ - NSLog(@"Download interface response"); +-(void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error { + NSLog(@"completed; error: %@", error); } + + @end diff --git a/launchers/darwin/src/ProcessScreen.m b/launchers/darwin/src/ProcessScreen.m index 0a9d6017d1..fb1de799da 100644 --- a/launchers/darwin/src/ProcessScreen.m +++ b/launchers/darwin/src/ProcessScreen.m @@ -49,7 +49,7 @@ } - (void) rotateView:(NSTimer *)timer{ - self.imageRotation += 1; + self.imageRotation -= 1; [self.voxelImage setFrameCenterRotation:self.imageRotation]; } @end From f852364b3dd6faf56429a48b8e4f11577c4eb866 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Wed, 5 Jun 2019 14:26:35 -0700 Subject: [PATCH 053/100] enable logs --- launchers/darwin/src/main.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/darwin/src/main.mm b/launchers/darwin/src/main.mm index 41e2986af7..cdcd66f963 100644 --- a/launchers/darwin/src/main.mm +++ b/launchers/darwin/src/main.mm @@ -17,7 +17,7 @@ void redirectLogToDocuments() int main(int argc, const char* argv[]) { //NSApp.appearance = [NSAppearance appearanceNamed: NSAppearanceNameAqua]; - //redirectLogToDocuments(); + redirectLogToDocuments(); NSArray* apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.highfidelity.launcher"]; if ([apps count] > 1) { NSLog(@"launcher is already running"); From 0bc0c73ef2e1ad8bbdd78bab4f7843050733ce57 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 5 Jun 2019 12:51:19 -0700 Subject: [PATCH 054/100] Enable mac launcher builds --- tools/ci-scripts/postbuild.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci-scripts/postbuild.py b/tools/ci-scripts/postbuild.py index c78ae01e1b..b6593b1cf3 100644 --- a/tools/ci-scripts/postbuild.py +++ b/tools/ci-scripts/postbuild.py @@ -112,6 +112,9 @@ def fixupWinZip(filename): shutil.move(outFullPath, fullPath) def buildLightLauncher(): + # FIXME remove once MFC is enabled on the windows build hosts + if sys.platform == 'win32': + return launcherSourcePath = os.path.join(SOURCE_PATH, 'launchers', sys.platform) launcherBuildPath = os.path.join(BUILD_PATH, 'launcher') if not os.path.exists(launcherBuildPath): @@ -170,5 +173,4 @@ if sys.platform == "win32": elif sys.platform == "darwin": fixupMacZip(archiveName) -# FIXME enable when MFC is on the Windows build hosts -# buildLightLauncher() +buildLightLauncher() From 0876a781f063a2c5e0e195652e64972b1d390bda Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 5 Jun 2019 14:13:24 -0700 Subject: [PATCH 055/100] Fix secret defines --- launchers/darwin/CMakeLists.txt | 13 ++++++++++++- launchers/darwin/src/OrganizationRequest.m | 5 +---- launchers/win32/CMakeLists.txt | 14 +++++++++++++- launchers/win32/LauncherDlg.cpp | 5 +---- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index 499fc0440e..745ceec8fc 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -53,9 +53,20 @@ set_target_properties(${this_target} PROPERTIES set(MACOSX_BUNDLE_ICON_FILE "interface.icns") +function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE) + if (NOT DEFINED ${_RESULT_NAME}) + if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "") + set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE) + else() + set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE) + endif() + endif() +endfunction() + add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}) - +set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "") +target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}") file(GLOB NIB_FILES "nib/*.xib") diff --git a/launchers/darwin/src/OrganizationRequest.m b/launchers/darwin/src/OrganizationRequest.m index b51de8a19e..23d3c2e1cf 100644 --- a/launchers/darwin/src/OrganizationRequest.m +++ b/launchers/darwin/src/OrganizationRequest.m @@ -6,15 +6,12 @@ static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/huffman/organizations/"; -#define str(s) #s -#define LAUNCHER_HMAC_SECRET_STRING str(LAUNCHER_HMAC_SECRET) - @implementation OrganizationRequest - (void) confirmOrganization:(NSString*)aOrganization :(NSString*)aUsername { self.username = aUsername; - const char *cKey = LAUNCHER_HMAC_SECRET_STRING; + const char *cKey = LAUNCHER_HMAC_SECRET; const char *cData = [aOrganization cStringUsingEncoding:NSASCIIStringEncoding]; unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH]; CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC); diff --git a/launchers/win32/CMakeLists.txt b/launchers/win32/CMakeLists.txt index 4d2618c9bf..8417831312 100644 --- a/launchers/win32/CMakeLists.txt +++ b/launchers/win32/CMakeLists.txt @@ -39,7 +39,19 @@ add_executable(HQLauncher targetver.h ) -target_compile_definitions(HQLauncher PRIVATE LAUNCHER_HMAC_SECRET=$ENV{LAUNCHER_HMAC_SECRET}) +function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE) + if (NOT DEFINED ${_RESULT_NAME}) + if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "") + set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE) + else() + set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE) + endif() + endif() +endfunction() + +set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "") +target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}") + # Preprocessor definitions target_compile_definitions(HQLauncher PRIVATE diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp index f6acbce014..07fb57ddcd 100644 --- a/launchers/win32/LauncherDlg.cpp +++ b/launchers/win32/LauncherDlg.cpp @@ -170,12 +170,9 @@ void CLauncherDlg::startProcess() { } } -#define str(s) #s -#define LAUNCHER_HMAC_SECRET_STRING str(LAUNCHER_HMAC_SECRET) - BOOL CLauncherDlg::getHQInfo(const CString& orgname) { CString hash; - LauncherUtils::hMac256(orgname, LAUNCHER_HMAC_SECRET_STRING, hash); + LauncherUtils::hMac256(orgname, LAUNCHER_HMAC_SECRET, hash); return theApp._manager.readOrganizationJSON(hash) == LauncherUtils::ResponseError::NoError; } From 42cb3d9828623f8ced407b3f34b52b589930f455 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 6 Jun 2019 10:26:43 +1200 Subject: [PATCH 056/100] Polish Vec3 API JSDoc --- libraries/script-engine/src/Vec3.h | 71 +++++++++++----------- libraries/shared/src/RegisteredMetaTypes.h | 3 +- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h index 7887938004..86df912d0e 100644 --- a/libraries/script-engine/src/Vec3.h +++ b/libraries/script-engine/src/Vec3.h @@ -22,8 +22,8 @@ #include "GLMHelpers.h" /**jsdoc - * The Vec3 API facilities for generating and manipulating 3-dimensional vectors. High Fidelity uses a right-handed - * Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction. + * The Vec3 API provides facilities for generating and manipulating 3-dimensional vectors. High Fidelity uses a + * right-handed Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction. * High Fidelity coordinate system * * @namespace Vec3 @@ -98,7 +98,7 @@ class Vec3 : public QObject, protected QScriptable { public slots: /**jsdoc - * Calculate the reflection of a vector in a plane. + * Calculates the reflection of a vector in a plane. * @function Vec3(0).reflect * @param {Vec3} v - The vector to reflect. * @param {Vec3} normal - The normal of the plane. @@ -112,7 +112,7 @@ public slots: glm::vec3 reflect(const glm::vec3& v1, const glm::vec3& v2) { return glm::reflect(v1, v2); } /**jsdoc - * Calculate the cross product of two vectors. + * Calculates the cross product of two vectors. * @function Vec3(0).cross * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -126,7 +126,7 @@ public slots: glm::vec3 cross(const glm::vec3& v1, const glm::vec3& v2) { return glm::cross(v1, v2); } /**jsdoc - * Calculate the dot product of two vectors. + * Calculates the dot product of two vectors. * @function Vec3(0).dot * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -140,7 +140,7 @@ public slots: float dot(const glm::vec3& v1, const glm::vec3& v2) { return glm::dot(v1, v2); } /**jsdoc - * Multiply a vector by a scale factor. + * Multiplies a vector by a scale factor. * @function Vec3(0).multiply * @param {Vec3} v - The vector. * @param {number} scale - The scale factor. @@ -149,7 +149,7 @@ public slots: glm::vec3 multiply(const glm::vec3& v1, float f) { return v1 * f; } /**jsdoc - * Multiply a vector by a scale factor. + * Multiplies a vector by a scale factor. * @function Vec3(0).multiply * @param {number} scale - The scale factor. * @param {Vec3} v - The vector. @@ -158,7 +158,7 @@ public slots: glm::vec3 multiply(float f, const glm::vec3& v1) { return v1 * f; } /**jsdoc - * Multiply two vectors. + * Multiplies two vectors. * @function Vec3(0).multiplyVbyV * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -173,7 +173,7 @@ public slots: glm::vec3 multiplyVbyV(const glm::vec3& v1, const glm::vec3& v2) { return v1 * v2; } /**jsdoc - * Rotate a vector. + * Rotates a vector. * @function Vec3(0).multiplyQbyV * @param {Quat} q - The rotation to apply. * @param {Vec3} v - The vector to rotate. @@ -187,7 +187,7 @@ public slots: glm::vec3 multiplyQbyV(const glm::quat& q, const glm::vec3& v) { return q * v; } /**jsdoc - * Calculate the sum of two vectors. + * Calculates the sum of two vectors. * @function Vec3(0).sum * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -196,7 +196,7 @@ public slots: glm::vec3 sum(const glm::vec3& v1, const glm::vec3& v2) { return v1 + v2; } /**jsdoc - * Calculate one vector subtracted from another. + * Calculates one vector subtracted from another. * @function Vec3(0).subtract * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -205,7 +205,7 @@ public slots: glm::vec3 subtract(const glm::vec3& v1, const glm::vec3& v2) { return v1 - v2; } /**jsdoc - * Calculate the length of a vector + * Calculates the length of a vector * @function Vec3(0).length * @param {Vec3} v - The vector. * @returns {number} The length of the vector. @@ -213,7 +213,7 @@ public slots: float length(const glm::vec3& v) { return glm::length(v); } /**jsdoc - * Calculate the distance between two points. + * Calculates the distance between two points. * @function Vec3(0).distance * @param {Vec3} p1 - The first point. * @param {Vec3} p2 - The second point. @@ -231,16 +231,17 @@ public slots: float distance(const glm::vec3& v1, const glm::vec3& v2) { return glm::distance(v1, v2); } /**jsdoc - * Calculate the angle of rotation from one vector onto another, with the sign depending on a reference vector. + * Calculates the angle of rotation from one vector onto another, with the sign depending on a reference vector. * @function Vec3(0).orientedAngle * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. * @param {Vec3} ref - Reference vector. - * @returns {number} The angle of rotation from the first vector to the second, in degrees, with a positive sign if the - * rotation axis aligns with the reference vector (has a positive dot product) otherwise a negative sign. - * @example Compare Vec3.angle() and Vec3.orientedAngle(). + * @returns {number} The angle of rotation from the first vector to the second, in degrees. The value is positive if the + * rotation axis aligns with the reference vector (has a positive dot product), otherwise the value is negative. + * @example Compare Vec3.getAngle() and Vec3.orientedAngle(). * var v1 = { x: 5, y: 0, z: 0 }; * var v2 = { x: 5, y: 0, z: 5 }; + * * var angle = Vec3.getAngle(v1, v2); * print(angle * 180 / Math.PI); // 45 * @@ -252,7 +253,7 @@ public slots: float orientedAngle(const glm::vec3& v1, const glm::vec3& v2, const glm::vec3& v3); /**jsdoc - * Normalize a vector so that its length is 1. + * Normalizes a vector so that its length is 1. * @function Vec3(0).normalize * @param {Vec3} v - The vector to normalize. * @returns {Vec3} The vector normalized to have a length of 1. @@ -265,11 +266,11 @@ public slots: glm::vec3 normalize(const glm::vec3& v) { return glm::normalize(v); }; /**jsdoc - * Calculate a linear interpolation between two vectors. + * Calculates a linear interpolation between two vectors. * @function Vec3(0).mix * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. - * @param {number} factor - The interpolation factor in the range 0.0 to 1.0. + * @param {number} factor - The interpolation factor, range 0.0 – 1.0. * @returns {Vec3} The linear interpolation between the two vectors: (1 - factor) * v1 + factor * v2. * @example Linear interpolation between two vectors. * var v1 = { x: 10, y: 0, z: 0 }; @@ -280,7 +281,7 @@ public slots: glm::vec3 mix(const glm::vec3& v1, const glm::vec3& v2, float m) { return glm::mix(v1, v2, m); } /**jsdoc - * Print to the program log a text label followed by a vector value. + * Prints the vector to the program log, as a text label followed by the vector value. * @function Vec3(0).print * @param {string} label - The label to print. * @param {Vec3} v - The vector value to print. @@ -292,8 +293,9 @@ public slots: void print(const QString& label, const glm::vec3& v); /**jsdoc - * Test whether two vectors are equal. Note: The vectors must be exactly equal in order for - * true to be returned; it is often better to use {@link Vec3(0).withinEpsilon|withinEpsilon}. + * Tests whether two vectors are equal. + *

Note: The vectors must be exactly equal in order for true to be returned; it is often + * better to use {@link Vec3(0).withinEpsilon|withinEpsilon}.

* @function Vec3(0).equal * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. @@ -301,6 +303,7 @@ public slots: * @example Vectors are only equal if exactly the same. * var v1 = { x: 10, y: 10, z: 10 }; * var v2 = { x: 10, y: 10, z: 10 }; + * * var equal = Vec3.equal(v1, v2); * print(equal); // true * @@ -311,17 +314,18 @@ public slots: bool equal(const glm::vec3& v1, const glm::vec3& v2) { return v1 == v2; } /**jsdoc - * Test whether two vectors are equal within a tolerance. Note: It is often better to use this function - * than {@link Vec3(0).equal|equal}. + * Tests whether two vectors are equal within a tolerance. + *

Note: It is often better to use this function than {@link Vec3(0).equal|equal}.

* @function Vec3(0).withinEpsilon * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. * @param {number} epsilon - The maximum distance between the two vectors. * @returns {boolean} true if the distance between the points represented by the vectors is less than or equal - * to the epsilon, otherwise false. + * to epsilon, otherwise false. * @example Testing vectors for near equality. * var v1 = { x: 10, y: 10, z: 10 }; * var v2 = { x: 10, y: 10, z: 10.0005 }; + * * var equal = Vec3.equal(v1, v2); * print(equal); // false * @@ -331,11 +335,11 @@ public slots: bool withinEpsilon(const glm::vec3& v1, const glm::vec3& v2, float epsilon); /**jsdoc - * Calculate polar coordinates (elevation, azimuth, radius) that transform the unit z-axis vector onto a point. + * Calculates polar coordinates (elevation, azimuth, radius) that transform the unit z-axis vector onto a point. * @function Vec3(0).toPolar * @param {Vec3} p - The point to calculate the polar coordinates for. * @returns {Vec3} Vector of polar coordinates for the point: x elevation rotation about the x-axis in - * radians, y azimuth rotation about the y-axis in radians, and z scale. + * radians, y azimuth rotation about the y-axis in radians, and z radius. * @example Polar coordinates for a point. * var v = { x: 5, y: 2.5, z: 5 }; * var polar = Vec3.toPolar(v); @@ -347,10 +351,10 @@ public slots: glm::vec3 toPolar(const glm::vec3& v); /**jsdoc - * Calculate the coordinates of a point from polar coordinate transformation of the unit z-axis vector. + * Calculates the coordinates of a point from polar coordinate transformation of the unit z-axis vector. * @function Vec3(0).fromPolar * @param {Vec3} polar - The polar coordinates of a point: x elevation rotation about the x-axis in radians, - * y azimuth rotation about the y-axis in radians, and z scale. + * y azimuth rotation about the y-axis in radians, and z radius. * @returns {Vec3} The coordinates of the point. * @example Polar coordinates to Cartesian. * var polar = { x: -19.471 * Math.PI / 180, y: 45 * Math.PI / 180, z: 7.5 }; @@ -361,18 +365,17 @@ public slots: glm::vec3 fromPolar(const glm::vec3& polar); /**jsdoc - * Calculate the unit vector corresponding to polar coordinates elevation and azimuth transformation of the unit z-axis + * Calculates the unit vector corresponding to polar coordinates elevation and azimuth transformation of the unit z-axis * vector. * @function Vec3(0).fromPolar * @param {number} elevation - Rotation about the x-axis, in radians. * @param {number} azimuth - Rotation about the y-axis, in radians. * @returns {Vec3} Unit vector for the direction specified by elevation and azimuth. - * @example Polar coordinates to Cartesian. + * @example Polar coordinates to Cartesian coordinates. * var elevation = -19.471 * Math.PI / 180; * var rotation = 45 * Math.PI / 180; * var p = Vec3.fromPolar(elevation, rotation); * print(JSON.stringify(p)); // {"x":0.667,"y":0.333,"z":0.667} - * * p = Vec3.multiply(7.5, p); * print(JSON.stringify(p)); // {"x":5,"y":2.5,"z":5} */ @@ -380,7 +383,7 @@ public slots: glm::vec3 fromPolar(float elevation, float azimuth); /**jsdoc - * Calculate the angle between two vectors. + * Calculates the angle between two vectors. * @function Vec3(0).getAngle * @param {Vec3} v1 - The first vector. * @param {Vec3} v2 - The second vector. diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index 3e73ab6177..2ca7863ec6 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -100,7 +100,8 @@ glm::vec2 vec2FromVariant(const QVariant& object); * @property {number} x - X-coordinate of the vector. Synonyms: r, red. * @property {number} y - Y-coordinate of the vector. Synonyms: g, green. * @property {number} z - Z-coordinate of the vector. Synonyms: b, blue. -* @example Vec3s can be set in multiple ways and modified with their aliases, but still stringify in the same way +* @example Vec3 values can be set in multiple ways and modified with their aliases, but still stringify in the same +* way. * Entities.editEntity(, { position: { x: 1, y: 2, z: 3 }}); // { x: 1, y: 2, z: 3 } * Entities.editEntity(, { position: { r: 4, g: 5, b: 6 }}); // { x: 4, y: 5, z: 6 } * Entities.editEntity(, { position: { red: 7, green: 8, blue: 9 }}); // { x: 7, y: 8, z: 9 } From 8e1f4b522705bff02ad3a86d99bdd19a84fa260d Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Wed, 5 Jun 2019 16:17:19 -0700 Subject: [PATCH 057/100] Testing build --- launchers/darwin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index 745ceec8fc..b94caeda47 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -67,7 +67,7 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}) set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "") target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}") - +message("HMAC secret ${LAUNCHER_HMAC_SECRET}") file(GLOB NIB_FILES "nib/*.xib") From 9bc6c3bfcd1865f3d78e7819ab13ccdf6d9658e4 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 5 Jun 2019 17:56:14 -0700 Subject: [PATCH 058/100] INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings --- interface/src/PerformanceManager.cpp | 2 +- interface/src/PerformanceManager.h | 1 + interface/src/RefreshRateManager.cpp | 6 +++--- interface/src/RefreshRateManager.h | 3 +++ interface/src/scripting/RenderScriptingInterface.cpp | 2 +- interface/src/scripting/RenderScriptingInterface.h | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/interface/src/PerformanceManager.cpp b/interface/src/PerformanceManager.cpp index e7591e8b57..874d92521b 100644 --- a/interface/src/PerformanceManager.cpp +++ b/interface/src/PerformanceManager.cpp @@ -41,7 +41,7 @@ void PerformanceManager::setupPerformancePresetSettings(bool evaluatePlatformTie } void PerformanceManager::setPerformancePreset(PerformanceManager::PerformancePreset preset) { - if (getPerformancePreset() != preset) { + if (isValidPerformancePreset(preset) && (getPerformancePreset() != preset)) { _performancePresetSettingLock.withWriteLock([&] { _performancePresetSetting.set((int)preset); }); diff --git a/interface/src/PerformanceManager.h b/interface/src/PerformanceManager.h index 2931d1f17b..f28d56d6ff 100644 --- a/interface/src/PerformanceManager.h +++ b/interface/src/PerformanceManager.h @@ -26,6 +26,7 @@ public: HIGH, PROFILE_COUNT }; + static bool isValidPerformancePreset(int value) { return (value >= PerformancePreset::UNKNOWN && value <= PerformancePreset::HIGH); } PerformanceManager(); ~PerformanceManager() = default; diff --git a/interface/src/RefreshRateManager.cpp b/interface/src/RefreshRateManager.cpp index f2033b9491..4963eee8cf 100644 --- a/interface/src/RefreshRateManager.cpp +++ b/interface/src/RefreshRateManager.cpp @@ -94,7 +94,7 @@ void RefreshRateManager::toggleInactive() { } void RefreshRateManager::setRefreshRateProfile(RefreshRateManager::RefreshRateProfile refreshRateProfile) { - if (_refreshRateProfile != refreshRateProfile) { + if (isValidRefreshRateProfile(refreshRateProfile) && (_refreshRateProfile != refreshRateProfile)) { _refreshRateProfileSettingLock.withWriteLock([&] { _refreshRateProfile = refreshRateProfile; _refreshRateProfileSetting.set((int) refreshRateProfile); @@ -124,7 +124,7 @@ RefreshRateManager::RefreshRateRegime RefreshRateManager::getRefreshRateRegime() } void RefreshRateManager::setRefreshRateRegime(RefreshRateManager::RefreshRateRegime refreshRateRegime) { - if (_refreshRateRegime != refreshRateRegime) { + if (isValidRefreshRateRegime(refreshRateRegime) && (_refreshRateRegime != refreshRateRegime)) { _refreshRateRegime = refreshRateRegime; updateRefreshRateController(); } @@ -132,7 +132,7 @@ void RefreshRateManager::setRefreshRateRegime(RefreshRateManager::RefreshRateReg } void RefreshRateManager::setUXMode(RefreshRateManager::UXMode uxMode) { - if (_uxMode != uxMode) { + if (isValidUXMode(uxMode) && (_uxMode != uxMode)) { _uxMode = uxMode; updateRefreshRateController(); } diff --git a/interface/src/RefreshRateManager.h b/interface/src/RefreshRateManager.h index 6316de3bfb..74dd8156e1 100644 --- a/interface/src/RefreshRateManager.h +++ b/interface/src/RefreshRateManager.h @@ -29,6 +29,7 @@ public: REALTIME, PROFILE_NUM }; + static bool isValidRefreshRateProfile(RefreshRateProfile value) { return (value >= RefreshRateProfile::ECO && value <= RefreshRateProfile::REALTIME); } enum RefreshRateRegime { FOCUS_ACTIVE = 0, @@ -39,12 +40,14 @@ public: SHUTDOWN, REGIME_NUM }; + static bool isValidRefreshRateRegime(RefreshRateRegime value) { return (value >= RefreshRateRegime::FOCUS_ACTIVE && value <= RefreshRateRegime::SHUTDOWN); } enum UXMode { DESKTOP = 0, VR, UX_NUM }; + static bool isValidUXMode(UXMode value) { return (value >= UXMode::DESKTOP && value <= UXMode::VR); } RefreshRateManager(); ~RefreshRateManager() = default; diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 730fef3966..608f1d30e9 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -42,7 +42,7 @@ RenderScriptingInterface::RenderMethod RenderScriptingInterface::getRenderMethod } void RenderScriptingInterface::setRenderMethod(RenderMethod renderMethod) { - if (_renderMethod != (int) renderMethod) { + if (isValidRenderMethod(renderMethod) && (_renderMethod != (int) renderMethod)) { forceRenderMethod(renderMethod); emit settingsChanged(); } diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index df2e138b08..39a88d4aad 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -41,6 +41,7 @@ public: FORWARD = render::Args::RenderMethod::FORWARD, }; Q_ENUM(RenderMethod) + static bool isValidRenderMethod(RenderMethod value) { return (value >= RenderMethod::DEFERRED && value <= RenderMethod::FORWARD); } // Load Settings From ecbce8201b1f11ddcb914205dd7e78b7a0a22c0e Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Wed, 5 Jun 2019 18:17:24 -0700 Subject: [PATCH 059/100] Dissectors: Limit message number & position values --- tools/dissectors/1-hfudt.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua index 70831416b9..484ae6f897 100644 --- a/tools/dissectors/1-hfudt.lua +++ b/tools/dissectors/1-hfudt.lua @@ -307,7 +307,7 @@ function p_hfudt.dissector(buf, pinfo, tree) -- check if we have part of a message that we need to re-assemble -- before it can be dissected - if message_bit == 1 and message_position ~= 0 then + if message_bit == 1 and message_position ~= 0 and message_number < 50 and message_part_number < 10 then if fragments[message_number] == nil then fragments[message_number] = {} end From 2592784814bf4dcbaeb942e24d9ad8d1f2847072 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Thu, 6 Jun 2019 09:19:32 -0700 Subject: [PATCH 060/100] Changed InputDeviceButton to unmute on push and hold while in push to talk mode --- .../inputDeviceButton/InputDeviceButton.qml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml index cb10cc5eef..c546af218b 100644 --- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml +++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml @@ -77,6 +77,21 @@ Rectangle { Tablet.playSound(TabletEnums.ButtonClick); muted = Qt.binding(function() { return AudioScriptingInterface.muted; }); // restore binding } + + onPressed: { + if (pushToTalk) { + AudioScriptingInterface.pushingToTalk = true; + Tablet.playSound(TabletEnums.ButtonClick); + } + } + + onReleased: { + if (pushToTalk) { + AudioScriptingInterface.pushingToTalk = false; + Tablet.playSound(TabletEnums.ButtonClick); + } + } + onContainsMouseChanged: { if (containsMouse) { Tablet.playSound(TabletEnums.ButtonHover); From a96d57e8d22049743b002ccebf28521e25054292 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Thu, 6 Jun 2019 09:23:14 -0700 Subject: [PATCH 061/100] Update launchers/darwin/CMakeLists.txt --- launchers/darwin/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index b94caeda47..d8baea6e3c 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -67,7 +67,6 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}) set_from_env(LAUNCHER_HMAC_SECRET LAUNCHER_HMAC_SECRET "") target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}") -message("HMAC secret ${LAUNCHER_HMAC_SECRET}") file(GLOB NIB_FILES "nib/*.xib") From a5c2ce472e659d476de796a15625cfc98b4f13db Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Thu, 6 Jun 2019 11:08:16 -0700 Subject: [PATCH 062/100] unsourced additions from Howard --- tools/dissectors/1-hfudt.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua index 484ae6f897..eeda0c4d7e 100644 --- a/tools/dissectors/1-hfudt.lua +++ b/tools/dissectors/1-hfudt.lua @@ -158,7 +158,13 @@ local packet_types = { } local unsourced_packet_types = { - ["DomainList"] = true + ["DomainList"] = true, + ["DomainConnectRequest"] = true, + ["ICEPing"] = true, + ["ICEPingReply"] = true, + ["DomainServerConnectionToken"] = true, + ["DomainSettingsRequest"] = true, + ["ICEServerHeartbeatACK"] = true } local fragments = {} From f7333e90d85b60fe4f217e0dac50082c8b53f7b2 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Thu, 6 Jun 2019 11:58:39 -0700 Subject: [PATCH 063/100] fixing bugs --- launchers/darwin/src/CredentialsRequest.m | 3 +-- launchers/darwin/src/DownloadInterface.m | 1 + launchers/darwin/src/OrganizationRequest.m | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/launchers/darwin/src/CredentialsRequest.m b/launchers/darwin/src/CredentialsRequest.m index 966bb8cb31..d2e7e51573 100644 --- a/launchers/darwin/src/CredentialsRequest.m +++ b/launchers/darwin/src/CredentialsRequest.m @@ -7,7 +7,7 @@ - (void) confirmCredentials:(NSString*)username :(NSString*)password { NSLog(@"web request started"); - NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", username, password]; + NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", username, [password stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet symbolCharacterSet]]]; NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding]; NSString *postLength = [NSString stringWithFormat:@"%ld", (unsigned long)[postData length]]; @@ -18,7 +18,6 @@ [request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; [request setHTTPBody:postData]; - //NSURLConnection *theConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self]; NSURLSession* session = [NSURLSession sharedSession]; NSURLSessionDataTask* dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { diff --git a/launchers/darwin/src/DownloadInterface.m b/launchers/darwin/src/DownloadInterface.m index 00e132a91d..b957197567 100644 --- a/launchers/darwin/src/DownloadInterface.m +++ b/launchers/darwin/src/DownloadInterface.m @@ -41,6 +41,7 @@ [fileManager moveItemAtURL:location toURL:destinationURL error:&error]; Launcher* sharedLauncher = [Launcher sharedLauncher]; + [sharedLauncher setDownloadFilename:destinationFileName]; NSString* appPath = [sharedLauncher getAppPath]; NSString* downloadFileName = [sharedLauncher getDownloadFilename]; diff --git a/launchers/darwin/src/OrganizationRequest.m b/launchers/darwin/src/OrganizationRequest.m index 23d3c2e1cf..36a4228c96 100644 --- a/launchers/darwin/src/OrganizationRequest.m +++ b/launchers/darwin/src/OrganizationRequest.m @@ -12,7 +12,7 @@ static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/ self.username = aUsername; const char *cKey = LAUNCHER_HMAC_SECRET; - const char *cData = [aOrganization cStringUsingEncoding:NSASCIIStringEncoding]; + const char *cData = [[aOrganization lowercaseString] cStringUsingEncoding:NSASCIIStringEncoding]; unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH]; CCHmac(kCCHmacAlgSHA256, cKey, strlen(cKey), cData, strlen(cData), cHMAC); NSData *HMACData = [NSData dataWithBytes:cHMAC length:sizeof(cHMAC)]; @@ -33,7 +33,6 @@ static NSString* const organizationURL = @"https://s3.amazonaws.com/hifi-public/ [sharedLauncher setLoginErrorState: NONE]; return [sharedLauncher organizationRequestFinished:TRUE]; } - NSLog(@"FAAAAILLLLLLLEEEEEEEDDDDDD"); [sharedLauncher setLoginErrorState: ORGANIZATION]; return [sharedLauncher organizationRequestFinished:FALSE]; /*NSLog(@"URL: %@", [organizationURL stringByAppendingString:jsonFile]); From fa2217c1880c33684fbe7c92f9504ab761f205cd Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 6 Jun 2019 12:20:43 -0700 Subject: [PATCH 064/100] DEV-113: Remove headphones icon from status indicator in top bar --- .../simplifiedUI/topBar/SimplifiedTopBar.qml | 18 ++++-------------- .../hifi/simplifiedUI/topBar/images/focus.svg | 13 ------------- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index 27a786ece2..36c882beb1 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml @@ -260,9 +260,7 @@ Rectangle { id: statusButton property string currentStatus anchors.centerIn: parent - anchors.horizontalCenterOffset: 1 - anchors.verticalCenterOffset: 2 - width: 13 + width: 15 height: width radius: width/2 visible: false @@ -270,7 +268,7 @@ Rectangle { ColorOverlay { anchors.fill: statusButton - opacity: statusButton.currentStatus ? 1 : 0 + opacity: statusButton.currentStatus ? (statusButtonMouseArea.containsMouse ? 1.0 : 0.7) : 0.7 source: statusButton color: if (statusButton.currentStatus === "busy") { "#ff001a" @@ -278,19 +276,11 @@ Rectangle { "#009036" } else if (statusButton.currentStatus) { "#ffed00" + } else { + "#7e8c81" } } - Image { - id: focusIcon - source: "./images/focus.svg" - opacity: statusButtonMouseArea.containsMouse ? 1.0 : (statusButton.currentStatus === "busy" ? 0.7 : 0.3) - anchors.centerIn: parent - width: 36 - height: 20 - fillMode: Image.PreserveAspectFit - } - MouseArea { id: statusButtonMouseArea anchors.fill: parent diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg deleted file mode 100644 index f7950650c6..0000000000 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - image/svg+xml - - - - - - - From 55ff39edaf839329669b6d7d9ee1e72fbc23e679 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 6 Jun 2019 12:29:22 -0700 Subject: [PATCH 065/100] Fixing an unecessary logging that was added during debug --- scripts/developer/utilities/lib/prop/PropScalar.qml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/developer/utilities/lib/prop/PropScalar.qml b/scripts/developer/utilities/lib/prop/PropScalar.qml index 41915bb68b..33e1bfc958 100644 --- a/scripts/developer/utilities/lib/prop/PropScalar.qml +++ b/scripts/developer/utilities/lib/prop/PropScalar.qml @@ -30,14 +30,7 @@ PropItem { Component.onCompleted: { valueVar = root.valueVarGetter(); - } - - Connections - { - target: obj; - onValueChanged: console.log('changed'); - } - + } PropLabel { id: valueLabel From 558719364062963e16bf2956638c71c38feae9ea Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Tue, 4 Jun 2019 09:06:31 -0700 Subject: [PATCH 066/100] Add more transition icon debugging --- libraries/render/src/render/DrawStatus.cpp | 36 +++++++++++++++++-- libraries/render/src/render/TransitionStage.h | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp index 0484c0c125..35e482483d 100644 --- a/libraries/render/src/render/DrawStatus.cpp +++ b/libraries/render/src/render/DrawStatus.cpp @@ -17,6 +17,8 @@ #include #include +#include "TransitionStage.h" + #include #include @@ -142,11 +144,39 @@ void DrawStatus::run(const RenderContextPointer& renderContext, const Input& inp auto& value = (vec4Num == 0 ? itemStatus[nbItems].first : itemStatus[nbItems].second); Item::Status::Value status; - status.setColor(Item::Status::Value::CYAN); - status.setIcon((unsigned char)Item::Status::Icon::SIMULATION_OWNER); - if (itemScene.getTransitionId() != INVALID_INDEX) { + auto transitionID = itemScene.getTransitionId(); + if (transitionID != INVALID_INDEX) { // We have a transition. Show this icon. status.setScale(1.0f); + // Is this a valid transition ID according to FadeJob? + auto& transitionStage = scene->getStage(TransitionStage::getName()); + if (transitionStage) { + if (transitionStage->isTransitionUsed(transitionID)) { + // Valid, active transition + status.setColor(Item::Status::Value::CYAN); + } else { + // Render item has a defined transition ID, but it's unallocated and isn't being processed + status.setColor(Item::Status::Value::RED); + } + // Set icon based on transition type + auto& transition = transitionStage->getTransition(transitionID); + switch (transition.eventType) { + case Transition::Type::USER_ENTER_DOMAIN: + case Transition::ELEMENT_ENTER_DOMAIN: + status.setIcon((unsigned char)Item::Status::Icon::PACKET_RECEIVED); + break; + case Transition::Type::USER_LEAVE_DOMAIN: + case Transition::ELEMENT_LEAVE_DOMAIN: + status.setIcon((unsigned char)Item::Status::Icon::PACKET_SENT); + break; + default: + status.setIcon((unsigned char)Item::Status::Icon::HAS_ACTIONS); + break; + } + } else { + // No way to determine transition + status.setScale(0.0f); + } } else { status.setScale(0.0f); } diff --git a/libraries/render/src/render/TransitionStage.h b/libraries/render/src/render/TransitionStage.h index 1d10a5dedb..abfdca9a06 100644 --- a/libraries/render/src/render/TransitionStage.h +++ b/libraries/render/src/render/TransitionStage.h @@ -30,7 +30,7 @@ namespace render { static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; } - bool checkTransitionId(Index index) const { return _transitions.checkIndex(index); } + bool isTransitionUsed(Index index) const { return _transitions.checkIndex(index) && !_transitions.isElementFreed(index); } const Transition& getTransition(Index TransitionId) const { return _transitions.get(TransitionId); } From 833946ceb381319059e4a4f44d2a63697480217d Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Tue, 4 Jun 2019 17:46:07 -0700 Subject: [PATCH 067/100] Clean up transition naming --- interface/src/avatar/AvatarManager.cpp | 2 +- .../src/avatars-renderer/Avatar.cpp | 4 +- .../src/EntityTreeRenderer.cpp | 2 +- .../src/RenderablePolyVoxEntityItem.cpp | 2 +- libraries/render-utils/src/FadeEffectJobs.cpp | 2 +- libraries/render/src/render/Scene.cpp | 46 ++++++------------- libraries/render/src/render/Scene.h | 46 +++++++++++-------- 7 files changed, 46 insertions(+), 58 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index f153f66799..bb8b7ba7f4 100755 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -597,7 +597,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar avatar->fadeOut(transaction, removalReason); workload::SpacePointer space = _space; - transaction.transitionFinishedOperator(avatar->getRenderItemID(), [space, avatar]() { + transaction.setTransitionFinishedOperator(avatar->getRenderItemID(), [space, avatar]() { if (avatar->getLastFadeRequested() != render::Transition::Type::USER_LEAVE_DOMAIN) { // The avatar is using another transition besides the fade-out transition, which means it is still in use. // Deleting the avatar now could cause state issues, so abort deletion and show message. diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp index 78481fdc2e..fb7eddd582 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp @@ -684,10 +684,10 @@ void Avatar::fadeOut(render::Transaction& transaction, KillAvatarReason reason) } void Avatar::fade(render::Transaction& transaction, render::Transition::Type type) { - transaction.addTransitionToItem(_renderItemID, type); + transaction.resetTransitionOnItem(_renderItemID, type); for (auto& attachmentModel : _attachmentModels) { for (auto itemId : attachmentModel->fetchRenderItemIDs()) { - transaction.addTransitionToItem(itemId, type, _renderItemID); + transaction.resetTransitionOnItem(itemId, type, _renderItemID); } } _lastFadeRequested = type; diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index ae8473e544..1ecbcb0c8b 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -1056,7 +1056,7 @@ void EntityTreeRenderer::fadeOutRenderable(const EntityRendererPointer& renderab render::Transaction transaction; auto scene = _viewState->getMain3DScene(); - transaction.transitionFinishedOperator(renderable->getRenderItemID(), [scene, renderable]() { + transaction.setTransitionFinishedOperator(renderable->getRenderItemID(), [scene, renderable]() { render::Transaction transaction; renderable->removeFromScene(scene, transaction); scene->enqueueTransaction(transaction); diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 183d2881f3..adf0a2d162 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -1653,7 +1653,7 @@ void PolyVoxEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& s #ifdef POLYVOX_ENTITY_USE_FADE_EFFECT if (!_hasTransitioned) { - transaction.addTransitionToItem(_renderItemID, render::Transition::ELEMENT_ENTER_DOMAIN); + transaction.resetTransitionOnItem(_renderItemID, render::Transition::ELEMENT_ENTER_DOMAIN); _hasTransitioned = true; } #endif diff --git a/libraries/render-utils/src/FadeEffectJobs.cpp b/libraries/render-utils/src/FadeEffectJobs.cpp index 1e2ea2bc15..43206e77fa 100644 --- a/libraries/render-utils/src/FadeEffectJobs.cpp +++ b/libraries/render-utils/src/FadeEffectJobs.cpp @@ -69,7 +69,7 @@ void FadeEditJob::run(const render::RenderContextPointer& renderContext, const F if (transition == nullptr || transition->isFinished || transition->eventType != transitionType) { // Relaunch transition render::Transaction transaction; - transaction.addTransitionToItem(id, transitionType); + transaction.resetTransitionOnItem(id, transitionType); scene->enqueueTransaction(transaction); } }); diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp index 3fd52d5fa2..bb43dcd2f5 100644 --- a/libraries/render/src/render/Scene.cpp +++ b/libraries/render/src/render/Scene.cpp @@ -31,23 +31,19 @@ void Transaction::removeItem(ItemID id) { _removedItems.emplace_back(id); } -void Transaction::addTransitionToItem(ItemID id, Transition::Type transition, ItemID boundId) { - _addedTransitions.emplace_back(id, transition, boundId); +void Transaction::resetTransitionOnItem(ItemID id, Transition::Type transition, ItemID boundId) { + _resetTransitions.emplace_back(id, transition, boundId); } void Transaction::removeTransitionFromItem(ItemID id) { - _addedTransitions.emplace_back(id, Transition::NONE, render::Item::INVALID_ITEM_ID); -} - -void Transaction::reApplyTransitionToItem(ItemID id) { - _reAppliedTransitions.emplace_back(id); + _resetTransitions.emplace_back(id, Transition::NONE, render::Item::INVALID_ITEM_ID); } void Transaction::queryTransitionOnItem(ItemID id, TransitionQueryFunc func) { _queriedTransitions.emplace_back(id, func); } -void Transaction::transitionFinishedOperator(ItemID id, TransitionFinishedFunc func) { +void Transaction::setTransitionFinishedOperator(ItemID id, TransitionFinishedFunc func) { _transitionFinishedOperators.emplace_back(id, func); } @@ -76,9 +72,8 @@ void Transaction::reserve(const std::vector& transactionContainer) size_t removedItemsCount = 0; size_t updatedItemsCount = 0; size_t resetSelectionsCount = 0; - size_t addedTransitionsCount = 0; + size_t resetTransitionsCount = 0; size_t queriedTransitionsCount = 0; - size_t reAppliedTransitionsCount = 0; size_t transitionFinishedOperatorsCount = 0; size_t highlightResetsCount = 0; size_t highlightRemovesCount = 0; @@ -89,10 +84,9 @@ void Transaction::reserve(const std::vector& transactionContainer) removedItemsCount += transaction._removedItems.size(); updatedItemsCount += transaction._updatedItems.size(); resetSelectionsCount += transaction._resetSelections.size(); - addedTransitionsCount += transaction._addedTransitions.size(); - transitionFinishedOperatorsCount += transaction._transitionFinishedOperators.size(); + resetTransitionsCount += transaction._resetTransitions.size(); queriedTransitionsCount += transaction._queriedTransitions.size(); - reAppliedTransitionsCount += transaction._reAppliedTransitions.size(); + transitionFinishedOperatorsCount += transaction._transitionFinishedOperators.size(); highlightResetsCount += transaction._highlightResets.size(); highlightRemovesCount += transaction._highlightRemoves.size(); highlightQueriesCount += transaction._highlightQueries.size(); @@ -102,9 +96,8 @@ void Transaction::reserve(const std::vector& transactionContainer) _removedItems.reserve(removedItemsCount); _updatedItems.reserve(updatedItemsCount); _resetSelections.reserve(resetSelectionsCount); - _addedTransitions.reserve(addedTransitionsCount); + _resetTransitions.reserve(resetTransitionsCount); _queriedTransitions.reserve(queriedTransitionsCount); - _reAppliedTransitions.reserve(reAppliedTransitionsCount); _transitionFinishedOperators.reserve(transitionFinishedOperatorsCount); _highlightResets.reserve(highlightResetsCount); _highlightRemoves.reserve(highlightRemovesCount); @@ -147,10 +140,9 @@ void Transaction::merge(Transaction&& transaction) { moveElements(_removedItems, transaction._removedItems); moveElements(_updatedItems, transaction._updatedItems); moveElements(_resetSelections, transaction._resetSelections); - moveElements(_addedTransitions, transaction._addedTransitions); + moveElements(_resetTransitions, transaction._resetTransitions); moveElements(_queriedTransitions, transaction._queriedTransitions); moveElements(_transitionFinishedOperators, transaction._transitionFinishedOperators); - moveElements(_reAppliedTransitions, transaction._reAppliedTransitions); moveElements(_highlightResets, transaction._highlightResets); moveElements(_highlightRemoves, transaction._highlightRemoves); moveElements(_highlightQueries, transaction._highlightQueries); @@ -161,9 +153,8 @@ void Transaction::merge(const Transaction& transaction) { copyElements(_removedItems, transaction._removedItems); copyElements(_updatedItems, transaction._updatedItems); copyElements(_resetSelections, transaction._resetSelections); - copyElements(_addedTransitions, transaction._addedTransitions); + copyElements(_resetTransitions, transaction._resetTransitions); copyElements(_queriedTransitions, transaction._queriedTransitions); - copyElements(_reAppliedTransitions, transaction._reAppliedTransitions); copyElements(_transitionFinishedOperators, transaction._transitionFinishedOperators); copyElements(_highlightResets, transaction._highlightResets); copyElements(_highlightRemoves, transaction._highlightRemoves); @@ -175,10 +166,9 @@ void Transaction::clear() { _removedItems.clear(); _updatedItems.clear(); _resetSelections.clear(); - _addedTransitions.clear(); + _resetTransitions.clear(); _queriedTransitions.clear(); _transitionFinishedOperators.clear(); - _reAppliedTransitions.clear(); _highlightResets.clear(); _highlightRemoves.clear(); _highlightQueries.clear(); @@ -278,8 +268,7 @@ void Scene::processTransactionFrame(const Transaction& transaction) { removeItems(transaction._removedItems); // add transitions - transitionItems(transaction._addedTransitions); - reApplyTransitions(transaction._reAppliedTransitions); + resetTransitionItems(transaction._resetTransitions); queryTransitionItems(transaction._queriedTransitions); resetTransitionFinishedOperator(transaction._transitionFinishedOperators); @@ -384,7 +373,7 @@ void Scene::updateItems(const Transaction::Updates& transactions) { } } -void Scene::transitionItems(const Transaction::TransitionAdds& transactions) { +void Scene::resetTransitionItems(const Transaction::TransitionResets& transactions) { auto transitionStage = getStage(TransitionStage::getName()); if (!transitionStage) { @@ -420,15 +409,6 @@ void Scene::transitionItems(const Transaction::TransitionAdds& transactions) { } } -void Scene::reApplyTransitions(const Transaction::TransitionReApplies& transactions) { - for (auto itemId : transactions) { - // Access the true item - const auto& item = _items[itemId]; - auto transitionId = item.getTransitionId(); - setItemTransition(itemId, transitionId); - } -} - void Scene::queryTransitionItems(const Transaction::TransitionQueries& transactions) { auto transitionStage = getStage(TransitionStage::getName()); diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 5f4a209b66..3cf59bbbcc 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -50,20 +50,18 @@ public: void resetItem(ItemID id, const PayloadPointer& payload); void removeItem(ItemID id); bool hasRemovedItems() const { return !_removedItems.empty(); } - - void addTransitionToItem(ItemID id, Transition::Type transition, ItemID boundId = render::Item::INVALID_ITEM_ID); - void removeTransitionFromItem(ItemID id); - void reApplyTransitionToItem(ItemID id); - void queryTransitionOnItem(ItemID id, TransitionQueryFunc func); - void transitionFinishedOperator(ItemID id, TransitionFinishedFunc func); - template void updateItem(ItemID id, std::function func) { updateItem(id, std::make_shared>(func)); } - void updateItem(ItemID id, const UpdateFunctorPointer& functor); void updateItem(ItemID id) { updateItem(id, nullptr); } + // Transition (applied to an item) transactions + void resetTransitionOnItem(ItemID id, Transition::Type transition, ItemID boundId = render::Item::INVALID_ITEM_ID); + void removeTransitionFromItem(ItemID id); + void setTransitionFinishedOperator(ItemID id, TransitionFinishedFunc func); + void queryTransitionOnItem(ItemID id, TransitionQueryFunc func); + // Selection transactions void resetSelection(const Selection& selection); @@ -83,11 +81,14 @@ protected: using Reset = std::tuple; using Remove = ItemID; using Update = std::tuple; - using TransitionAdd = std::tuple; - using TransitionQuery = std::tuple; + + using TransitionReset = std::tuple; + using TransitionRemove = ItemID; using TransitionFinishedOperator = std::tuple; - using TransitionReApply = ItemID; + using TransitionQuery = std::tuple; + using SelectionReset = Selection; + using HighlightReset = std::tuple; using HighlightRemove = std::string; using HighlightQuery = std::tuple; @@ -95,11 +96,14 @@ protected: using Resets = std::vector; using Removes = std::vector; using Updates = std::vector; - using TransitionAdds = std::vector; - using TransitionQueries = std::vector; + + using TransitionResets = std::vector; + using TransitionRemoves = std::vector; using TransitionFinishedOperators = std::vector; - using TransitionReApplies = std::vector; + using TransitionQueries = std::vector; + using SelectionResets = std::vector; + using HighlightResets = std::vector; using HighlightRemoves = std::vector; using HighlightQueries = std::vector; @@ -107,11 +111,14 @@ protected: Resets _resetItems; Removes _removedItems; Updates _updatedItems; - TransitionAdds _addedTransitions; - TransitionQueries _queriedTransitions; - TransitionReApplies _reAppliedTransitions; + + TransitionResets _resetTransitions; + TransitionRemoves _removeTransitions; TransitionFinishedOperators _transitionFinishedOperators; + TransitionQueries _queriedTransitions; + SelectionResets _resetSelections; + HighlightResets _highlightResets; HighlightRemoves _highlightRemoves; HighlightQueries _highlightQueries; @@ -215,9 +222,10 @@ protected: void resetTransitionFinishedOperator(const Transaction::TransitionFinishedOperators& transactions); void removeItems(const Transaction::Removes& transactions); void updateItems(const Transaction::Updates& transactions); - void transitionItems(const Transaction::TransitionAdds& transactions); - void reApplyTransitions(const Transaction::TransitionReApplies& transactions); + + void resetTransitionItems(const Transaction::TransitionResets& transactions); void queryTransitionItems(const Transaction::TransitionQueries& transactions); + void resetHighlights(const Transaction::HighlightResets& transactions); void removeHighlights(const Transaction::HighlightRemoves& transactions); void queryHighlights(const Transaction::HighlightQueries& transactions); From faf5db54768882d9eb4ef6cfcdaf9e884e5f5b23 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 6 Jun 2019 10:32:28 -0700 Subject: [PATCH 068/100] Change semantic for removing transitions --- libraries/render/src/render/Scene.cpp | 32 +++++++++++++++++++-------- libraries/render/src/render/Scene.h | 3 ++- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp index bb43dcd2f5..c516a833de 100644 --- a/libraries/render/src/render/Scene.cpp +++ b/libraries/render/src/render/Scene.cpp @@ -36,7 +36,7 @@ void Transaction::resetTransitionOnItem(ItemID id, Transition::Type transition, } void Transaction::removeTransitionFromItem(ItemID id) { - _resetTransitions.emplace_back(id, Transition::NONE, render::Item::INVALID_ITEM_ID); + _removeTransitions.emplace_back(id); } void Transaction::queryTransitionOnItem(ItemID id, TransitionQueryFunc func) { @@ -73,6 +73,7 @@ void Transaction::reserve(const std::vector& transactionContainer) size_t updatedItemsCount = 0; size_t resetSelectionsCount = 0; size_t resetTransitionsCount = 0; + size_t removeTransitionsCount = 0; size_t queriedTransitionsCount = 0; size_t transitionFinishedOperatorsCount = 0; size_t highlightResetsCount = 0; @@ -85,6 +86,7 @@ void Transaction::reserve(const std::vector& transactionContainer) updatedItemsCount += transaction._updatedItems.size(); resetSelectionsCount += transaction._resetSelections.size(); resetTransitionsCount += transaction._resetTransitions.size(); + removeTransitionsCount += transaction._removeTransitions.size(); queriedTransitionsCount += transaction._queriedTransitions.size(); transitionFinishedOperatorsCount += transaction._transitionFinishedOperators.size(); highlightResetsCount += transaction._highlightResets.size(); @@ -97,6 +99,7 @@ void Transaction::reserve(const std::vector& transactionContainer) _updatedItems.reserve(updatedItemsCount); _resetSelections.reserve(resetSelectionsCount); _resetTransitions.reserve(resetTransitionsCount); + _removeTransitions.reserve(removeTransitionsCount); _queriedTransitions.reserve(queriedTransitionsCount); _transitionFinishedOperators.reserve(transitionFinishedOperatorsCount); _highlightResets.reserve(highlightResetsCount); @@ -141,6 +144,7 @@ void Transaction::merge(Transaction&& transaction) { moveElements(_updatedItems, transaction._updatedItems); moveElements(_resetSelections, transaction._resetSelections); moveElements(_resetTransitions, transaction._resetTransitions); + moveElements(_removeTransitions, transaction._removeTransitions); moveElements(_queriedTransitions, transaction._queriedTransitions); moveElements(_transitionFinishedOperators, transaction._transitionFinishedOperators); moveElements(_highlightResets, transaction._highlightResets); @@ -154,6 +158,7 @@ void Transaction::merge(const Transaction& transaction) { copyElements(_updatedItems, transaction._updatedItems); copyElements(_resetSelections, transaction._resetSelections); copyElements(_resetTransitions, transaction._resetTransitions); + copyElements(_removeTransitions, transaction._removeTransitions); copyElements(_queriedTransitions, transaction._queriedTransitions); copyElements(_transitionFinishedOperators, transaction._transitionFinishedOperators); copyElements(_highlightResets, transaction._highlightResets); @@ -167,6 +172,7 @@ void Transaction::clear() { _updatedItems.clear(); _resetSelections.clear(); _resetTransitions.clear(); + _removeTransitions.clear(); _queriedTransitions.clear(); _transitionFinishedOperators.clear(); _highlightResets.clear(); @@ -269,6 +275,7 @@ void Scene::processTransactionFrame(const Transaction& transaction) { // add transitions resetTransitionItems(transaction._resetTransitions); + removeTransitionItems(transaction._removeTransitions); queryTransitionItems(transaction._queriedTransitions); resetTransitionFinishedOperator(transaction._transitionFinishedOperators); @@ -321,7 +328,7 @@ void Scene::removeItems(const Transaction::Removes& transactions) { } // Remove the transition to prevent updating it for nothing - resetItemTransition(removedID); + removeItemTransition(removedID); // Kill it item.kill(); @@ -390,12 +397,7 @@ void Scene::resetTransitionItems(const Transaction::TransitionResets& transactio // Remove pre-existing transition, if need be if (!TransitionStage::isIndexInvalid(transitionId)) { - // Only remove if: - // transitioning to something other than none or we're transitioning to none from ELEMENT_LEAVE_DOMAIN or USER_LEAVE_DOMAIN - const auto& oldTransitionType = transitionStage->getTransition(transitionId).eventType; - if (transitionType != oldTransitionType) { - resetItemTransition(itemId); - } + removeItemTransition(itemId); } // Add a new one. @@ -409,6 +411,18 @@ void Scene::resetTransitionItems(const Transaction::TransitionResets& transactio } } +void Scene::removeTransitionItems(const Transaction::TransitionRemoves& transactions) { + for (auto& itemId : transactions) { + // Access the true item + const auto& item = _items[itemId]; + auto transitionId = item.getTransitionId(); + + if (!TransitionStage::isIndexInvalid(transitionId)) { + removeItemTransition(itemId); + } + } +} + void Scene::queryTransitionItems(const Transaction::TransitionQueries& transactions) { auto transitionStage = getStage(TransitionStage::getName()); @@ -535,7 +549,7 @@ void Scene::setItemTransition(ItemID itemId, Index transitionId) { } } -void Scene::resetItemTransition(ItemID itemId) { +void Scene::removeItemTransition(ItemID itemId) { auto transitionStage = getStage(TransitionStage::getName()); if (!transitionStage) { return; diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h index 3cf59bbbcc..1bc282646b 100644 --- a/libraries/render/src/render/Scene.h +++ b/libraries/render/src/render/Scene.h @@ -192,7 +192,7 @@ public: void resetStage(const Stage::Name& name, const StagePointer& stage); void setItemTransition(ItemID id, Index transitionId); - void resetItemTransition(ItemID id); + void removeItemTransition(ItemID id); protected: @@ -224,6 +224,7 @@ protected: void updateItems(const Transaction::Updates& transactions); void resetTransitionItems(const Transaction::TransitionResets& transactions); + void removeTransitionItems(const Transaction::TransitionRemoves& transactions); void queryTransitionItems(const Transaction::TransitionQueries& transactions); void resetHighlights(const Transaction::HighlightResets& transactions); From 971d563f498d2702a0ecf7f8ce8d1afa4b5a89fa Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 6 Jun 2019 13:23:35 -0700 Subject: [PATCH 069/100] Add debug icons for transitions --- interface/resources/icons/statusIconAtlas.svg | 219 ++++++++++++++---- libraries/render/src/render/DrawStatus.cpp | 12 +- libraries/render/src/render/Item.h | 5 + 3 files changed, 182 insertions(+), 54 deletions(-) diff --git a/interface/resources/icons/statusIconAtlas.svg b/interface/resources/icons/statusIconAtlas.svg index 027102cc69..1ad83aa3b8 100644 --- a/interface/resources/icons/statusIconAtlas.svg +++ b/interface/resources/icons/statusIconAtlas.svg @@ -1,52 +1,171 @@ - - - - \ No newline at end of file diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp index 35e482483d..bdc27bd857 100644 --- a/libraries/render/src/render/DrawStatus.cpp +++ b/libraries/render/src/render/DrawStatus.cpp @@ -162,15 +162,19 @@ void DrawStatus::run(const RenderContextPointer& renderContext, const Input& inp auto& transition = transitionStage->getTransition(transitionID); switch (transition.eventType) { case Transition::Type::USER_ENTER_DOMAIN: - case Transition::ELEMENT_ENTER_DOMAIN: - status.setIcon((unsigned char)Item::Status::Icon::PACKET_RECEIVED); + status.setIcon((unsigned char)Item::Status::Icon::USER_TRANSITION_IN); break; case Transition::Type::USER_LEAVE_DOMAIN: + status.setIcon((unsigned char)Item::Status::Icon::USER_TRANSITION_OUT); + break; + case Transition::ELEMENT_ENTER_DOMAIN: + status.setIcon((unsigned char)Item::Status::Icon::GENERIC_TRANSITION_IN); + break; case Transition::ELEMENT_LEAVE_DOMAIN: - status.setIcon((unsigned char)Item::Status::Icon::PACKET_SENT); + status.setIcon((unsigned char)Item::Status::Icon::GENERIC_TRANSITION_OUT); break; default: - status.setIcon((unsigned char)Item::Status::Icon::HAS_ACTIONS); + status.setIcon((unsigned char)Item::Status::Icon::GENERIC_TRANSITION); break; } } else { diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h index d5d3e6942a..4736359832 100644 --- a/libraries/render/src/render/Item.h +++ b/libraries/render/src/render/Item.h @@ -363,6 +363,11 @@ public: HAS_ACTIONS = 4, OTHER_SIMULATION_OWNER = 5, ENTITY_HOST_TYPE = 6, + GENERIC_TRANSITION = 7, + GENERIC_TRANSITION_OUT = 8, + GENERIC_TRANSITION_IN = 9, + USER_TRANSITION_OUT = 10, + USER_TRANSITION_IN = 11, NONE = 255 }; From e572057d7cc6192049017a97294d03884fd13af4 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Thu, 6 Jun 2019 13:37:22 -0700 Subject: [PATCH 070/100] Password case insensitive and encoded. Proper uninstall --- launchers/win32/LauncherDlg.cpp | 137 ++++++++++++++++++---------- launchers/win32/LauncherDlg.h | 1 + launchers/win32/LauncherManager.cpp | 71 +++++++++++--- launchers/win32/LauncherManager.h | 4 + launchers/win32/LauncherUtils.cpp | 47 +++++++++- launchers/win32/LauncherUtils.h | 19 +++- 6 files changed, 219 insertions(+), 60 deletions(-) diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp index 07fb57ddcd..7751c9cd6b 100644 --- a/launchers/win32/LauncherDlg.cpp +++ b/launchers/win32/LauncherDlg.cpp @@ -46,6 +46,10 @@ CLauncherDlg::CLauncherDlg(CWnd* pParent) EnableD2DSupport(); } +CLauncherDlg::~CLauncherDlg() { + theApp._manager.closeLog(); +} + void CLauncherDlg::DoDataExchange(CDataExchange* pDX) { DDX_Control(pDX, IDC_BUTTON_NEXT, m_btnNext); @@ -154,25 +158,50 @@ HCURSOR CLauncherDlg::OnQueryDragIcon() } void CLauncherDlg::startProcess() { - if (theApp._manager.needsUpdate()) { - setDrawDialog(DrawStep::DrawProcessUpdate); - } else { - setDrawDialog(DrawStep::DrawProcessSetup); - } - - CString installDir; - theApp._manager.getAndCreatePaths(LauncherManager::PathType::Interface_Directory, installDir); - CString interfaceExe = installDir += "\\interface.exe"; - if (!theApp._manager.isLoggedIn()) { - theApp._manager.downloadContent(); - } else { - theApp._manager.downloadApplication(); - } + if (theApp._manager.needsUpdate()) { + theApp._manager.addToLog(_T("Starting Process Update")); + setDrawDialog(DrawStep::DrawProcessUpdate); + } else { + theApp._manager.addToLog(_T("Starting Process Setup")); + setDrawDialog(DrawStep::DrawProcessSetup); + } + theApp._manager.addToLog(_T("Deleting directories before install")); + + CString installDir; + theApp._manager.getAndCreatePaths(LauncherManager::PathType::Interface_Directory, installDir); + CString downloadDir; + theApp._manager.getAndCreatePaths(LauncherManager::PathType::Download_Directory, downloadDir); + + LauncherUtils::deleteDirectoriesOnThread(installDir, downloadDir, [&](int error) { + LauncherUtils::DeleteDirError deleteError = (LauncherUtils::DeleteDirError)error; + if (error == LauncherUtils::DeleteDirError::NoErrorDeleting) { + theApp._manager.addToLog(_T("Install directory deleted.")); + theApp._manager.addToLog(_T("Downloads directory deleted.")); + // CString interfaceExe = installPath += "\\interface.exe"; + if (!theApp._manager.isLoggedIn()) { + theApp._manager.addToLog(_T("Downloading Content")); + theApp._manager.downloadContent(); + } else { + theApp._manager.addToLog(_T("Downloading App")); + theApp._manager.downloadApplication(); + } + } + if (error == LauncherUtils::DeleteDirError::ErrorDeletingPath1 || + error == LauncherUtils::DeleteDirError::ErrorDeletingPaths) { + theApp._manager.addToLog(_T("Error deleting install directory.")); + } + if (error == LauncherUtils::DeleteDirError::ErrorDeletingPath2 || + error == LauncherUtils::DeleteDirError::ErrorDeletingPaths) { + theApp._manager.addToLog(_T("Error deleting downloads directory.")); + } + }); } BOOL CLauncherDlg::getHQInfo(const CString& orgname) { CString hash; - LauncherUtils::hMac256(orgname, LAUNCHER_HMAC_SECRET, hash); + CString lowerOrgName = orgname; + lowerOrgName.MakeLower(); + LauncherUtils::hMac256(lowerOrgName, LAUNCHER_HMAC_SECRET, hash); return theApp._manager.readOrganizationJSON(hash) == LauncherUtils::ResponseError::NoError; } @@ -181,33 +210,44 @@ afx_msg void CLauncherDlg::OnTroubleClicked() { } afx_msg void CLauncherDlg::OnNextClicked() { - if (_drawStep != DrawStep::DrawChoose) { - CString token; - CString username, password, orgname; - m_orgname.GetWindowTextW(orgname); - m_username.GetWindowTextW(username); - m_password.GetWindowTextW(password); - LauncherUtils::ResponseError error; - if (orgname.GetLength() > 0 && username.GetLength() > 0 && password.GetLength() > 0) { - if (getHQInfo(orgname)) { - error = theApp._manager.getAccessTokenForCredentials(username, password); - if (error == LauncherUtils::ResponseError::NoError) { - setDrawDialog(DrawStep::DrawChoose); - } else if (error == LauncherUtils::ResponseError::BadCredentials) { - setDrawDialog(DrawStep::DrawLoginErrorCred); - } else { - MessageBox(L"Error Reading or retreaving response.", L"Network Error", MB_OK | MB_ICONERROR); - } - } else { - setDrawDialog(DrawStep::DrawLoginErrorOrg); - } - } - } else { - CString displayName; - m_username.GetWindowTextW(displayName); - theApp._manager.setDisplayName(displayName); - startProcess(); - } + if (_drawStep != DrawStep::DrawChoose) { + CString token; + CString username, password, orgname; + m_orgname.GetWindowTextW(orgname); + m_username.GetWindowTextW(username); + m_password.GetWindowTextW(password); + + username = LauncherUtils::urlEncodeString(username); + password = LauncherUtils::urlEncodeString(password); + LauncherUtils::ResponseError error; + if (orgname.GetLength() > 0 && username.GetLength() > 0 && password.GetLength() > 0) { + theApp._manager.addToLog(_T("Trying to get organization data")); + if (getHQInfo(orgname)) { + theApp._manager.addToLog(_T("Organization data received.")); + theApp._manager.addToLog(_T("Trying to log in with credentials")); + error = theApp._manager.getAccessTokenForCredentials(username, password); + if (error == LauncherUtils::ResponseError::NoError) { + theApp._manager.addToLog(_T("Logged in correctly.")); + setDrawDialog(DrawStep::DrawChoose); + } else if (error == LauncherUtils::ResponseError::BadCredentials) { + theApp._manager.addToLog(_T("Bad credentials. Try again")); + setDrawDialog(DrawStep::DrawLoginErrorCred); + } else { + theApp._manager.addToLog(_T("Error Reading or retreaving response.")); + MessageBox(L"Error Reading or retreaving response.", L"Network Error", MB_OK | MB_ICONERROR); + } + } else { + theApp._manager.addToLog(_T("Organization name does not exist.")); + setDrawDialog(DrawStep::DrawLoginErrorOrg); + } + } + } else { + CString displayName; + m_username.GetWindowTextW(displayName); + theApp._manager.setDisplayName(displayName); + theApp._manager.addToLog(_T("Setting display name: " + displayName)); + startProcess(); + } } void CLauncherDlg::drawBackground(CHwndRenderTarget* pRenderTarget) { @@ -534,11 +574,13 @@ void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) { } if (_showSplash) { if (_splashStep == 0){ - if (theApp._manager.needsUninstall()) { - setDrawDialog(DrawStep::DrawProcessUninstall); - } else { - setDrawDialog(DrawStep::DrawLogo); - } + if (theApp._manager.needsUninstall()) { + theApp._manager.addToLog(_T("Waiting to unistall")); + setDrawDialog(DrawStep::DrawProcessUninstall); + } else { + theApp._manager.addToLog(_T("Start splash screen")); + setDrawDialog(DrawStep::DrawLogo); + } } else if (_splashStep > 100) { _showSplash = false; if (theApp._manager.shouldShutDown()) { @@ -551,6 +593,7 @@ void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) { theApp._manager.uninstallApplication(); exit(0); } else { + theApp._manager.addToLog(_T("Starting login")); setDrawDialog(DrawStep::DrawLoginLogin); } } diff --git a/launchers/win32/LauncherDlg.h b/launchers/win32/LauncherDlg.h index 55bc97f205..d743dd31d2 100644 --- a/launchers/win32/LauncherDlg.h +++ b/launchers/win32/LauncherDlg.h @@ -38,6 +38,7 @@ public: }; CLauncherDlg(CWnd* pParent = nullptr); + ~CLauncherDlg(); virtual BOOL PreTranslateMessage(MSG* pMsg); void setDrawDialog(DrawStep step, BOOL isUpdate = FALSE); diff --git a/launchers/win32/LauncherManager.cpp b/launchers/win32/LauncherManager.cpp index 94a659a4d7..3dc7ddedcc 100644 --- a/launchers/win32/LauncherManager.cpp +++ b/launchers/win32/LauncherManager.cpp @@ -9,6 +9,7 @@ // #include "stdafx.h" +#include #include #include "LauncherManager.h" @@ -24,19 +25,57 @@ LauncherManager::~LauncherManager() } void LauncherManager::init() { - getMostRecentBuild(_latestApplicationURL, _latestVersion); - CString currentVersion; - if (isApplicationInstalled(currentVersion, _domainURL, _contentURL, _loggedIn) && _loggedIn) { - if (_latestVersion.Compare(currentVersion) == 0) { - launchApplication(); - _shouldShutdown = TRUE; - } else { - _shouldUpdate = TRUE; - } - } + initLog(); + addToLog(_T("Getting most recent build")); + getMostRecentBuild(_latestApplicationURL, _latestVersion); + addToLog(_T("Latest version: ") + _latestVersion); + CString currentVersion; + if (isApplicationInstalled(currentVersion, _domainURL, _contentURL, _loggedIn) && _loggedIn) { + addToLog(_T("Installed version: ") + currentVersion); + if (_latestVersion.Compare(currentVersion) == 0) { + addToLog(_T("Already running most recent build. Launching interface.exe")); + launchApplication(); + _shouldShutdown = TRUE; + } else { + addToLog(_T("New build found. Updating")); + _shouldUpdate = TRUE; + } + } +} + +BOOL LauncherManager::initLog() { + CString logPath; + auto result = getAndCreatePaths(PathType::Launcher_Directory, logPath); + if (result) { + logPath += _T("log.txt"); + return result = _logFile.Open(logPath, CFile::modeCreate | CFile::modeReadWrite); + } + return FALSE; +} + +BOOL LauncherManager::addToLog(const CString& line) { + if (_logFile.m_hFile != CStdioFile::hFileNull) { + char buff[100]; + time_t now = time(0); + tm ltm; + localtime_s(<m, &now); + + strftime(buff, 100, "%Y-%m-%d %H:%M:%S", <m); + CString timeStr = CString(buff); + _logFile.WriteString(timeStr + _T(" ") + line + _T("\n")); + return TRUE; + } + return FALSE; +} + +void LauncherManager::closeLog() { + if (_logFile.m_hFile != CStdioFile::hFileNull) { + _logFile.Close(); + } } BOOL LauncherManager::installLauncher() { + addToLog(_T("Installing Launcher.")); CString appPath; BOOL result = getAndCreatePaths(PathType::Running_Path, appPath); if (!result) { @@ -60,6 +99,7 @@ BOOL LauncherManager::installLauncher() { CopyFile(appPath, instalationPath, FALSE); } } else if (_shouldUninstall) { + addToLog(_T("Launching uninstall mode.")); CString tempPath; if (getAndCreatePaths(PathType::Temp_Directory, tempPath)) { tempPath += _T("\\HQ_uninstaller_tmp.exe"); @@ -73,6 +113,7 @@ BOOL LauncherManager::installLauncher() { BOOL LauncherManager::createShortcuts() { CString desktopLnkPath; + addToLog(_T("Creating shortcuts.")); getAndCreatePaths(PathType::Desktop_Directory, desktopLnkPath); desktopLnkPath += _T("\\HQ Launcher.lnk"); CString installDir; @@ -100,6 +141,7 @@ BOOL LauncherManager::createShortcuts() { BOOL LauncherManager::deleteShortcuts() { CString desktopLnkPath; + addToLog(_T("Deleting shortcuts.")); getAndCreatePaths(PathType::Desktop_Directory, desktopLnkPath); desktopLnkPath += _T("\\HQ Launcher.lnk"); BOOL success = LauncherUtils::deleteFileOrDirectory(desktopLnkPath); @@ -353,13 +395,17 @@ BOOL LauncherManager::uninstallApplication() { void LauncherManager::onZipExtracted(ZipType type, int size) { if (type == ZipType::ZipContent) { + addToLog(_T("Downloading application.")); downloadApplication(); } else if (type == ZipType::ZipApplication) { createShortcuts(); CString versionPath; getAndCreatePaths(LauncherManager::PathType::Launcher_Directory, versionPath); - createConfigJSON(); + addToLog(_T("Creating config.json")); + createConfigJSON(); + addToLog(_T("Launching application.")); launchApplication(_tokensJSON); + addToLog(_T("Creating registry keys.")); createApplicationRegistryKeys(size); _shouldShutdown = TRUE; } @@ -377,8 +423,10 @@ BOOL LauncherManager::extractApplication() { void LauncherManager::onFileDownloaded(DownloadType type) { if (type == DownloadType::DownloadContent) { + addToLog(_T("Installing content.")); installContent(); } else if (type == DownloadType::DownloadApplication) { + addToLog(_T("Installing application.")); extractApplication(); } } @@ -412,6 +460,7 @@ BOOL LauncherManager::downloadFile(DownloadType type, const CString& url, CStrin } BOOL LauncherManager::downloadContent() { + addToLog(_T("Downloading content.")); CString contentURL = getContentURL(); return downloadFile(DownloadType::DownloadContent, contentURL, _contentZipPath); } diff --git a/launchers/win32/LauncherManager.h b/launchers/win32/LauncherManager.h index 3ad21694f6..4bc09b49ca 100644 --- a/launchers/win32/LauncherManager.h +++ b/launchers/win32/LauncherManager.h @@ -53,6 +53,9 @@ public: LauncherManager(); ~LauncherManager(); void init(); + BOOL initLog(); + BOOL addToLog(const CString& line); + void closeLog(); BOOL getAndCreatePaths(PathType type, CString& outPath); BOOL getInstalledVersion(const CString& path, CString& version); BOOL isApplicationInstalled(CString& version, CString& domain, @@ -105,5 +108,6 @@ private: BOOL _shouldUpdate{ FALSE }; BOOL _shouldUninstall{ FALSE }; BOOL _shouldShutdown{ FALSE }; + CStdioFile _logFile; }; diff --git a/launchers/win32/LauncherUtils.cpp b/launchers/win32/LauncherUtils.cpp index 8a75747e9b..8cf1d78ebf 100644 --- a/launchers/win32/LauncherUtils.cpp +++ b/launchers/win32/LauncherUtils.cpp @@ -17,6 +17,24 @@ #include "LauncherUtils.h" +CString LauncherUtils::urlEncodeString(const CString& url) { + std::map specialCharsMap = { { _T("$"), _T("%24") }, { _T(" "), _T("%20") }, { _T("#"), _T("%23") }, + { _T("@"), _T("%40") }, { _T("`"), _T("%60") }, { _T("&"), _T("%26") }, + { _T("/"), _T("%2F") }, { _T(":"), _T("%3A") }, { _T(";"), _T("%3B") }, + { _T("<"), _T("%3C") }, { _T(">"), _T("%3E") }, { _T("="), _T("%3D") }, + { _T("?"), _T("%3F") }, { _T("["), _T("%5B") }, { _T("\\"), _T("%5C") }, + { _T("]"), _T("%5D") }, { _T("^"), _T("%5E") }, { _T("{"), _T("%7B") }, + { _T("|"), _T("%7C") }, { _T("}"), _T("%7D") }, { _T("~"), _T("%7E") }, + { _T("“"), _T("%22") }, { _T("‘"), _T("%27") }, { _T("+"), _T("%2B") }, + { _T(","), _T("%2C") } }; + CString stringOut = url; + stringOut.Replace(_T("%"), _T("%25")); + for (auto& itr = specialCharsMap.begin(); itr != specialCharsMap.end(); itr++) { + stringOut.Replace(itr->first, itr->second); + } + return stringOut; +} + BOOL LauncherUtils::IsProcessRunning(const wchar_t *processName) { bool exists = false; PROCESSENTRY32 entry; @@ -374,6 +392,19 @@ DWORD WINAPI LauncherUtils::downloadThread(LPVOID lpParameter) return 0; } +DWORD WINAPI LauncherUtils::deleteDirectoriesThread(LPVOID lpParameter) { + DeleteThreadData& data = *((DeleteThreadData*)lpParameter); + DeleteDirError error = DeleteDirError::NoErrorDeleting; + if (!LauncherUtils::deleteFileOrDirectory(data._path1)) { + error = DeleteDirError::ErrorDeletingPath1; + } + if (!LauncherUtils::deleteFileOrDirectory(data._path2)) { + error = error == NoError ? DeleteDirError::ErrorDeletingPath2 : DeleteDirError::ErrorDeletingPaths; + } + data.callback(error); + return 0; +} + BOOL LauncherUtils::unzipFileOnThread(int type, const std::string& zipFile, const std::string& path, std::function callback) { DWORD myThreadID; UnzipThreadData* unzipThreadData = new UnzipThreadData(); @@ -402,4 +433,18 @@ BOOL LauncherUtils::downloadFileOnThread(int type, const CString& url, const CSt return TRUE; } return FALSE; -} \ No newline at end of file +} + +BOOL LauncherUtils::deleteDirectoriesOnThread(const CString& dir1, const CString& dir2, std::function callback) { + DWORD myThreadID; + DeleteThreadData* deleteThreadData = new DeleteThreadData(); + deleteThreadData->_path1 = dir1; + deleteThreadData->_path2 = dir2; + deleteThreadData->setCallback(callback); + HANDLE myHandle = CreateThread(0, 0, deleteDirectoriesThread, deleteThreadData, 0, &myThreadID); + if (myHandle) { + CloseHandle(myHandle); + return TRUE; + } + return FALSE; +} diff --git a/launchers/win32/LauncherUtils.h b/launchers/win32/LauncherUtils.h index 3e9f18d892..4add0fb931 100644 --- a/launchers/win32/LauncherUtils.h +++ b/launchers/win32/LauncherUtils.h @@ -30,6 +30,13 @@ public: NoError }; + enum DeleteDirError { + NoErrorDeleting = 0, + ErrorDeletingPath1, + ErrorDeletingPath2, + ErrorDeletingPaths + }; + struct DownloadThreadData { int _type; CString _url; @@ -52,6 +59,13 @@ public: } }; + struct DeleteThreadData { + CString _path1; + CString _path2; + std::function callback; + void setCallback(std::function fn) { callback = std::bind(fn, std::placeholders::_1); } + }; + static BOOL parseJSON(const CString& jsonTxt, Json::Value& jsonObject); static ResponseError makeHTTPCall(const CString& callerName, const CString& mainUrl, const CString& dirUrl, const CString& contentType, @@ -69,9 +83,12 @@ public: static BOOL deleteRegistryKey(const CString& registryPath); static BOOL unzipFileOnThread(int type, const std::string& zipFile, const std::string& path, std::function callback); static BOOL downloadFileOnThread(int type, const CString& url, const CString& file, std::function callback); + static BOOL deleteDirectoriesOnThread(const CString& dir1, const CString& dir2, std::function callback); + static CString urlEncodeString(const CString& url); -private: + private: // Threads static DWORD WINAPI unzipThread(LPVOID lpParameter); static DWORD WINAPI downloadThread(LPVOID lpParameter); + static DWORD WINAPI deleteDirectoriesThread(LPVOID lpParameter); }; \ No newline at end of file From a7ad087bd06654034924c1b139f40af4e5a88e6d Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 6 Jun 2019 14:23:18 -0700 Subject: [PATCH 071/100] Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup --- interface/src/ui/InteractiveWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/InteractiveWindow.cpp b/interface/src/ui/InteractiveWindow.cpp index 7e8c176424..2fbb665c48 100644 --- a/interface/src/ui/InteractiveWindow.cpp +++ b/interface/src/ui/InteractiveWindow.cpp @@ -150,7 +150,9 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap if (status == QQuickView::Ready) { QQuickItem* rootItem = _dockWidget->getRootItem(); _dockWidget->getQuickView()->rootContext()->setContextProperty(EVENT_BRIDGE_PROPERTY, this); - QObject::connect(rootItem, SIGNAL(sendToScript(QVariant)), this, SLOT(qmlToScript(const QVariant&)), Qt::QueuedConnection); + QObject::connect(rootItem, SIGNAL(sendToScript(QVariant)), this, SLOT(qmlToScript(const QVariant&)), + Qt::QueuedConnection); + emit mainWindow->windowGeometryChanged(qApp->getWindow()->geometry()); } }); _dockWidget->setSource(QUrl(sourceUrl)); From 5fe4f35139645d15051405bdafb469361d532ca0 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Thu, 6 Jun 2019 14:35:45 -0700 Subject: [PATCH 072/100] propertly encode --- launchers/darwin/src/CredentialsRequest.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/launchers/darwin/src/CredentialsRequest.m b/launchers/darwin/src/CredentialsRequest.m index d2e7e51573..fd651bd98a 100644 --- a/launchers/darwin/src/CredentialsRequest.m +++ b/launchers/darwin/src/CredentialsRequest.m @@ -7,7 +7,9 @@ - (void) confirmCredentials:(NSString*)username :(NSString*)password { NSLog(@"web request started"); - NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", username, [password stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet symbolCharacterSet]]]; + NSString *post = [NSString stringWithFormat:@"grant_type=password&username=%@&password=%@&scope=owner", + [username stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]], + [password stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]]]; NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding]; NSString *postLength = [NSString stringWithFormat:@"%ld", (unsigned long)[postData length]]; From 36e1366cc467133056f587a8b122e665999a9e83 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Thu, 6 Jun 2019 14:19:37 -0700 Subject: [PATCH 073/100] added Notifies to various QProperties in order to remove warnings in interface logs --- interface/src/avatar/MyAvatar.cpp | 1 + interface/src/avatar/MyAvatar.h | 9 ++++++++- interface/src/scripting/AudioDevices.h | 2 +- libraries/shared/src/shared/Camera.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index ad39b6663a..f3172772ab 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -5014,6 +5014,7 @@ float MyAvatar::getAnalogSprintSpeed() const { void MyAvatar::setAnalogPlusWalkSpeed(float value) { _analogPlusWalkSpeed.set(value); + analogPlusWalkSpeedChanged(value); // Sprint speed for Analog Plus should be double walk speed. _analogPlusSprintSpeed.set(value * 2.0f); } diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 9fb6c85a78..7736eba7ea 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -370,7 +370,7 @@ class MyAvatar : public Avatar { Q_PROPERTY(QUuid SELF_ID READ getSelfID CONSTANT) Q_PROPERTY(float walkSpeed READ getWalkSpeed WRITE setWalkSpeed); - Q_PROPERTY(float analogPlusWalkSpeed READ getAnalogPlusWalkSpeed WRITE setAnalogPlusWalkSpeed); + Q_PROPERTY(float analogPlusWalkSpeed READ getAnalogPlusWalkSpeed WRITE setAnalogPlusWalkSpeed NOTIFY analogPlusWalkSpeedChanged); Q_PROPERTY(float analogPlusSprintSpeed READ getAnalogPlusSprintSpeed WRITE setAnalogPlusSprintSpeed); Q_PROPERTY(float walkBackwardSpeed READ getWalkBackwardSpeed WRITE setWalkBackwardSpeed); Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed); @@ -2161,6 +2161,13 @@ signals: */ void audioListenerModeChanged(); + /**jsdoc + * Notifies when the analogPlusWalkSpeed value changed. + * @function MyAvatar.analogPlusWalkSpeedChanged + * @returns {Signal} + */ + void analogPlusWalkSpeedChanged(float value); + /**jsdoc * @function MyAvatar.transformChanged * @returns {Signal} diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h index 3d12f93113..2ea034d9fe 100644 --- a/interface/src/scripting/AudioDevices.h +++ b/interface/src/scripting/AudioDevices.h @@ -80,7 +80,7 @@ public: class AudioInputDeviceList : public AudioDeviceList { Q_OBJECT - Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable) + Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable CONSTANT) Q_PROPERTY(bool peakValuesEnabled READ peakValuesEnabled WRITE setPeakValuesEnabled NOTIFY peakValuesEnabledChanged) public: diff --git a/libraries/shared/src/shared/Camera.h b/libraries/shared/src/shared/Camera.h index f41183479c..0df83cfb9a 100644 --- a/libraries/shared/src/shared/Camera.h +++ b/libraries/shared/src/shared/Camera.h @@ -38,7 +38,7 @@ class Camera : public QObject { Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPosition) Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation) - Q_PROPERTY(QString mode READ getModeString WRITE setModeString) + Q_PROPERTY(QString mode READ getModeString WRITE setModeString NOTIFY modeUpdated) Q_PROPERTY(QVariantMap frustum READ getViewFrustum CONSTANT) public: From 9a75feecde35b4551bf53bb8fbe76326f187c085 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Thu, 6 Jun 2019 14:52:42 -0700 Subject: [PATCH 074/100] Fix binding to temporary transitionStage pointer --- libraries/render/src/render/DrawStatus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp index bdc27bd857..d010929e7a 100644 --- a/libraries/render/src/render/DrawStatus.cpp +++ b/libraries/render/src/render/DrawStatus.cpp @@ -149,7 +149,7 @@ void DrawStatus::run(const RenderContextPointer& renderContext, const Input& inp // We have a transition. Show this icon. status.setScale(1.0f); // Is this a valid transition ID according to FadeJob? - auto& transitionStage = scene->getStage(TransitionStage::getName()); + auto transitionStage = scene->getStage(TransitionStage::getName()); if (transitionStage) { if (transitionStage->isTransitionUsed(transitionID)) { // Valid, active transition From d2e9abd72c6cc270535f3f5e717ffaa93a912859 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Thu, 6 Jun 2019 15:01:54 -0700 Subject: [PATCH 075/100] Tweak limits; add comment --- tools/dissectors/1-hfudt.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua index eeda0c4d7e..00b71a341a 100644 --- a/tools/dissectors/1-hfudt.lua +++ b/tools/dissectors/1-hfudt.lua @@ -313,7 +313,10 @@ function p_hfudt.dissector(buf, pinfo, tree) -- check if we have part of a message that we need to re-assemble -- before it can be dissected - if message_bit == 1 and message_position ~= 0 and message_number < 50 and message_part_number < 10 then + -- limit array indices to prevent lock-up with arbitrary data + if message_bit == 1 and message_position ~= 0 and message_number < 100 + and message_part_number < 100 then + if fragments[message_number] == nil then fragments[message_number] = {} end From a7a765b025fe8b5bb9ad13a06deb345fd0b896c5 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Thu, 6 Jun 2019 16:23:54 -0700 Subject: [PATCH 076/100] added a couple more notifies and fixed a couple of jsdocs --- interface/src/avatar/MyAvatar.cpp | 876 +++++++++++++++--------------- interface/src/avatar/MyAvatar.h | 33 +- 2 files changed, 452 insertions(+), 457 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index f3172772ab..4cf12dc2d3 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,7 +83,8 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = + "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -92,7 +93,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -113,50 +114,33 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), - _yawSpeed(YAW_SPEED_DEFAULT), - _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), - _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), - _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), - _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", - DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), - _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), - _smoothOrientationInitial(), - _smoothOrientationTarget(), - _hmdSensorMatrix(), - _hmdSensorOrientation(), - _hmdSensorPosition(), - _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), - _goToPending(false), - _goToSafe(true), - _goToFeetAjustment(false), - _goToPosition(), - _goToOrientation(), - _prevShouldDrawHead(true), - _audioListenerMode(FROM_HEAD), + Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), + _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), + _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", + DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -172,17 +156,19 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" + << "size", + 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", + _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) -{ + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -203,7 +189,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -220,11 +206,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, - this, static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, + static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -287,7 +273,6 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { - setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -383,7 +368,8 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, + QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -446,7 +432,6 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; - } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -460,7 +445,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -497,7 +482,6 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { - assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -506,14 +490,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -540,8 +524,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -601,9 +585,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -612,8 +596,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { - + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && + getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -623,8 +607,10 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = + glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = + lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -642,7 +628,8 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = + lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -658,10 +645,9 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && - (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { - + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < + (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -677,20 +663,24 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = + transformVectorFast(getSensorToWorldMatrix(), + glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = + transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = + transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -700,7 +690,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -712,7 +702,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -720,7 +710,8 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < + DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -731,12 +722,13 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), + _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); simulate(deltaTime, true); @@ -744,23 +736,20 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if(didTeleport()) { + if (didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy,1.0f)); + currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { - _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { - const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { - float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -828,21 +817,20 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - updateChildCauterization(descendant, !_prevShouldDrawHead); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - objectsToUncauterize.insert(descendant); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); + cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -886,7 +874,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -967,8 +955,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && - glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -996,8 +983,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { - + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && + !(spine2Index < 0)) { glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -1009,8 +996,10 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && + (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), + glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1058,11 +1047,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { - // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = + createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1080,11 +1069,10 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } - } // Update avatar head rotation with sensor data @@ -1109,8 +1097,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && - (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { + if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1125,7 +1112,6 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. - Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1191,15 +1177,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), + Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1207,8 +1193,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), + Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1239,8 +1225,12 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, - float firstFrame, float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, + const QString& url, + float fps, + bool loop, + float firstFrame, + float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1259,9 +1249,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } } @@ -1278,10 +1268,12 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", QUuid()); + << QString::number(settingsIndex) << "id", + QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", QByteArray()); + << QString::number(settingsIndex) << "properties", + QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1299,10 +1291,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1472,16 +1464,12 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToDelete.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1506,9 +1494,7 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || - getID() == AVATAR_SELF_ID || - DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1554,7 +1540,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1582,9 +1568,7 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { - entityTree->deleteEntity(id); - }); + entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); } // ADD real entities @@ -1595,21 +1579,19 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { - removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); - }); + _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1679,7 +1661,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1743,9 +1725,7 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobs[id] = blob; - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); } } return true; @@ -1772,9 +1752,7 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { - result = _cachedAvatarEntityBlobs; - }); + _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); return result; } @@ -1875,7 +1853,9 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() + ? _avatarEntityForRecording.values()[entityCount++] + : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1905,7 +1885,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal { Settings::firstRun, true }; + Setting::Handle firstRunVal{ Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1931,7 +1911,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1959,7 +1939,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2029,10 +2009,9 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } - int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2046,8 +2025,12 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, - bool otherIsTalking, bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, + const glm::vec3& myPosition, + const glm::vec3& otherForward, + const glm::vec3& otherPosition, + bool otherIsTalking, + bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2055,7 +2038,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2067,11 +2050,8 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + - MY_ANGLE_FACTOR * myAngle + - OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + - LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2094,7 +2074,8 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = + lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2115,9 +2096,8 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { - // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2128,12 +2108,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2171,7 +2151,6 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { - // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2285,8 +2264,7 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", - Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2325,9 +2303,7 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointData(index, rotation, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2335,9 +2311,7 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointRotation(index, rotation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2345,9 +2319,7 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointTranslation(index, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); } void MyAvatar::clearJointData(const QString& name) { @@ -2355,9 +2327,7 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - clearJointData(index); - }); + writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); } void MyAvatar::clearJointsData() { @@ -2392,36 +2362,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, + [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = + _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); - saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() - && (entity->getParentID() == DependencyManager::get()->getSessionUUID() - || entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || + entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2445,9 +2415,7 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2473,9 +2441,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2500,7 +2466,6 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } - void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2509,11 +2474,8 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { - if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", - Q_ARG(const QUrl&, fullAvatarURL), - Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); return; } @@ -2567,7 +2529,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2576,7 +2538,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2586,7 +2548,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2608,7 +2570,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2618,7 +2580,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2626,14 +2588,15 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2653,7 +2616,8 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } } @@ -2758,8 +2722,7 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, - DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2800,21 +2763,18 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, const QString& jointName, - const glm::vec3& translation, const glm::quat& rotation, - float scale, bool isSoft, - bool allowDuplicates, bool useSaved) { +void MyAvatar::attach(const QString& modelURL, + const QString& jointName, + const glm::vec3& translation, + const glm::quat& rotation, + float scale, + bool isSoft, + 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 glm::quat&, rotation), - Q_ARG(float, scale), - Q_ARG(bool, isSoft), - Q_ARG(bool, allowDuplicates), - Q_ARG(bool, useSaved) - ); + BLOCKING_INVOKE_METHOD(this, "attach", 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), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); return; } AttachmentData data; @@ -2832,10 +2792,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2847,10 +2804,7 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2862,8 +2816,7 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", - Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2886,12 +2839,10 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2910,8 +2861,7 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", - Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2922,14 +2872,12 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -3030,7 +2978,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3063,18 +3011,16 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { - Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { - auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3082,7 +3028,8 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, + _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3103,13 +3050,15 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), + glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), + rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3126,14 +3075,9 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3144,7 +3088,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto &multiSphere = _multiSphereShapes[i]; + auto& multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3154,7 +3098,6 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { - // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3199,7 +3142,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3284,7 +3227,6 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { - // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3323,8 +3265,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { - + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && + _hmdRollControlEnabled && hasDriveInput()) { // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3332,7 +3274,6 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { - float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3379,8 +3320,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime - + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3390,20 +3331,15 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } - else if (absDriveKey > getDriveGear4()) { + } else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } - else if (absDriveKey > getDriveGear3()) { + } else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } - else if (absDriveKey > getDriveGear2()) { + } else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } - else if (absDriveKey > getDriveGear1()) { + } else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } - else { + } else { return sign * 0.0f; } } @@ -3435,8 +3371,10 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * + ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * + ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3458,7 +3396,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection(){ +glm::vec3 MyAvatar::calculateScaledDirection() { CharacterController::State state = _characterController.getState(); // compute action input @@ -3514,8 +3452,8 @@ glm::vec3 MyAvatar::calculateScaledDirection(){ void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) - && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = + (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3545,7 +3483,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3585,7 +3523,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3610,12 +3548,17 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, - const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, + float radiusA, + float heightA, + const glm::vec3 positionB, + float radiusB, + float heightB, + glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3677,9 +3620,7 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3823,16 +3764,18 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, + bool hasOrientation, + const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, - bool shouldFaceLocation, bool withSafeLanding) { - + bool hasOrientation, + const glm::quat& newOrientation, + bool shouldFaceLocation, + bool withSafeLanding) { // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3846,16 +3789,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " - << newPosition.y << ", " << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " + << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " - << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " + << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3874,7 +3817,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3900,29 +3843,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", + Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { - // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3934,21 +3877,26 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, + EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) - | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = + entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | + PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | + PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | + PickFilter::getBitMask( + PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3963,12 +3911,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3976,7 +3924,8 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = + 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3988,7 +3937,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -4003,19 +3952,18 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4099,7 +4047,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index){ +void MyAvatar::setControlSchemeIndex(int index) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4117,7 +4065,8 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4138,7 +4087,8 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4159,7 +4109,8 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4180,7 +4131,8 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4201,7 +4153,8 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4227,7 +4180,6 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4237,7 +4189,6 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4253,7 +4204,6 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4409,7 +4359,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4445,7 +4395,8 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), + glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4502,7 +4453,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass() {}; + JointMass(){}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4523,12 +4474,14 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4540,7 +4493,8 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4580,7 +4534,6 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { - glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4590,10 +4543,7 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), - glm::vec4(u, 0.0f), - glm::vec4(v, 0.0f), - glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4634,7 +4584,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4642,7 +4593,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = + computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4666,7 +4618,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4700,7 +4652,8 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for (auto recentModeReadingsIterator = _recentModeReadings.begin(); + recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4713,21 +4666,23 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); + float resetModeInCentimeters = + glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); - } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, + const controller::Pose& rightHand, + const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4765,7 +4720,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4788,7 +4743,8 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && + (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4838,7 +4794,6 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } - } float MyAvatar::getWalkBackwardSpeed() const { @@ -4855,7 +4810,6 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } - } bool MyAvatar::isReadyForPhysics() const { @@ -4865,8 +4819,7 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } - else { + } else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4890,7 +4843,6 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { - _userRecenterModel.set(modelName); switch (modelName) { @@ -4947,35 +4899,54 @@ void MyAvatar::setWalkSpeed(float value) { } void MyAvatar::setWalkBackwardSpeed(float value) { + bool changed = true; + float prevVal; switch (_controlSchemeIndex) { case LocomotionControlsMode::CONTROLS_DEFAULT: + prevVal = _defaultWalkBackwardSpeed.get(); _defaultWalkBackwardSpeed.set(value); break; case LocomotionControlsMode::CONTROLS_ANALOG: + prevVal = _analogWalkBackwardSpeed.get(); _analogWalkBackwardSpeed.set(value); break; case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: + prevVal = _analogPlusWalkBackwardSpeed.get(); _analogPlusWalkBackwardSpeed.set(value); break; default: + changed = false; break; } + + if (changed && prevVal != value) { + emit walkBackwardSpeedChanged(value); + } } void MyAvatar::setSprintSpeed(float value) { + bool changed = true; + float prevVal; switch (_controlSchemeIndex) { case LocomotionControlsMode::CONTROLS_DEFAULT: + prevVal = _defaultSprintSpeed.get(); _defaultSprintSpeed.set(value); break; case LocomotionControlsMode::CONTROLS_ANALOG: + prevVal = _analogSprintSpeed.get(); _analogSprintSpeed.set(value); break; case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: + prevVal = _analogPlusSprintSpeed.get(); _analogPlusSprintSpeed.set(value); break; default: break; } + + if (changed && prevVal != value) { + emit walkBackwardSpeedChanged(value); + } } float MyAvatar::getSprintSpeed() const { @@ -5014,7 +4985,7 @@ float MyAvatar::getAnalogSprintSpeed() const { void MyAvatar::setAnalogPlusWalkSpeed(float value) { _analogPlusWalkSpeed.set(value); - analogPlusWalkSpeedChanged(value); + emit analogPlusWalkSpeedChanged(value); // Sprint speed for Analog Plus should be double walk speed. _analogPlusSprintSpeed.set(value * 2.0f); } @@ -5025,6 +4996,7 @@ float MyAvatar::getAnalogPlusWalkSpeed() const { void MyAvatar::setAnalogPlusSprintSpeed(float value) { _analogPlusSprintSpeed.set(value); + emit analogPlusSprintSpeedChanged(value); } float MyAvatar::getAnalogPlusSprintSpeed() const { @@ -5112,7 +5084,6 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } - void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5170,13 +5141,17 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5207,7 +5182,6 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { - // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5220,8 +5194,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && - headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5233,13 +5206,15 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && - (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > + (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5251,7 +5226,9 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5282,11 +5259,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, bool hasDriveInput) { - - if (myAvatar.getHMDLeanRecenterEnabled() && - qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, + bool hasDriveInput) { + if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5301,7 +5278,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && + (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5338,7 +5316,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5347,8 +5325,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5376,7 +5354,8 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = + glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5444,7 +5423,8 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || + fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5460,7 +5440,6 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { - // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5487,7 +5466,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5516,15 +5495,13 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointRotationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5553,9 +5530,7 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointTranslationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } } } @@ -5564,12 +5539,15 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * + 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, + extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5738,7 +5716,6 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { - // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5774,26 +5751,24 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, - glm::vec3 positionalOffset, glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, + int parentJointIndex, + glm::vec3 positionalOffset, + glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || - parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || - parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), - targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, + rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5806,10 +5781,9 @@ const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler { false }; + bool tellHandler{ false }; _avatarGrabsLock.withWriteLock([&] { - std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5838,13 +5812,12 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", - Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto &flow = _skeletonModel->getRig().getFlow(); + auto& flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto &handJointName : HAND_COLLISION_JOINTS) { + for (auto& handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5872,18 +5845,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, + bool isCollidable, + const QVariantMap& physicsConfig, + const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", - Q_ARG(bool, isActive), - Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), - Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5892,7 +5865,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto &groupName : physicsGroups) { + for (auto& groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5922,7 +5895,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto &jointName : collisionJoints) { + for (auto& jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -5976,14 +5949,13 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", - Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -5993,17 +5965,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto &groups = flow.getGroupSettings(); - for (auto &joint : flow.getJoints()) { - auto &groupName = joint.second.getGroup(); + auto& groups = flow.getGroupSettings(); + for (auto& joint : flow.getJoints()) { + auto& groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto &group : groups) { + } + for (auto& group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -6018,8 +5990,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto &collisions = collisionSystem.getCollisions(); - for (auto &collision : collisions) { + auto& collisions = collisionSystem.getCollisions(); + for (auto& collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -6027,7 +5999,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto &thread : flow.getThreads()) { + for (auto& thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6044,14 +6016,13 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", - Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto &joint : flow.getJoints()) { + for (auto& joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6062,7 +6033,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto &flowData = _skeletonModel->getHFMModel().flowData; + auto& flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6080,4 +6051,3 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } - diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 7736eba7ea..1bd4f10944 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -371,9 +371,9 @@ class MyAvatar : public Avatar { Q_PROPERTY(float walkSpeed READ getWalkSpeed WRITE setWalkSpeed); Q_PROPERTY(float analogPlusWalkSpeed READ getAnalogPlusWalkSpeed WRITE setAnalogPlusWalkSpeed NOTIFY analogPlusWalkSpeedChanged); - Q_PROPERTY(float analogPlusSprintSpeed READ getAnalogPlusSprintSpeed WRITE setAnalogPlusSprintSpeed); - Q_PROPERTY(float walkBackwardSpeed READ getWalkBackwardSpeed WRITE setWalkBackwardSpeed); - Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed); + Q_PROPERTY(float analogPlusSprintSpeed READ getAnalogPlusSprintSpeed WRITE setAnalogPlusSprintSpeed NOTIFY analogPlusSprintSpeedChanged); + Q_PROPERTY(float walkBackwardSpeed READ getWalkBackwardSpeed WRITE setWalkBackwardSpeed NOTIFY walkBackwardSpeedChanged); + Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed NOTIFY sprintSpeedChanged); Q_PROPERTY(bool isInSittingState READ getIsInSittingState WRITE setIsInSittingState); Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel); Q_PROPERTY(bool isSitStandStateLocked READ getIsSitStandStateLocked WRITE setIsSitStandStateLocked); @@ -2162,12 +2162,37 @@ signals: void audioListenerModeChanged(); /**jsdoc - * Notifies when the analogPlusWalkSpeed value changed. + * Notifies when the analogPlusWalkSpeed value is changed. * @function MyAvatar.analogPlusWalkSpeedChanged + * @param {float} speed - the new avatar walk speed * @returns {Signal} */ void analogPlusWalkSpeedChanged(float value); + /**jsdoc + * Notifies when the analogPlusSprintSpeed value is changed. + * @function MyAvatar.analogPlusSprintSpeedChanged + * @param {float} speed - the new avatar sprint speed + * @returns {Signal} + */ + void analogPlusSprintSpeedChanged(float value); + + /**jsdoc + * Notifies when the sprintSpeed value is changed. + * @function MyAvatar.sprintSpeedChanged + * @param {float} speed - the new avatar sprint speed + * @returns {Signal} + */ + void sprintSpeedChanged(float value); + + /**jsdoc + * Notifies when the walkBackwardSpeed value is changed. + * @function MyAvatar.walkBackwardSpeedChanged + * @param {float} speed - the new avatar walk backward speed + * @returns {Signal} + */ + void walkBackwardSpeedChanged(float value); + /**jsdoc * @function MyAvatar.transformChanged * @returns {Signal} From 11b505f59fccc59aa536ee964bbf1ce3f246cc97 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 6 Jun 2019 16:40:39 -0700 Subject: [PATCH 077/100] Fix spurious error from prebuilt script --- prebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuild.py b/prebuild.py index 1fb96290b3..bd4c74bd64 100644 --- a/prebuild.py +++ b/prebuild.py @@ -114,7 +114,7 @@ def main(): args = parse_args() if args.ci_build: - logging.basicConfig(datefmt='%s', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO) + logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO) logger.info('sha=%s' % headSha()) logger.info('start') From 3bb645b2d78d9b6ed65d6270aecc331dc6cc587f Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 6 Jun 2019 17:17:18 -0700 Subject: [PATCH 078/100] put avatar spheres in r3 in simulation --- interface/src/avatar/OtherAvatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/OtherAvatar.cpp b/interface/src/avatar/OtherAvatar.cpp index 06dcd9767d..6f83c61cd6 100755 --- a/interface/src/avatar/OtherAvatar.cpp +++ b/interface/src/avatar/OtherAvatar.cpp @@ -219,7 +219,7 @@ bool OtherAvatar::isInPhysicsSimulation() const { } bool OtherAvatar::shouldBeInPhysicsSimulation() const { - return !isDead() && _workloadRegion < workload::Region::R3; + return !isDead() && _workloadRegion <= workload::Region::R3; } bool OtherAvatar::needsPhysicsUpdate() const { From ad1333b0d3a4ec36ec525e5fa62269ade220035d Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Fri, 7 Jun 2019 09:21:50 -0700 Subject: [PATCH 079/100] add review changes --- launchers/win32/LauncherDlg.cpp | 28 ++++++++++++++++------------ launchers/win32/LauncherUtils.cpp | 16 +++++++++------- launchers/win32/LauncherUtils.h | 16 +++++++++------- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp index 7751c9cd6b..d2d149348e 100644 --- a/launchers/win32/LauncherDlg.cpp +++ b/launchers/win32/LauncherDlg.cpp @@ -174,10 +174,10 @@ void CLauncherDlg::startProcess() { LauncherUtils::deleteDirectoriesOnThread(installDir, downloadDir, [&](int error) { LauncherUtils::DeleteDirError deleteError = (LauncherUtils::DeleteDirError)error; - if (error == LauncherUtils::DeleteDirError::NoErrorDeleting) { + switch(error) { + case LauncherUtils::DeleteDirError::NoErrorDeleting: theApp._manager.addToLog(_T("Install directory deleted.")); theApp._manager.addToLog(_T("Downloads directory deleted.")); - // CString interfaceExe = installPath += "\\interface.exe"; if (!theApp._manager.isLoggedIn()) { theApp._manager.addToLog(_T("Downloading Content")); theApp._manager.downloadContent(); @@ -185,14 +185,18 @@ void CLauncherDlg::startProcess() { theApp._manager.addToLog(_T("Downloading App")); theApp._manager.downloadApplication(); } - } - if (error == LauncherUtils::DeleteDirError::ErrorDeletingPath1 || - error == LauncherUtils::DeleteDirError::ErrorDeletingPaths) { - theApp._manager.addToLog(_T("Error deleting install directory.")); - } - if (error == LauncherUtils::DeleteDirError::ErrorDeletingPath2 || - error == LauncherUtils::DeleteDirError::ErrorDeletingPaths) { + break; + case LauncherUtils::DeleteDirError::ErrorDeletingBothDirs: + theApp._manager.addToLog(_T("Error deleting directories.")); + break; + case LauncherUtils::DeleteDirError::ErrorDeletingApplicationDir: + theApp._manager.addToLog(_T("Error deleting application directory.")); + break; + case LauncherUtils::DeleteDirError::ErrorDeletingDownloadsDir: theApp._manager.addToLog(_T("Error deleting downloads directory.")); + break; + default: + break; } }); } @@ -233,8 +237,8 @@ afx_msg void CLauncherDlg::OnNextClicked() { theApp._manager.addToLog(_T("Bad credentials. Try again")); setDrawDialog(DrawStep::DrawLoginErrorCred); } else { - theApp._manager.addToLog(_T("Error Reading or retreaving response.")); - MessageBox(L"Error Reading or retreaving response.", L"Network Error", MB_OK | MB_ICONERROR); + theApp._manager.addToLog(_T("Error Reading or retrieving response.")); + MessageBox(L"Error Reading or retrieving response.", L"Network Error", MB_OK | MB_ICONERROR); } } else { theApp._manager.addToLog(_T("Organization name does not exist.")); @@ -575,7 +579,7 @@ void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) { if (_showSplash) { if (_splashStep == 0){ if (theApp._manager.needsUninstall()) { - theApp._manager.addToLog(_T("Waiting to unistall")); + theApp._manager.addToLog(_T("Waiting to uninstall")); setDrawDialog(DrawStep::DrawProcessUninstall); } else { theApp._manager.addToLog(_T("Start splash screen")); diff --git a/launchers/win32/LauncherUtils.cpp b/launchers/win32/LauncherUtils.cpp index 8cf1d78ebf..22724ac499 100644 --- a/launchers/win32/LauncherUtils.cpp +++ b/launchers/win32/LauncherUtils.cpp @@ -395,11 +395,11 @@ DWORD WINAPI LauncherUtils::downloadThread(LPVOID lpParameter) DWORD WINAPI LauncherUtils::deleteDirectoriesThread(LPVOID lpParameter) { DeleteThreadData& data = *((DeleteThreadData*)lpParameter); DeleteDirError error = DeleteDirError::NoErrorDeleting; - if (!LauncherUtils::deleteFileOrDirectory(data._path1)) { - error = DeleteDirError::ErrorDeletingPath1; + if (!LauncherUtils::deleteFileOrDirectory(data._applicationDir)) { + error = DeleteDirError::ErrorDeletingApplicationDir; } - if (!LauncherUtils::deleteFileOrDirectory(data._path2)) { - error = error == NoError ? DeleteDirError::ErrorDeletingPath2 : DeleteDirError::ErrorDeletingPaths; + if (!LauncherUtils::deleteFileOrDirectory(data._downloadsDir)) { + error = error == NoError ? DeleteDirError::ErrorDeletingDownloadsDir : DeleteDirError::ErrorDeletingBothDirs; } data.callback(error); return 0; @@ -435,11 +435,13 @@ BOOL LauncherUtils::downloadFileOnThread(int type, const CString& url, const CSt return FALSE; } -BOOL LauncherUtils::deleteDirectoriesOnThread(const CString& dir1, const CString& dir2, std::function callback) { +BOOL LauncherUtils::deleteDirectoriesOnThread(const CString& applicationDir, + const CString& downloadsDir, + std::function callback) { DWORD myThreadID; DeleteThreadData* deleteThreadData = new DeleteThreadData(); - deleteThreadData->_path1 = dir1; - deleteThreadData->_path2 = dir2; + deleteThreadData->_applicationDir = applicationDir; + deleteThreadData->_downloadsDir = downloadsDir; deleteThreadData->setCallback(callback); HANDLE myHandle = CreateThread(0, 0, deleteDirectoriesThread, deleteThreadData, 0, &myThreadID); if (myHandle) { diff --git a/launchers/win32/LauncherUtils.h b/launchers/win32/LauncherUtils.h index 4add0fb931..47a8fc56c8 100644 --- a/launchers/win32/LauncherUtils.h +++ b/launchers/win32/LauncherUtils.h @@ -32,9 +32,9 @@ public: enum DeleteDirError { NoErrorDeleting = 0, - ErrorDeletingPath1, - ErrorDeletingPath2, - ErrorDeletingPaths + ErrorDeletingApplicationDir, + ErrorDeletingDownloadsDir, + ErrorDeletingBothDirs }; struct DownloadThreadData { @@ -60,8 +60,8 @@ public: }; struct DeleteThreadData { - CString _path1; - CString _path2; + CString _applicationDir; + CString _downloadsDir; std::function callback; void setCallback(std::function fn) { callback = std::bind(fn, std::placeholders::_1); } }; @@ -83,10 +83,12 @@ public: static BOOL deleteRegistryKey(const CString& registryPath); static BOOL unzipFileOnThread(int type, const std::string& zipFile, const std::string& path, std::function callback); static BOOL downloadFileOnThread(int type, const CString& url, const CString& file, std::function callback); - static BOOL deleteDirectoriesOnThread(const CString& dir1, const CString& dir2, std::function callback); + static BOOL deleteDirectoriesOnThread(const CString& applicationDir, + const CString& downloadsDir, + std::function callback); static CString urlEncodeString(const CString& url); - private: +private: // Threads static DWORD WINAPI unzipThread(LPVOID lpParameter); static DWORD WINAPI downloadThread(LPVOID lpParameter); From b1df463f56ddc96bbfba17006d229add5eb0af95 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Fri, 7 Jun 2019 10:16:36 -0700 Subject: [PATCH 080/100] disabling dde initialization due to random crashes while closing down the socket connection on mac --- interface/src/Application.cpp | 19 +++++++++++++++++-- interface/src/devices/DdeFaceTracker.h | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4a0bce5103..7efa17cb8c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -867,7 +867,11 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { DependencyManager::set(); DependencyManager::set(); DependencyManager::set(); + +#ifdef HAVE_DDE DependencyManager::set(); +#endif + DependencyManager::set(); DependencyManager::set(); DependencyManager::set(); @@ -3324,7 +3328,9 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance()); surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface); +#ifdef HAVE_DDE surfaceContext->setContextProperty("FaceTracker", DependencyManager::get().data()); +#endif surfaceContext->setContextProperty("AvatarManager", DependencyManager::get().data()); surfaceContext->setContextProperty("LODManager", DependencyManager::get().data()); surfaceContext->setContextProperty("HMD", DependencyManager::get().data()); @@ -5176,7 +5182,11 @@ ivec2 Application::getMouse() const { FaceTracker* Application::getActiveFaceTracker() { auto dde = DependencyManager::get(); - return dde->isActive() ? static_cast(dde.data()) : nullptr; + if(dde){ + return dde->isActive() ? static_cast(dde.data()) : nullptr; + }else{ + return nullptr; + } } FaceTracker* Application::getSelectedFaceTracker() { @@ -7010,7 +7020,10 @@ void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const { // feature. However, we still use this to reset face trackers, eye trackers, audio and to optionally re-load the avatar // rig and animations from scratch. void Application::resetSensors(bool andReload) { +#ifdef HAVE_DDE DependencyManager::get()->reset(); +#endif + DependencyManager::get()->reset(); _overlayConductor.centerUI(); getActiveDisplayPlugin()->resetSensors(); @@ -7402,8 +7415,10 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance()); qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); +#ifdef HAVE_DDE scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get().data()); - +#endif + scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get().data()); scriptEngine->registerGlobalObject("LODManager", DependencyManager::get().data()); diff --git a/interface/src/devices/DdeFaceTracker.h b/interface/src/devices/DdeFaceTracker.h index 0ad8d85c62..dc451134f0 100644 --- a/interface/src/devices/DdeFaceTracker.h +++ b/interface/src/devices/DdeFaceTracker.h @@ -14,8 +14,9 @@ #include +//Disabling dde due to random crashes with closing the socket on macos. all the accompanying code is wrapped with the ifdef HAVE_DDE. uncomment the define below to enable #if defined(Q_OS_WIN) || defined(Q_OS_OSX) - #define HAVE_DDE + //#define HAVE_DDE #endif #include From 54906a270e29d87b58cccc7fbf7504558a3342e9 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 7 Jun 2019 10:31:48 -0700 Subject: [PATCH 081/100] don't hang if somehow setting display plugin to the current one --- .../src/display-plugins/OpenGLDisplayPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index bb94195f85..6c6c2aee80 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -170,9 +170,9 @@ public: glFinish(); } currentPlugin = newPlugin; - _newPluginQueue.pop(); - _condition.notify_one(); } + _newPluginQueue.pop(); + _condition.notify_one(); } } From 3ab4be6b8d7f0887adbc5ba4db3848b21ccf02e7 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 10:42:31 -0700 Subject: [PATCH 082/100] I got clanged --- interface/src/avatar/MyAvatar.cpp | 854 ++++++++++++++++-------------- 1 file changed, 452 insertions(+), 402 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 4cf12dc2d3..92a88cac38 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,8 +83,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = - "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -93,7 +92,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -114,33 +113,50 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), - _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), - _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), + Avatar(thread), + _yawSpeed(YAW_SPEED_DEFAULT), + _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), + _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), + _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), + _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", + DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), + _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), + _smoothOrientationInitial(), + _smoothOrientationTarget(), + _hmdSensorMatrix(), + _hmdSensorOrientation(), + _hmdSensorPosition(), + _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), + _goToPending(false), + _goToSafe(true), + _goToFeetAjustment(false), + _goToPosition(), + _goToOrientation(), + _prevShouldDrawHead(true), + _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", - DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -156,19 +172,17 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << "size", - 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", - _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) +{ _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -189,7 +203,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -206,11 +220,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, - static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, + this, static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -273,6 +287,7 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { + setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -368,8 +383,7 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, - QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -432,6 +446,7 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; + } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -445,7 +460,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -482,6 +497,7 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { + assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -490,14 +506,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -524,8 +540,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -585,9 +601,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -596,8 +612,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && - getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -607,10 +623,8 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = - glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = - lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -628,8 +642,7 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = - lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -645,9 +658,10 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < - (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && + (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -663,24 +677,20 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = - transformVectorFast(getSensorToWorldMatrix(), - glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = - transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = - transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -690,7 +700,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -702,7 +712,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -710,8 +720,7 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < - DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -722,13 +731,12 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), - _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); simulate(deltaTime, true); @@ -736,20 +744,23 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if (didTeleport()) { + if(didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); + currentEnergy = max(0.0f, min(currentEnergy,1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { + _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { + const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { + float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -817,20 +828,21 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + updateChildCauterization(descendant, !_prevShouldDrawHead); + }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + objectsToUncauterize.insert(descendant); + }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); - cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -874,7 +886,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -955,7 +967,8 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && + glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -983,8 +996,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && - !(spine2Index < 0)) { + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { + glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -996,10 +1009,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && - (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), - glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1047,11 +1058,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { + // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = - createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1069,10 +1080,11 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } + } // Update avatar head rotation with sensor data @@ -1097,7 +1109,8 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { + if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && + (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1112,6 +1125,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. + Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1177,15 +1191,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), - Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1193,8 +1207,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), - Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1225,12 +1239,8 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, - const QString& url, - float fps, - bool loop, - float firstFrame, - float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, + float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1249,9 +1259,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } } @@ -1268,12 +1278,10 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", - QUuid()); + << QString::number(settingsIndex) << "id", QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", - QByteArray()); + << QString::number(settingsIndex) << "properties", QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1291,10 +1299,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1464,12 +1472,16 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); + }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToDelete.push_back(entityID); + }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1494,7 +1506,9 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || + getID() == AVATAR_SELF_ID || + DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1540,7 +1554,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1568,7 +1582,9 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); + entityTree->withWriteLock([&] { + entityTree->deleteEntity(id); + }); } // ADD real entities @@ -1579,19 +1595,21 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); + _avatarEntitiesLock.withWriteLock([&] { + removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); + }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1661,7 +1679,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1725,7 +1743,9 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobs[id] = blob; + }); } } return true; @@ -1752,7 +1772,9 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); + _avatarEntitiesLock.withReadLock([&] { + result = _cachedAvatarEntityBlobs; + }); return result; } @@ -1853,9 +1875,7 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() - ? _avatarEntityForRecording.values()[entityCount++] - : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1885,7 +1905,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal{ Settings::firstRun, true }; + Setting::Handle firstRunVal { Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1911,7 +1931,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1939,7 +1959,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2009,9 +2029,10 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } + int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2025,12 +2046,8 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, - const glm::vec3& myPosition, - const glm::vec3& otherForward, - const glm::vec3& otherPosition, - bool otherIsTalking, - bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, + bool otherIsTalking, bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2038,7 +2055,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2050,8 +2067,11 @@ static float lookAtCostFunction(const glm::vec3& myForward, if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + + MY_ANGLE_FACTOR * myAngle + + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2074,8 +2094,7 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = - lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2096,8 +2115,9 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { + // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2108,12 +2128,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2151,6 +2171,7 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { + // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2264,7 +2285,8 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", + Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2303,7 +2325,9 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointData(index, rotation, translation); + }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2311,7 +2335,9 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointRotation(index, rotation); + }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2319,7 +2345,9 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointTranslation(index, translation); + }); } void MyAvatar::clearJointData(const QString& name) { @@ -2327,7 +2355,9 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); + writeLockWithNamedJointIndex(name, [&](int index) { + clearJointData(index); + }); } void MyAvatar::clearJointsData() { @@ -2362,36 +2392,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, - [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = - _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); + saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || - entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() + && (entity->getParentID() == DependencyManager::get()->getSessionUUID() + || entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2415,7 +2445,9 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2441,7 +2473,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2466,6 +2500,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } + void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2474,8 +2509,11 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { + if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", + Q_ARG(const QUrl&, fullAvatarURL), + Q_ARG(const QString&, modelName)); return; } @@ -2529,7 +2567,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2538,7 +2576,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2548,7 +2586,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2570,7 +2608,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2580,7 +2618,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2588,15 +2626,14 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2616,8 +2653,7 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } } @@ -2722,7 +2758,8 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, + DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2763,18 +2800,21 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, - const QString& jointName, - const glm::vec3& translation, - const glm::quat& rotation, - float scale, - bool isSoft, - bool allowDuplicates, - bool useSaved) { +void MyAvatar::attach(const QString& modelURL, const QString& jointName, + const glm::vec3& translation, const glm::quat& rotation, + float scale, bool isSoft, + 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 glm::quat&, rotation), Q_ARG(float, scale), - Q_ARG(bool, isSoft), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); + BLOCKING_INVOKE_METHOD(this, "attach", + 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), + Q_ARG(bool, allowDuplicates), + Q_ARG(bool, useSaved) + ); return; } AttachmentData data; @@ -2792,7 +2832,10 @@ void MyAvatar::attach(const QString& modelURL, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachOne", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2804,7 +2847,10 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachAll", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2816,7 +2862,8 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", + Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2839,10 +2886,12 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2861,7 +2910,8 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", + Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2872,12 +2922,14 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -2978,7 +3030,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3011,16 +3063,18 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { + Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { + auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3028,8 +3082,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, - _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3050,15 +3103,13 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), - glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), - rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3075,9 +3126,14 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), + glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3088,7 +3144,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto& multiSphere = _multiSphereShapes[i]; + auto &multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3098,6 +3154,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { + // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3142,7 +3199,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3227,6 +3284,7 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { + // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3265,8 +3323,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && - _hmdRollControlEnabled && hasDriveInput()) { + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { + // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3274,6 +3332,7 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { + float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3320,8 +3379,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + - getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3331,15 +3390,20 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } else if (absDriveKey > getDriveGear4()) { + } + else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } else if (absDriveKey > getDriveGear3()) { + } + else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } else if (absDriveKey > getDriveGear2()) { + } + else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } else if (absDriveKey > getDriveGear1()) { + } + else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } else { + } + else { return sign * 0.0f; } } @@ -3371,10 +3435,8 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * - ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * - ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3396,7 +3458,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection() { +glm::vec3 MyAvatar::calculateScaledDirection(){ CharacterController::State state = _characterController.getState(); // compute action input @@ -3452,8 +3514,8 @@ glm::vec3 MyAvatar::calculateScaledDirection() { void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = - (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) + && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3483,7 +3545,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3523,7 +3585,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3548,17 +3610,12 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, - float radiusA, - float heightA, - const glm::vec3 positionB, - float radiusB, - float heightB, - glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, + const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3620,7 +3677,9 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3764,18 +3823,16 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, + bool hasOrientation, const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, - bool shouldFaceLocation, - bool withSafeLanding) { + bool hasOrientation, const glm::quat& newOrientation, + bool shouldFaceLocation, bool withSafeLanding) { + // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3789,16 +3846,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " - << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " + << newPosition.y << ", " << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " - << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " + << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3817,7 +3874,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3843,29 +3900,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", - Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { + // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3877,26 +3934,21 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, - EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = - entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | - PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | - PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | - PickFilter::getBitMask( - PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) + | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3911,12 +3963,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3924,8 +3976,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = - 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3937,7 +3988,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -3952,18 +4003,19 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4047,7 +4099,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index) { +void MyAvatar::setControlSchemeIndex(int index){ if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4065,8 +4117,7 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4087,8 +4138,7 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4109,8 +4159,7 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4131,8 +4180,7 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4153,8 +4201,7 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4180,6 +4227,7 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4189,6 +4237,7 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4204,6 +4253,7 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4359,7 +4409,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4395,8 +4445,7 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), - glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4453,7 +4502,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass(){}; + JointMass() {}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4474,14 +4523,12 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4493,8 +4540,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + - (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4534,6 +4580,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { + glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4543,7 +4590,10 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), + glm::vec4(u, 0.0f), + glm::vec4(v, 0.0f), + glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4584,8 +4634,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4593,8 +4642,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = - computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4618,7 +4666,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4652,8 +4700,7 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for (auto recentModeReadingsIterator = _recentModeReadings.begin(); - recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4666,23 +4713,21 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = - glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); + float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); + } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, - const controller::Pose& rightHand, - const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4720,7 +4765,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4743,8 +4788,7 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && - (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4794,6 +4838,7 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } + } float MyAvatar::getWalkBackwardSpeed() const { @@ -4810,6 +4855,7 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } + } bool MyAvatar::isReadyForPhysics() const { @@ -4819,7 +4865,8 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } else { + } + else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4843,6 +4890,7 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { + _userRecenterModel.set(modelName); switch (modelName) { @@ -5084,6 +5132,7 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } + void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5141,17 +5190,13 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5182,6 +5227,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { + // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5194,7 +5240,8 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && + headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5206,15 +5253,13 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > - (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && + (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5226,9 +5271,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5259,11 +5302,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, - bool hasDriveInput) { - if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, bool hasDriveInput) { + + if (myAvatar.getHMDLeanRecenterEnabled() && + qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5278,8 +5321,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && - (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5316,7 +5358,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5325,8 +5367,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5354,8 +5396,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = - glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5423,8 +5464,7 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || - fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5440,6 +5480,7 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { + // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5466,7 +5507,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5495,13 +5536,15 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointRotationInObjectFrame(index); + } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5530,7 +5573,9 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointTranslationInObjectFrame(index); + } } } @@ -5539,15 +5584,12 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + - getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * - 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, - extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5716,6 +5758,7 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { + // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5751,24 +5794,26 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, - int parentJointIndex, - glm::vec3 positionalOffset, - glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, + glm::vec3 positionalOffset, glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || + parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || + parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, - rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), + targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5781,9 +5826,10 @@ const QUuid MyAvatar::grab(const QUuid& targetID, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler{ false }; + bool tellHandler { false }; _avatarGrabsLock.withWriteLock([&] { + std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5812,12 +5858,13 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", + Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto& flow = _skeletonModel->getRig().getFlow(); + auto &flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto& handJointName : HAND_COLLISION_JOINTS) { + for (auto &handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5845,18 +5892,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, - bool isCollidable, - const QVariantMap& physicsConfig, - const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", + Q_ARG(bool, isActive), + Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), + Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5865,7 +5912,7 @@ void MyAvatar::useFlow(bool isActive, collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto& groupName : physicsGroups) { + for (auto &groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5895,7 +5942,7 @@ void MyAvatar::useFlow(bool isActive, auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto& jointName : collisionJoints) { + for (auto &jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -5949,13 +5996,14 @@ void MyAvatar::useFlow(bool isActive, QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", + Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -5965,17 +6013,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto& groups = flow.getGroupSettings(); - for (auto& joint : flow.getJoints()) { - auto& groupName = joint.second.getGroup(); + auto &groups = flow.getGroupSettings(); + for (auto &joint : flow.getJoints()) { + auto &groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto& group : groups) { + } + for (auto &group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -5990,8 +6038,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto& collisions = collisionSystem.getCollisions(); - for (auto& collision : collisions) { + auto &collisions = collisionSystem.getCollisions(); + for (auto &collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -5999,7 +6047,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto& thread : flow.getThreads()) { + for (auto &thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6016,13 +6064,14 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", + Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto& joint : flow.getJoints()) { + for (auto &joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6033,7 +6082,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto& flowData = _skeletonModel->getHFMModel().flowData; + auto &flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6051,3 +6100,4 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } + From e63d98e1374d3c3a6b38ebef1ab29a8a880c8af1 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 11:09:21 -0700 Subject: [PATCH 083/100] fixed a couple of doc errors and accounted for some edge cases --- interface/src/avatar/MyAvatar.cpp | 874 ++++++++++++++---------------- interface/src/avatar/MyAvatar.h | 8 +- 2 files changed, 418 insertions(+), 464 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 92a88cac38..3f921fd469 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,7 +83,8 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = + "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -92,7 +93,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -113,50 +114,33 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), - _yawSpeed(YAW_SPEED_DEFAULT), - _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), - _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), - _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), - _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", - DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), - _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), - _smoothOrientationInitial(), - _smoothOrientationTarget(), - _hmdSensorMatrix(), - _hmdSensorOrientation(), - _hmdSensorPosition(), - _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), - _goToPending(false), - _goToSafe(true), - _goToFeetAjustment(false), - _goToPosition(), - _goToOrientation(), - _prevShouldDrawHead(true), - _audioListenerMode(FROM_HEAD), + Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), + _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), + _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", + DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -172,17 +156,19 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" + << "size", + 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", + _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) -{ + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -203,7 +189,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -220,11 +206,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, - this, static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, + static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -287,7 +273,6 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { - setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -383,7 +368,8 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, + QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -446,7 +432,6 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; - } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -460,7 +445,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -497,7 +482,6 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { - assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -506,14 +490,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -540,8 +524,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -601,9 +585,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -612,8 +596,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { - + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && + getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -623,8 +607,10 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = + glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = + lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -642,7 +628,8 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = + lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -658,10 +645,9 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && - (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { - + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < + (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -677,20 +663,24 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = + transformVectorFast(getSensorToWorldMatrix(), + glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = + transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = + transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -700,7 +690,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -712,7 +702,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -720,7 +710,8 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < + DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -731,12 +722,13 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), + _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); simulate(deltaTime, true); @@ -744,23 +736,20 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if(didTeleport()) { + if (didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy,1.0f)); + currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { - _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { - const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { - float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -828,21 +817,20 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - updateChildCauterization(descendant, !_prevShouldDrawHead); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - objectsToUncauterize.insert(descendant); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); + cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -886,7 +874,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -967,8 +955,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && - glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -996,8 +983,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { - + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && + !(spine2Index < 0)) { glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -1009,8 +996,10 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && + (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), + glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1058,11 +1047,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { - // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = + createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1080,11 +1069,10 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } - } // Update avatar head rotation with sensor data @@ -1109,8 +1097,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && - (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { + if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1125,7 +1112,6 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. - Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1191,15 +1177,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), + Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1207,8 +1193,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), + Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1239,8 +1225,12 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, - float firstFrame, float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, + const QString& url, + float fps, + bool loop, + float firstFrame, + float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1259,9 +1249,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } } @@ -1278,10 +1268,12 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", QUuid()); + << QString::number(settingsIndex) << "id", + QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", QByteArray()); + << QString::number(settingsIndex) << "properties", + QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1299,10 +1291,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1472,16 +1464,12 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToDelete.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1506,9 +1494,7 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || - getID() == AVATAR_SELF_ID || - DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1554,7 +1540,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1582,9 +1568,7 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { - entityTree->deleteEntity(id); - }); + entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); } // ADD real entities @@ -1595,21 +1579,19 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { - removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); - }); + _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1679,7 +1661,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1743,9 +1725,7 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobs[id] = blob; - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); } } return true; @@ -1772,9 +1752,7 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { - result = _cachedAvatarEntityBlobs; - }); + _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); return result; } @@ -1875,7 +1853,9 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() + ? _avatarEntityForRecording.values()[entityCount++] + : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1905,7 +1885,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal { Settings::firstRun, true }; + Setting::Handle firstRunVal{ Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1931,7 +1911,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1959,7 +1939,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2029,10 +2009,9 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } - int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2046,8 +2025,12 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, - bool otherIsTalking, bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, + const glm::vec3& myPosition, + const glm::vec3& otherForward, + const glm::vec3& otherPosition, + bool otherIsTalking, + bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2055,7 +2038,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2067,11 +2050,8 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + - MY_ANGLE_FACTOR * myAngle + - OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + - LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2094,7 +2074,8 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = + lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2115,9 +2096,8 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { - // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2128,12 +2108,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2171,7 +2151,6 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { - // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2285,8 +2264,7 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", - Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2325,9 +2303,7 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointData(index, rotation, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2335,9 +2311,7 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointRotation(index, rotation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2345,9 +2319,7 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointTranslation(index, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); } void MyAvatar::clearJointData(const QString& name) { @@ -2355,9 +2327,7 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - clearJointData(index); - }); + writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); } void MyAvatar::clearJointsData() { @@ -2392,36 +2362,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, + [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = + _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); - saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() - && (entity->getParentID() == DependencyManager::get()->getSessionUUID() - || entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || + entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2445,9 +2415,7 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2473,9 +2441,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2500,7 +2466,6 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } - void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2509,11 +2474,8 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { - if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", - Q_ARG(const QUrl&, fullAvatarURL), - Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); return; } @@ -2567,7 +2529,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2576,7 +2538,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2586,7 +2548,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2608,7 +2570,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2618,7 +2580,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2626,14 +2588,15 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2653,7 +2616,8 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } } @@ -2758,8 +2722,7 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, - DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2800,21 +2763,18 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, const QString& jointName, - const glm::vec3& translation, const glm::quat& rotation, - float scale, bool isSoft, - bool allowDuplicates, bool useSaved) { +void MyAvatar::attach(const QString& modelURL, + const QString& jointName, + const glm::vec3& translation, + const glm::quat& rotation, + float scale, + bool isSoft, + 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 glm::quat&, rotation), - Q_ARG(float, scale), - Q_ARG(bool, isSoft), - Q_ARG(bool, allowDuplicates), - Q_ARG(bool, useSaved) - ); + BLOCKING_INVOKE_METHOD(this, "attach", 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), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); return; } AttachmentData data; @@ -2832,10 +2792,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2847,10 +2804,7 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2862,8 +2816,7 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", - Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2886,12 +2839,10 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2910,8 +2861,7 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", - Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2922,14 +2872,12 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -3030,7 +2978,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3063,18 +3011,16 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { - Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { - auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3082,7 +3028,8 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, + _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3103,13 +3050,15 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), + glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), + rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3126,14 +3075,9 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3144,7 +3088,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto &multiSphere = _multiSphereShapes[i]; + auto& multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3154,7 +3098,6 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { - // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3199,7 +3142,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3284,7 +3227,6 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { - // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3323,8 +3265,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { - + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && + _hmdRollControlEnabled && hasDriveInput()) { // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3332,7 +3274,6 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { - float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3379,8 +3320,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime - + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3390,20 +3331,15 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } - else if (absDriveKey > getDriveGear4()) { + } else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } - else if (absDriveKey > getDriveGear3()) { + } else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } - else if (absDriveKey > getDriveGear2()) { + } else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } - else if (absDriveKey > getDriveGear1()) { + } else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } - else { + } else { return sign * 0.0f; } } @@ -3435,8 +3371,10 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * + ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * + ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3458,7 +3396,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection(){ +glm::vec3 MyAvatar::calculateScaledDirection() { CharacterController::State state = _characterController.getState(); // compute action input @@ -3514,8 +3452,8 @@ glm::vec3 MyAvatar::calculateScaledDirection(){ void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) - && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = + (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3545,7 +3483,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3585,7 +3523,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3610,12 +3548,17 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, - const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, + float radiusA, + float heightA, + const glm::vec3 positionB, + float radiusB, + float heightB, + glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3677,9 +3620,7 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3823,16 +3764,18 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, + bool hasOrientation, + const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, - bool shouldFaceLocation, bool withSafeLanding) { - + bool hasOrientation, + const glm::quat& newOrientation, + bool shouldFaceLocation, + bool withSafeLanding) { // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3846,16 +3789,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " - << newPosition.y << ", " << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " + << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " - << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " + << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3874,7 +3817,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3900,29 +3843,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", + Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { - // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3934,21 +3877,26 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, + EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) - | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = + entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | + PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | + PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | + PickFilter::getBitMask( + PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3963,12 +3911,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3976,7 +3924,8 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = + 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3988,7 +3937,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -4003,19 +3952,18 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4099,7 +4047,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index){ +void MyAvatar::setControlSchemeIndex(int index) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4117,7 +4065,8 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4138,7 +4087,8 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4159,7 +4109,8 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4180,7 +4131,8 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4201,7 +4153,8 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4227,7 +4180,6 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4237,7 +4189,6 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4253,7 +4204,6 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4409,7 +4359,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4445,7 +4395,8 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), + glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4502,7 +4453,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass() {}; + JointMass(){}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4523,12 +4474,14 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4540,7 +4493,8 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4580,7 +4534,6 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { - glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4590,10 +4543,7 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), - glm::vec4(u, 0.0f), - glm::vec4(v, 0.0f), - glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4634,7 +4584,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4642,7 +4593,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = + computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4666,7 +4618,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4700,7 +4652,8 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for (auto recentModeReadingsIterator = _recentModeReadings.begin(); + recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4713,21 +4666,23 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); + float resetModeInCentimeters = + glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); - } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, + const controller::Pose& rightHand, + const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4765,7 +4720,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4788,7 +4743,8 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && + (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4838,7 +4794,6 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } - } float MyAvatar::getWalkBackwardSpeed() const { @@ -4855,7 +4810,6 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } - } bool MyAvatar::isReadyForPhysics() const { @@ -4865,8 +4819,7 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } - else { + } else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4890,7 +4843,6 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { - _userRecenterModel.set(modelName); switch (modelName) { @@ -4966,7 +4918,7 @@ void MyAvatar::setWalkBackwardSpeed(float value) { changed = false; break; } - + if (changed && prevVal != value) { emit walkBackwardSpeedChanged(value); } @@ -4993,7 +4945,7 @@ void MyAvatar::setSprintSpeed(float value) { } if (changed && prevVal != value) { - emit walkBackwardSpeedChanged(value); + emit analogPlusSprintSpeedChanged(value); } } @@ -5032,10 +4984,12 @@ float MyAvatar::getAnalogSprintSpeed() const { } void MyAvatar::setAnalogPlusWalkSpeed(float value) { - _analogPlusWalkSpeed.set(value); - emit analogPlusWalkSpeedChanged(value); - // Sprint speed for Analog Plus should be double walk speed. - _analogPlusSprintSpeed.set(value * 2.0f); + if (_analogPlusWalkSpeed.get() != value) { + _analogPlusWalkSpeed.set(value); + emit analogPlusWalkSpeedChanged(value); + // Sprint speed for Analog Plus should be double walk speed. + _analogPlusSprintSpeed.set(value * 2.0f); + } } float MyAvatar::getAnalogPlusWalkSpeed() const { @@ -5043,8 +4997,10 @@ float MyAvatar::getAnalogPlusWalkSpeed() const { } void MyAvatar::setAnalogPlusSprintSpeed(float value) { - _analogPlusSprintSpeed.set(value); - emit analogPlusSprintSpeedChanged(value); + if (_analogPlusSprintSpeed.get() != value) { + _analogPlusSprintSpeed.set(value); + emit analogPlusSprintSpeedChanged(value); + } } float MyAvatar::getAnalogPlusSprintSpeed() const { @@ -5132,7 +5088,6 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } - void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5190,13 +5145,17 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5227,7 +5186,6 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { - // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5240,8 +5198,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && - headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5253,13 +5210,15 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && - (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > + (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5271,7 +5230,9 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5302,11 +5263,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, bool hasDriveInput) { - - if (myAvatar.getHMDLeanRecenterEnabled() && - qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, + bool hasDriveInput) { + if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5321,7 +5282,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && + (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5358,7 +5320,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5367,8 +5329,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5396,7 +5358,8 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = + glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5464,7 +5427,8 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || + fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5480,7 +5444,6 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { - // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5507,7 +5470,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5536,15 +5499,13 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointRotationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5573,9 +5534,7 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointTranslationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } } } @@ -5584,12 +5543,15 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * + 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, + extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5758,7 +5720,6 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { - // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5794,26 +5755,24 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, - glm::vec3 positionalOffset, glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, + int parentJointIndex, + glm::vec3 positionalOffset, + glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || - parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || - parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), - targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, + rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5826,10 +5785,9 @@ const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler { false }; + bool tellHandler{ false }; _avatarGrabsLock.withWriteLock([&] { - std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5858,13 +5816,12 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", - Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto &flow = _skeletonModel->getRig().getFlow(); + auto& flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto &handJointName : HAND_COLLISION_JOINTS) { + for (auto& handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5892,18 +5849,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, + bool isCollidable, + const QVariantMap& physicsConfig, + const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", - Q_ARG(bool, isActive), - Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), - Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5912,7 +5869,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto &groupName : physicsGroups) { + for (auto& groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5942,7 +5899,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto &jointName : collisionJoints) { + for (auto& jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -5996,14 +5953,13 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", - Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -6013,17 +5969,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto &groups = flow.getGroupSettings(); - for (auto &joint : flow.getJoints()) { - auto &groupName = joint.second.getGroup(); + auto& groups = flow.getGroupSettings(); + for (auto& joint : flow.getJoints()) { + auto& groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto &group : groups) { + } + for (auto& group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -6038,8 +5994,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto &collisions = collisionSystem.getCollisions(); - for (auto &collision : collisions) { + auto& collisions = collisionSystem.getCollisions(); + for (auto& collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -6047,7 +6003,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto &thread : flow.getThreads()) { + for (auto& thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6064,14 +6020,13 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", - Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto &joint : flow.getJoints()) { + for (auto& joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6082,7 +6037,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto &flowData = _skeletonModel->getHFMModel().flowData; + auto& flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6100,4 +6055,3 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } - diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 1bd4f10944..e87aa87bd1 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -2164,7 +2164,7 @@ signals: /**jsdoc * Notifies when the analogPlusWalkSpeed value is changed. * @function MyAvatar.analogPlusWalkSpeedChanged - * @param {float} speed - the new avatar walk speed + * @param {float} value - the new avatar walk speed * @returns {Signal} */ void analogPlusWalkSpeedChanged(float value); @@ -2172,7 +2172,7 @@ signals: /**jsdoc * Notifies when the analogPlusSprintSpeed value is changed. * @function MyAvatar.analogPlusSprintSpeedChanged - * @param {float} speed - the new avatar sprint speed + * @param {float} value - the new avatar sprint speed * @returns {Signal} */ void analogPlusSprintSpeedChanged(float value); @@ -2180,7 +2180,7 @@ signals: /**jsdoc * Notifies when the sprintSpeed value is changed. * @function MyAvatar.sprintSpeedChanged - * @param {float} speed - the new avatar sprint speed + * @param {float} value - the new avatar sprint speed * @returns {Signal} */ void sprintSpeedChanged(float value); @@ -2188,7 +2188,7 @@ signals: /**jsdoc * Notifies when the walkBackwardSpeed value is changed. * @function MyAvatar.walkBackwardSpeedChanged - * @param {float} speed - the new avatar walk backward speed + * @param {float} value - the new avatar walk backward speed * @returns {Signal} */ void walkBackwardSpeedChanged(float value); From 21966fe3452e6b68ec6203452cbb6441dce3660d Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 7 Jun 2019 11:14:07 -0700 Subject: [PATCH 084/100] Fix stuck transition due to removing sub render items before parent --- libraries/render/src/render/Scene.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp index c516a833de..bea111edb5 100644 --- a/libraries/render/src/render/Scene.cpp +++ b/libraries/render/src/render/Scene.cpp @@ -558,14 +558,20 @@ void Scene::removeItemTransition(ItemID itemId) { auto& item = _items[itemId]; TransitionStage::Index transitionId = item.getTransitionId(); if (!render::TransitionStage::isIndexInvalid(transitionId)) { - auto finishedOperators = _transitionFinishedOperatorMap[transitionId]; - for (auto finishedOperator : finishedOperators) { - if (finishedOperator) { - finishedOperator(); + const auto& transition = transitionStage->getTransition(transitionId); + const auto transitionOwner = transition.itemId; + if (transitionOwner == itemId) { + // No more items will be using this transition. Clean it up. + auto finishedOperators = _transitionFinishedOperatorMap[transitionId]; + for (auto finishedOperator : finishedOperators) { + if (finishedOperator) { + finishedOperator(); + } } + _transitionFinishedOperatorMap.erase(transitionId); + transitionStage->removeTransition(transitionId); } - _transitionFinishedOperatorMap.erase(transitionId); - transitionStage->removeTransition(transitionId); + setItemTransition(itemId, render::TransitionStage::INVALID_INDEX); } } From ad562b8f9176ec630d338fa6ec8749949d871e3e Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 11:22:11 -0700 Subject: [PATCH 085/100] really need to stop clanging myself --- interface/src/avatar/MyAvatar.cpp | 856 ++++++++++++++++-------------- 1 file changed, 453 insertions(+), 403 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 3f921fd469..b60bfd3f29 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,8 +83,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = - "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -93,7 +92,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -114,33 +113,50 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), - _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), - _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), + Avatar(thread), + _yawSpeed(YAW_SPEED_DEFAULT), + _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), + _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), + _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), + _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", + DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), + _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), + _smoothOrientationInitial(), + _smoothOrientationTarget(), + _hmdSensorMatrix(), + _hmdSensorOrientation(), + _hmdSensorPosition(), + _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), + _goToPending(false), + _goToSafe(true), + _goToFeetAjustment(false), + _goToPosition(), + _goToOrientation(), + _prevShouldDrawHead(true), + _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", - DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -156,19 +172,17 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << "size", - 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", - _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) +{ _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -189,7 +203,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -206,11 +220,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, - static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, + this, static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -273,6 +287,7 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { + setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -368,8 +383,7 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, - QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -432,6 +446,7 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; + } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -445,7 +460,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -482,6 +497,7 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { + assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -490,14 +506,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -524,8 +540,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -585,9 +601,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -596,8 +612,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && - getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -607,10 +623,8 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = - glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = - lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -628,8 +642,7 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = - lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -645,9 +658,10 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < - (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && + (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -663,24 +677,20 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = - transformVectorFast(getSensorToWorldMatrix(), - glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = - transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = - transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -690,7 +700,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -702,7 +712,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -710,8 +720,7 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < - DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -722,13 +731,12 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), - _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); simulate(deltaTime, true); @@ -736,20 +744,23 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if (didTeleport()) { + if(didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); + currentEnergy = max(0.0f, min(currentEnergy,1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { + _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { + const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { + float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -817,20 +828,21 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + updateChildCauterization(descendant, !_prevShouldDrawHead); + }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + objectsToUncauterize.insert(descendant); + }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); - cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -874,7 +886,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -955,7 +967,8 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && + glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -983,8 +996,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && - !(spine2Index < 0)) { + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { + glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -996,10 +1009,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && - (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), - glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1047,11 +1058,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { + // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = - createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1069,10 +1080,11 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } + } // Update avatar head rotation with sensor data @@ -1097,7 +1109,8 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { + if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && + (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1112,6 +1125,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. + Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1177,15 +1191,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), - Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1193,8 +1207,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), - Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1225,12 +1239,8 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, - const QString& url, - float fps, - bool loop, - float firstFrame, - float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, + float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1249,9 +1259,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } } @@ -1268,12 +1278,10 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", - QUuid()); + << QString::number(settingsIndex) << "id", QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", - QByteArray()); + << QString::number(settingsIndex) << "properties", QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1291,10 +1299,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1464,12 +1472,16 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); + }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToDelete.push_back(entityID); + }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1494,7 +1506,9 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || + getID() == AVATAR_SELF_ID || + DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1540,7 +1554,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1568,7 +1582,9 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); + entityTree->withWriteLock([&] { + entityTree->deleteEntity(id); + }); } // ADD real entities @@ -1579,19 +1595,21 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); + _avatarEntitiesLock.withWriteLock([&] { + removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); + }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1661,7 +1679,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1725,7 +1743,9 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobs[id] = blob; + }); } } return true; @@ -1752,7 +1772,9 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); + _avatarEntitiesLock.withReadLock([&] { + result = _cachedAvatarEntityBlobs; + }); return result; } @@ -1853,9 +1875,7 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() - ? _avatarEntityForRecording.values()[entityCount++] - : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1885,7 +1905,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal{ Settings::firstRun, true }; + Setting::Handle firstRunVal { Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1911,7 +1931,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1939,7 +1959,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2009,9 +2029,10 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } + int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2025,12 +2046,8 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, - const glm::vec3& myPosition, - const glm::vec3& otherForward, - const glm::vec3& otherPosition, - bool otherIsTalking, - bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, + bool otherIsTalking, bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2038,7 +2055,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2050,8 +2067,11 @@ static float lookAtCostFunction(const glm::vec3& myForward, if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + + MY_ANGLE_FACTOR * myAngle + + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2074,8 +2094,7 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = - lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2096,8 +2115,9 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { + // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2108,12 +2128,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2151,6 +2171,7 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { + // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2264,7 +2285,8 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", + Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2303,7 +2325,9 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointData(index, rotation, translation); + }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2311,7 +2335,9 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointRotation(index, rotation); + }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2319,7 +2345,9 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointTranslation(index, translation); + }); } void MyAvatar::clearJointData(const QString& name) { @@ -2327,7 +2355,9 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); + writeLockWithNamedJointIndex(name, [&](int index) { + clearJointData(index); + }); } void MyAvatar::clearJointsData() { @@ -2362,36 +2392,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, - [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = - _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); + saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || - entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() + && (entity->getParentID() == DependencyManager::get()->getSessionUUID() + || entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2415,7 +2445,9 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2441,7 +2473,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2466,6 +2500,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } + void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2474,8 +2509,11 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { + if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", + Q_ARG(const QUrl&, fullAvatarURL), + Q_ARG(const QString&, modelName)); return; } @@ -2529,7 +2567,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2538,7 +2576,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2548,7 +2586,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2570,7 +2608,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2580,7 +2618,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2588,15 +2626,14 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2616,8 +2653,7 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } } @@ -2722,7 +2758,8 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, + DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2763,18 +2800,21 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, - const QString& jointName, - const glm::vec3& translation, - const glm::quat& rotation, - float scale, - bool isSoft, - bool allowDuplicates, - bool useSaved) { +void MyAvatar::attach(const QString& modelURL, const QString& jointName, + const glm::vec3& translation, const glm::quat& rotation, + float scale, bool isSoft, + 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 glm::quat&, rotation), Q_ARG(float, scale), - Q_ARG(bool, isSoft), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); + BLOCKING_INVOKE_METHOD(this, "attach", + 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), + Q_ARG(bool, allowDuplicates), + Q_ARG(bool, useSaved) + ); return; } AttachmentData data; @@ -2792,7 +2832,10 @@ void MyAvatar::attach(const QString& modelURL, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachOne", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2804,7 +2847,10 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachAll", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2816,7 +2862,8 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", + Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2839,10 +2886,12 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2861,7 +2910,8 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", + Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2872,12 +2922,14 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -2978,7 +3030,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3011,16 +3063,18 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { + Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { + auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3028,8 +3082,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, - _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3050,15 +3103,13 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), - glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), - rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3075,9 +3126,14 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), + glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3088,7 +3144,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto& multiSphere = _multiSphereShapes[i]; + auto &multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3098,6 +3154,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { + // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3142,7 +3199,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3227,6 +3284,7 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { + // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3265,8 +3323,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && - _hmdRollControlEnabled && hasDriveInput()) { + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { + // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3274,6 +3332,7 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { + float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3320,8 +3379,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + - getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3331,15 +3390,20 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } else if (absDriveKey > getDriveGear4()) { + } + else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } else if (absDriveKey > getDriveGear3()) { + } + else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } else if (absDriveKey > getDriveGear2()) { + } + else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } else if (absDriveKey > getDriveGear1()) { + } + else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } else { + } + else { return sign * 0.0f; } } @@ -3371,10 +3435,8 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * - ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * - ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3396,7 +3458,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection() { +glm::vec3 MyAvatar::calculateScaledDirection(){ CharacterController::State state = _characterController.getState(); // compute action input @@ -3452,8 +3514,8 @@ glm::vec3 MyAvatar::calculateScaledDirection() { void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = - (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) + && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3483,7 +3545,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3523,7 +3585,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3548,17 +3610,12 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, - float radiusA, - float heightA, - const glm::vec3 positionB, - float radiusB, - float heightB, - glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, + const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3620,7 +3677,9 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3764,18 +3823,16 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, + bool hasOrientation, const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, - bool shouldFaceLocation, - bool withSafeLanding) { + bool hasOrientation, const glm::quat& newOrientation, + bool shouldFaceLocation, bool withSafeLanding) { + // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3789,16 +3846,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " - << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " + << newPosition.y << ", " << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " - << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " + << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3817,7 +3874,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3843,29 +3900,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", - Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { + // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3877,26 +3934,21 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, - EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = - entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | - PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | - PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | - PickFilter::getBitMask( - PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) + | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3911,12 +3963,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3924,8 +3976,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = - 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3937,7 +3988,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -3952,18 +4003,19 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4047,7 +4099,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index) { +void MyAvatar::setControlSchemeIndex(int index){ if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4065,8 +4117,7 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4087,8 +4138,7 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4109,8 +4159,7 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4131,8 +4180,7 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4153,8 +4201,7 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4180,6 +4227,7 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4189,6 +4237,7 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4204,6 +4253,7 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4359,7 +4409,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4395,8 +4445,7 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), - glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4453,7 +4502,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass(){}; + JointMass() {}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4474,14 +4523,12 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4493,8 +4540,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + - (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4534,6 +4580,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { + glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4543,7 +4590,10 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), + glm::vec4(u, 0.0f), + glm::vec4(v, 0.0f), + glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4584,8 +4634,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4593,8 +4642,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = - computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4618,7 +4666,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4652,8 +4700,7 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for (auto recentModeReadingsIterator = _recentModeReadings.begin(); - recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4666,23 +4713,21 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = - glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); + float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); + } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, - const controller::Pose& rightHand, - const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4720,7 +4765,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4743,8 +4788,7 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && - (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4794,6 +4838,7 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } + } float MyAvatar::getWalkBackwardSpeed() const { @@ -4810,6 +4855,7 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } + } bool MyAvatar::isReadyForPhysics() const { @@ -4819,7 +4865,8 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } else { + } + else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4843,6 +4890,7 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { + _userRecenterModel.set(modelName); switch (modelName) { @@ -4918,7 +4966,7 @@ void MyAvatar::setWalkBackwardSpeed(float value) { changed = false; break; } - + if (changed && prevVal != value) { emit walkBackwardSpeedChanged(value); } @@ -5088,6 +5136,7 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } + void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5145,17 +5194,13 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5186,6 +5231,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { + // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5198,7 +5244,8 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && + headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5210,15 +5257,13 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > - (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && + (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5230,9 +5275,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5263,11 +5306,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, - bool hasDriveInput) { - if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, bool hasDriveInput) { + + if (myAvatar.getHMDLeanRecenterEnabled() && + qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5282,8 +5325,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && - (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5320,7 +5362,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5329,8 +5371,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5358,8 +5400,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = - glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5427,8 +5468,7 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || - fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5444,6 +5484,7 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { + // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5470,7 +5511,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5499,13 +5540,15 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointRotationInObjectFrame(index); + } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5534,7 +5577,9 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointTranslationInObjectFrame(index); + } } } @@ -5543,15 +5588,12 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + - getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * - 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, - extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5720,6 +5762,7 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { + // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5755,24 +5798,26 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, - int parentJointIndex, - glm::vec3 positionalOffset, - glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, + glm::vec3 positionalOffset, glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || + parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || + parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, - rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), + targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5785,9 +5830,10 @@ const QUuid MyAvatar::grab(const QUuid& targetID, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler{ false }; + bool tellHandler { false }; _avatarGrabsLock.withWriteLock([&] { + std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5816,12 +5862,13 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", + Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto& flow = _skeletonModel->getRig().getFlow(); + auto &flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto& handJointName : HAND_COLLISION_JOINTS) { + for (auto &handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5849,18 +5896,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, - bool isCollidable, - const QVariantMap& physicsConfig, - const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", + Q_ARG(bool, isActive), + Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), + Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5869,7 +5916,7 @@ void MyAvatar::useFlow(bool isActive, collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto& groupName : physicsGroups) { + for (auto &groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5899,7 +5946,7 @@ void MyAvatar::useFlow(bool isActive, auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto& jointName : collisionJoints) { + for (auto &jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -5953,13 +6000,14 @@ void MyAvatar::useFlow(bool isActive, QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", + Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -5969,17 +6017,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto& groups = flow.getGroupSettings(); - for (auto& joint : flow.getJoints()) { - auto& groupName = joint.second.getGroup(); + auto &groups = flow.getGroupSettings(); + for (auto &joint : flow.getJoints()) { + auto &groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto& group : groups) { + } + for (auto &group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -5994,8 +6042,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto& collisions = collisionSystem.getCollisions(); - for (auto& collision : collisions) { + auto &collisions = collisionSystem.getCollisions(); + for (auto &collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -6003,7 +6051,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto& thread : flow.getThreads()) { + for (auto &thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6020,13 +6068,14 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", + Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto& joint : flow.getJoints()) { + for (auto &joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6037,7 +6086,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto& flowData = _skeletonModel->getHFMModel().flowData; + auto &flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6055,3 +6104,4 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } + From e7255298de9c7d38bc05be468677ff1b7949fd98 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 11:59:26 -0700 Subject: [PATCH 086/100] made one more change to get rid of ubuntu warning --- interface/src/avatar/MyAvatar.cpp | 857 ++++++++++++++---------------- 1 file changed, 404 insertions(+), 453 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b60bfd3f29..55ae1a8423 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,7 +83,8 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = + "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -92,7 +93,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -113,50 +114,33 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), - _yawSpeed(YAW_SPEED_DEFAULT), - _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), - _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), - _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), - _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", - DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), - _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), - _smoothOrientationInitial(), - _smoothOrientationTarget(), - _hmdSensorMatrix(), - _hmdSensorOrientation(), - _hmdSensorPosition(), - _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), - _goToPending(false), - _goToSafe(true), - _goToFeetAjustment(false), - _goToPosition(), - _goToOrientation(), - _prevShouldDrawHead(true), - _audioListenerMode(FROM_HEAD), + Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), + _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), + _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", + DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -172,17 +156,19 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" + << "size", + 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", + _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) -{ + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -203,7 +189,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -220,11 +206,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, - this, static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, + static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -287,7 +273,6 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { - setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -383,7 +368,8 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, + QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -446,7 +432,6 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; - } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -460,7 +445,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -497,7 +482,6 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { - assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -506,14 +490,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -540,8 +524,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -601,9 +585,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -612,8 +596,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { - + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && + getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -623,8 +607,10 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = + glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = + lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -642,7 +628,8 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = + lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -658,10 +645,9 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && - (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { - + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < + (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -677,20 +663,24 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = + transformVectorFast(getSensorToWorldMatrix(), + glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = + transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = + transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -700,7 +690,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -712,7 +702,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -720,7 +710,8 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < + DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -731,12 +722,13 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), + _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); simulate(deltaTime, true); @@ -744,23 +736,20 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if(didTeleport()) { + if (didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy,1.0f)); + currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { - _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { - const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { - float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -828,21 +817,20 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - updateChildCauterization(descendant, !_prevShouldDrawHead); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant([&](SpatiallyNestablePointer descendant) { - objectsToUncauterize.insert(descendant); - }); + object->forEachDescendant( + [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); + cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -886,7 +874,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -967,8 +955,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && - glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -996,8 +983,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { - + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && + !(spine2Index < 0)) { glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -1009,8 +996,10 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && + (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), + glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1058,11 +1047,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { - // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = + createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1080,11 +1069,10 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } - } // Update avatar head rotation with sensor data @@ -1109,8 +1097,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && - (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { + if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1125,7 +1112,6 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. - Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1191,15 +1177,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), + Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1207,8 +1193,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), - Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), + Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1239,8 +1225,12 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, - float firstFrame, float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, + const QString& url, + float fps, + bool loop, + float firstFrame, + float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1259,9 +1249,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } } @@ -1278,10 +1268,12 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", QUuid()); + << QString::number(settingsIndex) << "id", + QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", QByteArray()); + << QString::number(settingsIndex) << "properties", + QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1299,10 +1291,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? - "" : - _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() + ? "" + : _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1472,16 +1464,12 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobsToDelete.push_back(entityID); - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1506,9 +1494,7 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || - getID() == AVATAR_SELF_ID || - DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1554,7 +1540,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1582,9 +1568,7 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { - entityTree->deleteEntity(id); - }); + entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); } // ADD real entities @@ -1595,21 +1579,19 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { - removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); - }); + _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1679,7 +1661,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1743,9 +1725,7 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { - _cachedAvatarEntityBlobs[id] = blob; - }); + _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); } } return true; @@ -1772,9 +1752,7 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { - result = _cachedAvatarEntityBlobs; - }); + _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); return result; } @@ -1875,7 +1853,9 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() + ? _avatarEntityForRecording.values()[entityCount++] + : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1905,7 +1885,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal { Settings::firstRun, true }; + Setting::Handle firstRunVal{ Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1931,7 +1911,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1959,7 +1939,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2029,10 +2009,9 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } - int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2046,8 +2025,12 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, - bool otherIsTalking, bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, + const glm::vec3& myPosition, + const glm::vec3& otherForward, + const glm::vec3& otherPosition, + bool otherIsTalking, + bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2055,7 +2038,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2067,11 +2050,8 @@ static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myP if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + - MY_ANGLE_FACTOR * myAngle + - OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + - LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2094,7 +2074,8 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = + lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2115,9 +2096,8 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { - // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2128,12 +2108,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2171,7 +2151,6 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { - // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2285,8 +2264,7 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", - Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2325,9 +2303,7 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointData(index, rotation, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2335,9 +2311,7 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointRotation(index, rotation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2345,9 +2319,7 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - setJointTranslation(index, translation); - }); + writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); } void MyAvatar::clearJointData(const QString& name) { @@ -2355,9 +2327,7 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { - clearJointData(index); - }); + writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); } void MyAvatar::clearJointsData() { @@ -2392,36 +2362,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, + [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = + _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); - saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() - && (entity->getParentID() == DependencyManager::get()->getSessionUUID() - || entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || + entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2445,9 +2415,7 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2473,9 +2441,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2500,7 +2466,6 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } - void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2509,11 +2474,8 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { - if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", - Q_ARG(const QUrl&, fullAvatarURL), - Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); return; } @@ -2567,7 +2529,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2576,7 +2538,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2586,7 +2548,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2608,7 +2570,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2618,7 +2580,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2626,14 +2588,15 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2653,7 +2616,8 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, + verticalMotorTimescale); } } @@ -2758,8 +2722,7 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, - DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2800,21 +2763,18 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, const QString& jointName, - const glm::vec3& translation, const glm::quat& rotation, - float scale, bool isSoft, - bool allowDuplicates, bool useSaved) { +void MyAvatar::attach(const QString& modelURL, + const QString& jointName, + const glm::vec3& translation, + const glm::quat& rotation, + float scale, + bool isSoft, + 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 glm::quat&, rotation), - Q_ARG(float, scale), - Q_ARG(bool, isSoft), - Q_ARG(bool, allowDuplicates), - Q_ARG(bool, useSaved) - ); + BLOCKING_INVOKE_METHOD(this, "attach", 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), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); return; } AttachmentData data; @@ -2832,10 +2792,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2847,10 +2804,7 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", - Q_ARG(const QString&, modelURL), - Q_ARG(const QString&, jointName) - ); + BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); return; } QUuid entityID; @@ -2862,8 +2816,7 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", - Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2886,12 +2839,10 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2910,8 +2861,7 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", - Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2922,14 +2872,12 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -3030,7 +2978,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3063,18 +3011,16 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { - Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { - auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3082,7 +3028,8 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, + _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3103,13 +3050,15 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), + glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), + rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3126,14 +3075,9 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), - glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3144,7 +3088,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto &multiSphere = _multiSphereShapes[i]; + auto& multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3154,7 +3098,6 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { - // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3199,7 +3142,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3284,7 +3227,6 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { - // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3323,8 +3265,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { - + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && + _hmdRollControlEnabled && hasDriveInput()) { // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3332,7 +3274,6 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { - float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3379,8 +3320,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime - + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3390,20 +3331,15 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } - else if (absDriveKey > getDriveGear4()) { + } else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } - else if (absDriveKey > getDriveGear3()) { + } else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } - else if (absDriveKey > getDriveGear2()) { + } else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } - else if (absDriveKey > getDriveGear1()) { + } else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } - else { + } else { return sign * 0.0f; } } @@ -3435,8 +3371,10 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * + ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * + ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3458,7 +3396,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection(){ +glm::vec3 MyAvatar::calculateScaledDirection() { CharacterController::State state = _characterController.getState(); // compute action input @@ -3514,8 +3452,8 @@ glm::vec3 MyAvatar::calculateScaledDirection(){ void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) - && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = + (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3545,7 +3483,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3585,7 +3523,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3610,12 +3548,17 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, - const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, + float radiusA, + float heightA, + const glm::vec3 positionB, + float radiusB, + float heightB, + glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3677,9 +3620,7 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { - avatarEntityIDs = _packedAvatarEntityData.keys(); - }); + _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3823,16 +3764,18 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, + bool hasOrientation, + const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, const glm::quat& newOrientation, - bool shouldFaceLocation, bool withSafeLanding) { - + bool hasOrientation, + const glm::quat& newOrientation, + bool shouldFaceLocation, + bool withSafeLanding) { // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3846,16 +3789,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " - << newPosition.y << ", " << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " + << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " - << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " + << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3874,7 +3817,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3900,29 +3843,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", + Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { - // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3934,21 +3877,26 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, + EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) - | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = + entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | + PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | + PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | + PickFilter::getBitMask( + PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3963,12 +3911,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3976,7 +3924,8 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = + 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3988,7 +3937,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -4003,19 +3952,18 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4099,7 +4047,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index){ +void MyAvatar::setControlSchemeIndex(int index) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4117,7 +4065,8 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4138,7 +4087,8 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4159,7 +4109,8 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4180,7 +4131,8 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4201,7 +4153,8 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) + return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4227,7 +4180,6 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4237,7 +4189,6 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4253,7 +4204,6 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { - if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4409,7 +4359,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4445,7 +4395,8 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), + glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4502,7 +4453,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass() {}; + JointMass(){}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4523,12 +4474,14 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4540,7 +4493,8 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4580,7 +4534,6 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { - glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4590,10 +4543,7 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), - glm::vec4(u, 0.0f), - glm::vec4(v, 0.0f), - glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4634,7 +4584,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = + getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4642,7 +4593,8 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = + computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4666,7 +4618,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4700,7 +4652,8 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for (auto recentModeReadingsIterator = _recentModeReadings.begin(); + recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4713,21 +4666,23 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); + float resetModeInCentimeters = + glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); - } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, + const controller::Pose& rightHand, + const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4765,7 +4720,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4788,7 +4743,8 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && + (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4838,7 +4794,6 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } - } float MyAvatar::getWalkBackwardSpeed() const { @@ -4855,7 +4810,6 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } - } bool MyAvatar::isReadyForPhysics() const { @@ -4865,8 +4819,7 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } - else { + } else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4890,7 +4843,6 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { - _userRecenterModel.set(modelName); switch (modelName) { @@ -4966,7 +4918,7 @@ void MyAvatar::setWalkBackwardSpeed(float value) { changed = false; break; } - + if (changed && prevVal != value) { emit walkBackwardSpeedChanged(value); } @@ -4989,6 +4941,7 @@ void MyAvatar::setSprintSpeed(float value) { _analogPlusSprintSpeed.set(value); break; default: + changed = false; break; } @@ -5136,7 +5089,6 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } - void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5194,13 +5146,17 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5231,7 +5187,6 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { - // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5244,8 +5199,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && - headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5257,13 +5211,15 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = + myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && - (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > + (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5275,7 +5231,9 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5306,11 +5264,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, bool hasDriveInput) { - - if (myAvatar.getHMDLeanRecenterEnabled() && - qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, + const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, + bool hasDriveInput) { + if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5325,7 +5283,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && + (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5362,7 +5321,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5371,8 +5330,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5400,7 +5359,8 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = + glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5468,7 +5428,8 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || + fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5484,7 +5445,6 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { - // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5511,7 +5471,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5540,15 +5500,13 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointRotationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5577,9 +5535,7 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { - return Avatar::getAbsoluteJointTranslationInObjectFrame(index); - } + default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } } } @@ -5588,12 +5544,15 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * + 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, + extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5762,7 +5721,6 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { - // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5798,26 +5756,24 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, - glm::vec3 positionalOffset, glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, + int parentJointIndex, + glm::vec3 positionalOffset, + glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || - parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || - parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), - targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, + rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5830,10 +5786,9 @@ const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler { false }; + bool tellHandler{ false }; _avatarGrabsLock.withWriteLock([&] { - std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5862,13 +5817,12 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", - Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto &flow = _skeletonModel->getRig().getFlow(); + auto& flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto &handJointName : HAND_COLLISION_JOINTS) { + for (auto& handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5896,18 +5850,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, + bool isCollidable, + const QVariantMap& physicsConfig, + const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", - Q_ARG(bool, isActive), - Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), - Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5916,7 +5870,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto &groupName : physicsGroups) { + for (auto& groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5946,7 +5900,7 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto &jointName : collisionJoints) { + for (auto& jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -6000,14 +5954,13 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", - Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto &flow = _skeletonModel->getRig().getFlow(); - auto &collisionSystem = flow.getCollisionSystem(); + auto& flow = _skeletonModel->getRig().getFlow(); + auto& collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -6017,17 +5970,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto &groups = flow.getGroupSettings(); - for (auto &joint : flow.getJoints()) { - auto &groupName = joint.second.getGroup(); + auto& groups = flow.getGroupSettings(); + for (auto& joint : flow.getJoints()) { + auto& groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto &group : groups) { + } + for (auto& group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -6042,8 +5995,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto &collisions = collisionSystem.getCollisions(); - for (auto &collision : collisions) { + auto& collisions = collisionSystem.getCollisions(); + for (auto& collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -6051,7 +6004,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto &thread : flow.getThreads()) { + for (auto& thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6068,14 +6021,13 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", - Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto &joint : flow.getJoints()) { + for (auto& joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6086,7 +6038,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto &flowData = _skeletonModel->getHFMModel().flowData; + auto& flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6104,4 +6056,3 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } - From 4eccb7a124677ed6548ced5770ff80cb3065573a Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 12:00:36 -0700 Subject: [PATCH 087/100] Revert "made one more change to get rid of ubuntu warning" This reverts commit e7255298de9c7d38bc05be468677ff1b7949fd98. --- interface/src/avatar/MyAvatar.cpp | 857 ++++++++++++++++-------------- 1 file changed, 453 insertions(+), 404 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 55ae1a8423..b60bfd3f29 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -71,9 +71,9 @@ using namespace std; const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f; const float YAW_SPEED_DEFAULT = 100.0f; // degrees/sec -const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec +const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec -const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed +const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed const float MIN_AVATAR_SPEED = 0.05f; float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f; @@ -83,8 +83,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = - "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; @@ -93,7 +92,7 @@ const float MIN_SCALE_CHANGED_DELTA = 0.001f; const int MODE_READINGS_RING_BUFFER_SIZE = 500; const float CENTIMETERS_PER_METER = 100.0f; -const QString AVATAR_SETTINGS_GROUP_NAME{ "Avatar" }; +const QString AVATAR_SETTINGS_GROUP_NAME { "Avatar" }; static const QString USER_RECENTER_MODEL_FORCE_SIT = QStringLiteral("ForceSit"); static const QString USER_RECENTER_MODEL_FORCE_STAND = QStringLiteral("ForceStand"); @@ -114,33 +113,50 @@ MyAvatar::SitStandModelType stringToUserRecenterModel(const QString& str) { QString userRecenterModelToString(MyAvatar::SitStandModelType model) { switch (model) { - case MyAvatar::ForceSit: - return USER_RECENTER_MODEL_FORCE_SIT; - case MyAvatar::ForceStand: - return USER_RECENTER_MODEL_FORCE_STAND; - case MyAvatar::DisableHMDLean: - return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; - case MyAvatar::Auto: - default: - return USER_RECENTER_MODEL_AUTO; + case MyAvatar::ForceSit: + return USER_RECENTER_MODEL_FORCE_SIT; + case MyAvatar::ForceStand: + return USER_RECENTER_MODEL_FORCE_STAND; + case MyAvatar::DisableHMDLean: + return USER_RECENTER_MODEL_DISABLE_HMD_LEAN; + case MyAvatar::Auto: + default: + return USER_RECENTER_MODEL_AUTO; } } MyAvatar::MyAvatar(QThread* thread) : - Avatar(thread), _yawSpeed(YAW_SPEED_DEFAULT), _pitchSpeed(PITCH_SPEED_DEFAULT), - _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), - _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), _motionBehaviors(AVATAR_MOTION_DEFAULTS), - _characterController(std::shared_ptr(this)), _eyeContactTarget(LEFT_EYE), - _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _showPlayArea("showPlayArea", true), - _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), - _hmdSensorMatrix(), _hmdSensorOrientation(), _hmdSensorPosition(), _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), - _bodySensorMatrix(), _goToPending(false), _goToSafe(true), _goToFeetAjustment(false), _goToPosition(), _goToOrientation(), - _prevShouldDrawHead(true), _audioListenerMode(FROM_HEAD), + Avatar(thread), + _yawSpeed(YAW_SPEED_DEFAULT), + _pitchSpeed(PITCH_SPEED_DEFAULT), + _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE), + _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME), + _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE), + _motionBehaviors(AVATAR_MOTION_DEFAULTS), + _characterController(std::shared_ptr(this)), + _eyeContactTarget(LEFT_EYE), + _realWorldFieldOfView("realWorldFieldOfView", + DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), + _showPlayArea("showPlayArea", true), + _smoothOrientationTimer(std::numeric_limits::max()), + _smoothOrientationInitial(), + _smoothOrientationTarget(), + _hmdSensorMatrix(), + _hmdSensorOrientation(), + _hmdSensorPosition(), + _recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE), + _bodySensorMatrix(), + _goToPending(false), + _goToSafe(true), + _goToFeetAjustment(false), + _goToPosition(), + _goToOrientation(), + _prevShouldDrawHead(true), + _audioListenerMode(FROM_HEAD), _dominantHandSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "dominantHand", DOMINANT_RIGHT_HAND), _strafeEnabledSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "strafeEnabled", DEFAULT_STRAFE_ENABLED), - _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", - DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), + _hmdAvatarAlignmentTypeSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hmdAvatarAlignmentType", DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE), _headPitchSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "", 0.0f), _scaleSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "scale", _targetScale), _yawSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "yawSpeed", _yawSpeed), @@ -156,19 +172,17 @@ MyAvatar::MyAvatar(QThread* thread) : _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), - _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << "size", - 0), + _avatarEntityCountSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" << "size", 0), _driveGear1Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear1", _driveGear1), _driveGear2Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear2", _driveGear2), _driveGear3Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear3", _driveGear3), _driveGear4Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear4", _driveGear4), _driveGear5Setting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "driveGear5", _driveGear5), _analogWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogWalkSpeed", _analogWalkSpeed.get()), - _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", - _analogPlusWalkSpeed.get()), + _analogPlusWalkSpeedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "analogPlusWalkSpeed", _analogPlusWalkSpeed.get()), _controlSchemeIndexSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "controlSchemeIndex", _controlSchemeIndex), - _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) { + _userRecenterModelSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userRecenterModel", USER_RECENTER_MODEL_AUTO) +{ _clientTraitsHandler.reset(new ClientTraitsHandler(this)); // give the pointer to our head to inherited _headData variable from AvatarData @@ -189,7 +203,7 @@ MyAvatar::MyAvatar(QThread* thread) : qApp->loadAvatarScripts(hfmModel.scripts); _shouldLoadScripts = false; } - // Load and convert old attachments to avatar entities + // Load and convert old attachments to avatar entities if (_oldAttachmentData.size() > 0) { setAttachmentData(_oldAttachmentData); _oldAttachmentData.clear(); @@ -206,11 +220,11 @@ MyAvatar::MyAvatar(QThread* thread) : clearDriveKeys(); // Necessary to select the correct slot - using SlotType = void (MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); + using SlotType = void(MyAvatar::*)(const glm::vec3&, bool, const glm::quat&, bool); // connect to AddressManager signal for location jumps - connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, this, - static_cast(&MyAvatar::goToFeetLocation)); + connect(DependencyManager::get().data(), &AddressManager::locationChangeRequired, + this, static_cast(&MyAvatar::goToFeetLocation)); // handle scale constraints imposed on us by the domain-server auto& domainHandler = DependencyManager::get()->getDomainHandler(); @@ -273,6 +287,7 @@ MyAvatar::MyAvatar(QThread* thread) : if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() && (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) { + setSkeletonModelURL(dummyAvatar.getSkeletonModelURL()); } @@ -368,8 +383,7 @@ void MyAvatar::enableHandTouchForID(const QUuid& entityID) { } void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) { - QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, - QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); + QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects); engine->globalObject().setProperty("MyAvatar", value); QScriptValue driveKeys = engine->newObject(); @@ -432,6 +446,7 @@ void MyAvatar::resetSensorsAndBody() { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "resetSensorsAndBody"); return; + } qApp->getActiveDisplayPlugin()->resetSensors(); @@ -445,7 +460,7 @@ void MyAvatar::centerBody() { } // derive the desired body orientation from the current hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -482,6 +497,7 @@ void MyAvatar::clearIKJointLimitHistory() { } void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { + assert(QThread::currentThread() == thread()); // Reset dynamic state. @@ -490,14 +506,14 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { if (andReload) { _skeletonModel->reset(); } - if (andHead) { // which drives camera in desktop + if (andHead) { // which drives camera in desktop getHead()->reset(); } setThrust(glm::vec3(0.0f)); if (andRecenter) { // derive the desired body orientation from the *old* hmd orientation, before the sensor reset. - auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + auto newBodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. // transform this body into world space auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix; @@ -524,8 +540,8 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { void MyAvatar::updateSitStandState(float newHeightReading, float dt) { const float STANDING_HEIGHT_MULTIPLE = 1.2f; const float SITTING_HEIGHT_MULTIPLE = 0.833f; - const float SITTING_TIMEOUT = 4.0f; // 4 seconds - const float STANDING_TIMEOUT = 0.3333f; // 1/3 second + const float SITTING_TIMEOUT = 4.0f; // 4 seconds + const float STANDING_TIMEOUT = 0.3333f; // 1/3 second const float SITTING_UPPER_BOUND = 1.52f; if (!getIsSitStandStateLocked()) { if (!getIsAway() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { @@ -585,9 +601,9 @@ void MyAvatar::updateSitStandState(float newHeightReading, float dt) { void MyAvatar::update(float deltaTime) { // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); - const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders + const float PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH = 0.0f; // 100 percent shoulders const float COSINE_THIRTY_DEGREES = 0.866f; - const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds + const float SQUATTY_TIMEOUT = 30.0f; // 30 seconds const float HEIGHT_FILTER_COEFFICIENT = 0.01f; float tau = deltaTime / HMD_FACING_TIMESCALE; @@ -596,8 +612,8 @@ void MyAvatar::update(float deltaTime) { // put the average hand azimuth into sensor space. // then mix it with head facing direction to determine rotation recenter int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && - getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + if (getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).isValid() && getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).isValid() && !(spine2Index < 0)) { + // use the spine for the azimuth origin. glm::quat spine2Rot = getAbsoluteJointRotationInObjectFrame(spine2Index); glm::vec3 handHipAzimuthAvatarSpace = spine2Rot * glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y); @@ -607,10 +623,8 @@ void MyAvatar::update(float deltaTime) { glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, handHipAzimuthWorldSpace); glm::vec2 normedHandHipAzimuthSensorSpace(0.0f, 1.0f); if (glm::length(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)) > 0.0f) { - normedHandHipAzimuthSensorSpace = - glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); - glm::vec2 headFacingPlusHandHipAzimuthMix = - lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); + normedHandHipAzimuthSensorSpace = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z)); + glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHipAzimuthSensorSpace, _headControllerFacing, PERCENTAGE_WEIGHT_HEAD_VS_SHOULDERS_AZIMUTH); _headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau); } else { // use head facing if the chest arms vector is up or down. @@ -628,8 +642,7 @@ void MyAvatar::update(float deltaTime) { controller::Pose newHeightReading = getControllerPoseInSensorFrame(controller::Action::HEAD); if (newHeightReading.isValid()) { int newHeightReadingInCentimeters = glm::floor(newHeightReading.getTranslation().y * CENTIMETERS_PER_METER); - _averageUserHeightSensorSpace = - lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); + _averageUserHeightSensorSpace = lerp(_averageUserHeightSensorSpace, newHeightReading.getTranslation().y, HEIGHT_FILTER_COEFFICIENT); _recentModeReadings.insert(newHeightReadingInCentimeters); setCurrentStandingHeight(computeStandingHeightMode(newHeightReading)); setAverageHeadRotation(computeAverageHeadRotation(getControllerPoseInAvatarFrame(controller::Action::HEAD))); @@ -645,9 +658,10 @@ void MyAvatar::update(float deltaTime) { } float angleSpine2 = glm::dot(upSpine2, glm::vec3(0.0f, 1.0f, 0.0f)); - if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < - (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && - (angleSpine2 > COSINE_THIRTY_DEGREES) && (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + if (getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y < (headDefaultPositionAvatarSpace.y - SQUAT_THRESHOLD) && + (angleSpine2 > COSINE_THIRTY_DEGREES) && + (getUserRecenterModel() != MyAvatar::SitStandModelType::ForceStand)) { + _squatTimer += deltaTime; if (_squatTimer > SQUATTY_TIMEOUT) { _squatTimer = 0.0f; @@ -663,24 +677,20 @@ void MyAvatar::update(float deltaTime) { if (_drawAverageFacingEnabled) { auto sensorHeadPose = getControllerPoseInSensorFrame(controller::Action::HEAD); glm::vec3 worldHeadPos = transformPoint(getSensorToWorldMatrix(), sensorHeadPose.getTranslation()); - glm::vec3 worldFacingAverage = - transformVectorFast(getSensorToWorldMatrix(), - glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); - glm::vec3 worldFacing = - transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); + glm::vec3 worldFacingAverage = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y)); + glm::vec3 worldFacing = transformVectorFast(getSensorToWorldMatrix(), glm::vec3(_headControllerFacing.x, 0.0f, _headControllerFacing.y)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacing, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f)); DebugDraw::getInstance().drawRay(worldHeadPos, worldHeadPos + worldFacingAverage, glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)); // draw hand azimuth vector - glm::vec3 handAzimuthMidpoint = - transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); + glm::vec3 handAzimuthMidpoint = transformPoint(getTransform().getMatrix(), glm::vec3(_hipToHandController.x, 0.0f, _hipToHandController.y)); DebugDraw::getInstance().drawRay(getWorldPosition(), handAzimuthMidpoint, glm::vec4(0.0f, 1.0f, 1.0f, 1.0f)); } if (_goToPending) { setWorldPosition(_goToPosition); setWorldOrientation(_goToOrientation); - _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average + _headControllerFacingMovingAverage = _headControllerFacing; // reset moving average _goToPending = false; // updateFromHMDSensorMatrix (called from paintGL) expects that the sensorToWorldMatrix is updated for any position changes // that happen between render and Application::update (which calls updateSensorToWorldMatrix to do so). @@ -690,7 +700,7 @@ void MyAvatar::update(float deltaTime) { emit positionGoneTo(); // Run safety tests as soon as we can after goToLocation, or clear if we're not colliding. _physicsSafetyPending = getCollisionsEnabled(); - _characterController.recomputeFlying(); // In case we've gone to into the sky. + _characterController.recomputeFlying(); // In case we've gone to into the sky. } if (_goToFeetAjustment && _skeletonModelLoaded) { auto feetAjustment = getWorldPosition() - getWorldFeetPosition(); @@ -702,7 +712,7 @@ void MyAvatar::update(float deltaTime) { // When needed and ready, arrange to check and fix. _physicsSafetyPending = false; if (_goToSafe) { - safeLanding(_goToPosition); // no-op if already safe + safeLanding(_goToPosition); // no-op if already safe } } @@ -710,8 +720,7 @@ void MyAvatar::update(float deltaTime) { head->relax(deltaTime); updateFromTrackers(deltaTime); - if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < - DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { + if (getIsInWalkingState() && glm::length(getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) < DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { setIsInWalkingState(false); } @@ -722,13 +731,12 @@ void MyAvatar::update(float deltaTime) { setAudioLoudness(audio->getLastInputLoudness()); setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); - glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), - _characterController.getCapsuleRadius()); + glm::vec3 halfBoundingBoxDimensions(_characterController.getCapsuleRadius(), _characterController.getCapsuleHalfHeight(), _characterController.getCapsuleRadius()); // This might not be right! Isn't the capsule local offset in avatar space? -HRS 5/26/17 halfBoundingBoxDimensions += _characterController.getCapsuleLocalOffset(); QMetaObject::invokeMethod(audio, "setAvatarBoundingBoxParameters", - Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), - Q_ARG(glm::vec3, (halfBoundingBoxDimensions * 2.0f))); + Q_ARG(glm::vec3, (getWorldPosition() - halfBoundingBoxDimensions)), + Q_ARG(glm::vec3, (halfBoundingBoxDimensions*2.0f))); simulate(deltaTime, true); @@ -736,20 +744,23 @@ void MyAvatar::update(float deltaTime) { currentEnergy -= getAccelerationEnergy(); currentEnergy -= getAudioEnergy(); - if (didTeleport()) { + if(didTeleport()) { currentEnergy = 0.0f; } - currentEnergy = max(0.0f, min(currentEnergy, 1.0f)); + currentEnergy = max(0.0f, min(currentEnergy,1.0f)); emit energyChanged(currentEnergy); updateEyeContactTarget(deltaTime); } void MyAvatar::updateEyeContactTarget(float deltaTime) { + _eyeContactTargetTimer -= deltaTime; if (_eyeContactTargetTimer < 0.0f) { + const float CHANCE_OF_CHANGING_TARGET = 0.01f; if (randFloat() < CHANCE_OF_CHANGING_TARGET) { + float const FIFTY_FIFTY_CHANCE = 0.5f; float const EYE_TO_MOUTH_CHANCE = 0.25f; switch (_eyeContactTarget) { @@ -817,20 +828,21 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (isChildOfHead && !object->hasGrabs()) { // Cauterize or display children of head per head drawing state. updateChildCauterization(object, !_prevShouldDrawHead); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { updateChildCauterization(descendant, !_prevShouldDrawHead); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + updateChildCauterization(descendant, !_prevShouldDrawHead); + }); _cauterizedChildrenOfHead.insert(object); objectsToUncauterize.erase(object); } else if (objectsToUncauterize.find(object) == objectsToUncauterize.end()) { objectsToUncauterize.insert(object); - object->forEachDescendant( - [&](SpatiallyNestablePointer descendant) { objectsToUncauterize.insert(descendant); }); + object->forEachDescendant([&](SpatiallyNestablePointer descendant) { + objectsToUncauterize.insert(descendant); + }); } }); // Redisplay cauterized entities that are no longer children of the avatar. - for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); - cauterizedChild++) { + for (auto cauterizedChild = objectsToUncauterize.begin(); cauterizedChild != objectsToUncauterize.end(); cauterizedChild++) { updateChildCauterization(*cauterizedChild, false); } } @@ -874,7 +886,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { if (!_skeletonModel->hasSkeleton()) { // All the simulation that can be done has been done - getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 + getHead()->setPosition(getWorldPosition()); // so audio-position isn't 0,0,0 return; } @@ -955,7 +967,8 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { _hmdSensorMatrix = hmdSensorMatrix; auto newHmdSensorPosition = extractTranslation(hmdSensorMatrix); - if (newHmdSensorPosition != getHMDSensorPosition() && glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { + if (newHmdSensorPosition != getHMDSensorPosition() && + glm::length(newHmdSensorPosition) > MAX_HMD_ORIGIN_DISTANCE) { qWarning() << "Invalid HMD sensor position " << newHmdSensorPosition; // Ignore unreasonable HMD sensor data return; @@ -983,8 +996,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { glm::vec2 latestHipToHandController = _hipToHandController; int spine2Index = _skeletonModel->getRig().indexOfJoint("Spine2"); - if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && - !(spine2Index < 0)) { + if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid() && headPoseAvatarSpace.isValid() && !(spine2Index < 0)) { + glm::vec3 spine2Position = getAbsoluteJointTranslationInObjectFrame(spine2Index); glm::quat spine2Rotation = getAbsoluteJointRotationInObjectFrame(spine2Index); @@ -996,10 +1009,8 @@ glm::vec2 MyAvatar::computeHandAzimuth() const { // we need the old azimuth reading to prevent flipping the facing direction 180 // in the case where the hands go from being slightly less than 180 apart to slightly more than 180 apart. glm::vec2 oldAzimuthReading = _hipToHandController; - if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && - (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { - latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), - glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); + if ((glm::length(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)) > 0.0f) && (glm::length(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)) > 0.0f)) { + latestHipToHandController = lerp(glm::normalize(glm::vec2(rightHandSpine2Space.x, rightHandSpine2Space.z)), glm::normalize(glm::vec2(leftHandSpine2Space.x, leftHandSpine2Space.z)), HALFWAY); } else { latestHipToHandController = glm::vec2(0.0f, 1.0f); } @@ -1047,11 +1058,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV // update sensor to world matrix from current body position and hmd sensor. // This is so the correct camera can be used for rendering. void MyAvatar::updateSensorToWorldMatrix() { + // update the sensor mat so that the body position will end up in the desired // position when driven from the head. float sensorToWorldScale = getEyeHeight() / getUserEyeHeight(); - glm::mat4 desiredMat = - createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); + glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getWorldOrientation(), getWorldPosition()); _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix); bool hasSensorToWorldScaleChanged = false; @@ -1069,10 +1080,11 @@ void MyAvatar::updateSensorToWorldMatrix() { _sensorToWorldMatrixCache.set(_sensorToWorldMatrix); updateJointFromController(controller::Action::LEFT_HAND, _controllerLeftHandMatrixCache); updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache); - + if (hasSensorToWorldScaleChanged) { emit sensorToWorldScaleChanged(sensorToWorldScale); } + } // Update avatar head rotation with sensor data @@ -1097,7 +1109,8 @@ void MyAvatar::updateFromTrackers(float deltaTime) { const float TRACKER_YAW_TURN_SENSITIVITY = 0.5f; const float TRACKER_MIN_YAW_TURN = 15.0f; const float TRACKER_MAX_YAW_TURN = 50.0f; - if ((fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN)) { + if ( (fabs(estimatedRotation.y) > TRACKER_MIN_YAW_TURN) && + (fabs(estimatedRotation.y) < TRACKER_MAX_YAW_TURN) ) { if (estimatedRotation.y > 0.0f) { _bodyYawDelta += (estimatedRotation.y - TRACKER_MIN_YAW_TURN) * TRACKER_YAW_TURN_SENSITIVITY; } else { @@ -1112,6 +1125,7 @@ void MyAvatar::updateFromTrackers(float deltaTime) { // their head only 30 degrees or so, this may correspond to a 90 degree field of view. // Note that roll is magnified by a constant because it is not related to field of view. + Head* head = getHead(); if (hasHead || playing) { head->setDeltaPitch(estimatedRotation.x); @@ -1177,15 +1191,15 @@ controller::Pose MyAvatar::getRightHandTipPose() const { void MyAvatar::render(RenderArgs* renderArgs) { // don't render if we've been asked to disable local rendering if (!_shouldRender) { - return; // exit early + return; // exit early } Avatar::render(renderArgs); } void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), - Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideAnimation", Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideAnimation(url, fps, loop, firstFrame, lastFrame); @@ -1193,8 +1207,8 @@ void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float void MyAvatar::overrideHandAnimation(bool isLeft, const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), - Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); + QMetaObject::invokeMethod(this, "overrideHandAnimation", Q_ARG(bool, isLeft), Q_ARG(const QString&, url), Q_ARG(float, fps), + Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); return; } _skeletonModel->getRig().overrideHandAnimation(isLeft, url, fps, loop, firstFrame, lastFrame); @@ -1225,12 +1239,8 @@ QStringList MyAvatar::getAnimationRoles() { return _skeletonModel->getRig().getAnimationRoles(); } -void MyAvatar::overrideRoleAnimation(const QString& role, - const QString& url, - float fps, - bool loop, - float firstFrame, - float lastFrame) { +void MyAvatar::overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, + float firstFrame, float lastFrame) { if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "overrideRoleAnimation", Q_ARG(const QString&, role), Q_ARG(const QString&, url), Q_ARG(float, fps), Q_ARG(bool, loop), Q_ARG(float, firstFrame), Q_ARG(float, lastFrame)); @@ -1249,9 +1259,9 @@ void MyAvatar::restoreRoleAnimation(const QString& role) { void MyAvatar::saveAvatarUrl() { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } } @@ -1268,12 +1278,10 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) { uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1; while (settingsIndex <= maxIndex) { Setting::Handle idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "id", - QUuid()); + << QString::number(settingsIndex) << "id", QUuid()); _avatarEntityIDSettings.push_back(idHandle); Setting::Handle dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" - << QString::number(settingsIndex) << "properties", - QByteArray()); + << QString::number(settingsIndex) << "properties", QByteArray()); _avatarEntityDataSettings.push_back(dataHandle); settingsIndex++; } @@ -1291,10 +1299,10 @@ void MyAvatar::saveData() { // only save the fullAvatarURL if it has not been overwritten on command line // (so the overrideURL is not valid), or it was overridden _and_ we specified // --replaceAvatarURL (so _saveAvatarOverrideUrl is true) - if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid()) { - _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() - ? "" - : _fullAvatarURLFromPreferences.toString()); + if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { + _fullAvatarURLSetting.set(_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? + "" : + _fullAvatarURLFromPreferences.toString()); } _fullAvatarModelNameSetting.set(_fullAvatarModelName); @@ -1464,12 +1472,16 @@ void MyAvatar::setEnableInverseKinematics(bool isEnabled) { void MyAvatar::storeAvatarEntityDataPayload(const QUuid& entityID, const QByteArray& payload) { AvatarData::storeAvatarEntityDataPayload(entityID, payload); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToAddOrUpdate.push_back(entityID); + }); } void MyAvatar::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) { AvatarData::clearAvatarEntity(entityID, requiresRemovalFromTree); - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobsToDelete.push_back(entityID); }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobsToDelete.push_back(entityID); + }); } void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) const { @@ -1494,7 +1506,9 @@ void MyAvatar::sanitizeAvatarEntityProperties(EntityItemProperties& properties) void MyAvatar::handleChangedAvatarEntityData() { // NOTE: this is a per-frame update - if (getID().isNull() || getID() == AVATAR_SELF_ID || DependencyManager::get()->getSessionUUID() == QUuid()) { + if (getID().isNull() || + getID() == AVATAR_SELF_ID || + DependencyManager::get()->getSessionUUID() == QUuid()) { // wait until MyAvatar and this Node gets an ID before doing this. Otherwise, various things go wrong: // things get their parent fixed up from AVATAR_SELF_ID to a null uuid which means "no parent". return; @@ -1540,7 +1554,7 @@ void MyAvatar::handleChangedAvatarEntityData() { entitiesToUpdate = std::move(_entitiesToUpdate); }); - auto removeAllInstancesHelper = [](const QUuid& id, std::vector& v) { + auto removeAllInstancesHelper = [] (const QUuid& id, std::vector& v) { uint32_t i = 0; while (i < v.size()) { if (id == v[i]) { @@ -1568,7 +1582,9 @@ void MyAvatar::handleChangedAvatarEntityData() { // DELETE real entities for (const auto& id : entitiesToDelete) { - entityTree->withWriteLock([&] { entityTree->deleteEntity(id); }); + entityTree->withWriteLock([&] { + entityTree->deleteEntity(id); + }); } // ADD real entities @@ -1579,19 +1595,21 @@ void MyAvatar::handleChangedAvatarEntityData() { _avatarEntitiesLock.withReadLock([&] { AvatarEntityMap::iterator itr = _cachedAvatarEntityBlobs.find(id); if (itr == _cachedAvatarEntityBlobs.end()) { - blobFailed = true; // blob doesn't exist + blobFailed = true; // blob doesn't exist return; } std::lock_guard guard(_scriptEngineLock); if (!EntityItemProperties::blobToProperties(*_scriptEngine, itr.value(), properties)) { - blobFailed = true; // blob is corrupt + blobFailed = true; // blob is corrupt } }); if (blobFailed) { // remove from _cachedAvatarEntityBlobUpdatesToSkip just in case: // avoids a resource leak when blob updates to be skipped are never actually skipped // when the blob fails to result in a real EntityItem - _avatarEntitiesLock.withWriteLock([&] { removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); }); + _avatarEntitiesLock.withWriteLock([&] { + removeAllInstancesHelper(id, _cachedAvatarEntityBlobUpdatesToSkip); + }); continue; } sanitizeAvatarEntityProperties(properties); @@ -1661,7 +1679,7 @@ void MyAvatar::handleChangedAvatarEntityData() { _cachedAvatarEntityBlobUpdatesToSkip[i] = _cachedAvatarEntityBlobUpdatesToSkip.back(); _cachedAvatarEntityBlobUpdatesToSkip.pop_back(); skip = true; - break; // assume no duplicates + break; // assume no duplicates } else { ++i; } @@ -1725,7 +1743,9 @@ bool MyAvatar::updateStaleAvatarEntityBlobs() const { std::lock_guard guard(_scriptEngineLock); EntityItemProperties::propertiesToBlob(*_scriptEngine, getID(), properties, blob); } - _avatarEntitiesLock.withWriteLock([&] { _cachedAvatarEntityBlobs[id] = blob; }); + _avatarEntitiesLock.withWriteLock([&] { + _cachedAvatarEntityBlobs[id] = blob; + }); } } return true; @@ -1752,7 +1772,9 @@ AvatarEntityMap MyAvatar::getAvatarEntityData() const { // NOTE: the return value is expected to be a map of unfortunately-formatted-binary-blobs updateStaleAvatarEntityBlobs(); AvatarEntityMap result; - _avatarEntitiesLock.withReadLock([&] { result = _cachedAvatarEntityBlobs; }); + _avatarEntitiesLock.withReadLock([&] { + result = _cachedAvatarEntityBlobs; + }); return result; } @@ -1853,9 +1875,7 @@ void MyAvatar::avatarEntityDataToJson(QJsonObject& root) const { AvatarEntityMap::const_iterator itr = _cachedAvatarEntityBlobs.begin(); while (itr != _cachedAvatarEntityBlobs.end()) { QVariantMap entityData; - QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() - ? _avatarEntityForRecording.values()[entityCount++] - : itr.key(); + QUuid id = _avatarEntityForRecording.size() == _cachedAvatarEntityBlobs.size() ? _avatarEntityForRecording.values()[entityCount++] : itr.key(); entityData.insert("id", id); entityData.insert("properties", itr.value().toBase64()); avatarEntityJson.push_back(QVariant(entityData).toJsonObject()); @@ -1885,7 +1905,7 @@ void MyAvatar::loadData() { loadAvatarEntityDataFromSettings(); // Flying preferences must be loaded before calling setFlyingEnabled() - Setting::Handle firstRunVal{ Settings::firstRun, true }; + Setting::Handle firstRunVal { Settings::firstRun, true }; setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get()); setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get()); setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get()); @@ -1911,7 +1931,7 @@ void MyAvatar::loadData() { setUserRecenterModel(stringToUserRecenterModel(_userRecenterModelSetting.get(USER_RECENTER_MODEL_AUTO))); setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible)); - _follow.setToggleHipsFollowing(Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); + _follow.setToggleHipsFollowing (Menu::getInstance()->isOptionChecked(MenuOption::ToggleHipsFollowing)); setEnableDebugDrawBaseOfSupport(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawBaseOfSupport)); setEnableDebugDrawDefaultPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawDefaultPose)); setEnableDebugDrawAnimPose(Menu::getInstance()->isOptionChecked(MenuOption::AnimDebugDrawAnimPose)); @@ -1939,7 +1959,7 @@ void MyAvatar::loadAvatarEntityDataFromSettings() { _entitiesToAdd.reserve(numEntities); // TODO: build map between old and new IDs so we can restitch parent-child relationships for (int i = 0; i < numEntities; i++) { - QUuid id = QUuid::createUuid(); // generate a new ID + QUuid id = QUuid::createUuid(); // generate a new ID _cachedAvatarEntityBlobs[id] = _avatarEntityDataSettings[i].get(); _entitiesToAdd.push_back(id); // this blob is the "authoritative source" for this AvatarEntity and we want to avoid overwriting it @@ -2009,9 +2029,10 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& return attachment; } + int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size(); + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); } @@ -2025,12 +2046,8 @@ ScriptAvatarData* MyAvatar::getTargetAvatar() const { } } -static float lookAtCostFunction(const glm::vec3& myForward, - const glm::vec3& myPosition, - const glm::vec3& otherForward, - const glm::vec3& otherPosition, - bool otherIsTalking, - bool lookingAtOtherAlready) { +static float lookAtCostFunction(const glm::vec3& myForward, const glm::vec3& myPosition, const glm::vec3& otherForward, const glm::vec3& otherPosition, + bool otherIsTalking, bool lookingAtOtherAlready) { const float DISTANCE_FACTOR = 3.14f; const float MY_ANGLE_FACTOR = 1.0f; const float OTHER_ANGLE_FACTOR = 1.0f; @@ -2038,7 +2055,7 @@ static float lookAtCostFunction(const glm::vec3& myForward, const float LOOKING_AT_OTHER_ALREADY_TERM = lookingAtOtherAlready ? -0.2f : 0.0f; const float GREATEST_LOOKING_AT_DISTANCE = 10.0f; // meters - const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. + const float MAX_MY_ANGLE = PI / 8.0f; // 22.5 degrees, Don't look too far away from the head facing. const float MAX_OTHER_ANGLE = (3.0f * PI) / 4.0f; // 135 degrees, Don't stare at the back of another avatars head. glm::vec3 d = otherPosition - myPosition; @@ -2050,8 +2067,11 @@ static float lookAtCostFunction(const glm::vec3& myForward, if (distance > GREATEST_LOOKING_AT_DISTANCE || myAngle > MAX_MY_ANGLE || otherAngle > MAX_OTHER_ANGLE) { return FLT_MAX; } else { - return (DISTANCE_FACTOR * distance + MY_ANGLE_FACTOR * myAngle + OTHER_ANGLE_FACTOR * otherAngle + - OTHER_IS_TALKING_TERM + LOOKING_AT_OTHER_ALREADY_TERM); + return (DISTANCE_FACTOR * distance + + MY_ANGLE_FACTOR * myAngle + + OTHER_ANGLE_FACTOR * otherAngle + + OTHER_IS_TALKING_TERM + + LOOKING_AT_OTHER_ALREADY_TERM); } } @@ -2074,8 +2094,7 @@ void MyAvatar::computeMyLookAtTarget(const AvatarHash& hash) { const float TIME_WITHOUT_TALKING_THRESHOLD = 1.0f; bool otherIsTalking = avatar->getHead()->getTimeWithoutTalking() <= TIME_WITHOUT_TALKING_THRESHOLD; bool lookingAtOtherAlready = _lookAtTargetAvatar.lock().get() == avatar.get(); - float cost = - lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); + float cost = lookAtCostFunction(myForward, myPosition, otherForward, otherPosition, otherIsTalking, lookingAtOtherAlready); if (cost < bestCost) { bestCost = cost; bestAvatar = avatar; @@ -2096,8 +2115,9 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { std::shared_ptr avatar = std::static_pointer_cast(avatarData); if (!avatar->isMyAvatar() && avatar->isInitialized()) { if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) { + // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face. - glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. + glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar. // The camera isn't at the point midway between the avatar eyes. (Even without an HMD, the head can be offset a bit.) // Let's get everything to world space: @@ -2108,12 +2128,12 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { // (We will be adding that offset to the camera position, after making some other adjustments.) glm::vec3 gazeOffset = lookAtPosition - getHead()->getEyePosition(); - ViewFrustum viewFrustum; - qApp->copyViewFrustum(viewFrustum); + ViewFrustum viewFrustum; + qApp->copyViewFrustum(viewFrustum); - glm::vec3 viewPosition = viewFrustum.getPosition(); + glm::vec3 viewPosition = viewFrustum.getPosition(); #if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA - viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; + viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f; #endif // scale gazeOffset by IPD, if wearing an HMD. if (qApp->isHMDMode()) { @@ -2151,6 +2171,7 @@ void MyAvatar::snapOtherAvatarLookAtTargetsToMe(const AvatarHash& hash) { } void MyAvatar::updateLookAtTargetAvatar() { + // The AvatarManager is a mutable class shared by many threads. We make a thread-safe deep copy of it, // to avoid having to hold a lock while we iterate over all the avatars within. AvatarHash hash = DependencyManager::get()->getHashCopy(); @@ -2264,7 +2285,8 @@ void MyAvatar::setJointTranslation(int index, const glm::vec3& translation) { } default: { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); + QMetaObject::invokeMethod(this, "setJointTranslation", + Q_ARG(int, index), Q_ARG(const glm::vec3&, translation)); return; } // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority @@ -2303,7 +2325,9 @@ void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, cons Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointData(index, rotation, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointData(index, rotation, translation); + }); } void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) { @@ -2311,7 +2335,9 @@ void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointRotation(index, rotation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointRotation(index, rotation); + }); } void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) { @@ -2319,7 +2345,9 @@ void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& transla QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { setJointTranslation(index, translation); }); + writeLockWithNamedJointIndex(name, [&](int index) { + setJointTranslation(index, translation); + }); } void MyAvatar::clearJointData(const QString& name) { @@ -2327,7 +2355,9 @@ void MyAvatar::clearJointData(const QString& name) { QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name)); return; } - writeLockWithNamedJointIndex(name, [&](int index) { clearJointData(index); }); + writeLockWithNamedJointIndex(name, [&](int index) { + clearJointData(index); + }); } void MyAvatar::clearJointsData() { @@ -2362,36 +2392,36 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelLoaded = false; std::shared_ptr skeletonConnection = std::make_shared(); - *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, - [this, skeletonModelChangeCount, skeletonConnection]() { - if (skeletonModelChangeCount == _skeletonModelChangeCount) { - if (_fullAvatarModelName.isEmpty()) { - // Store the FST file name into preferences - const auto& mapping = _skeletonModel->getGeometry()->getMapping(); - if (mapping.value("name").isValid()) { - _fullAvatarModelName = mapping.value("name").toString(); - } - } + *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() { + if (skeletonModelChangeCount == _skeletonModelChangeCount) { - initHeadBones(); - _skeletonModel->setCauterizeBoneSet(_headBoneSet); - _fstAnimGraphOverrideUrl = - _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); - initAnimGraph(); - initFlowFromFST(); + if (_fullAvatarModelName.isEmpty()) { + // Store the FST file name into preferences + const auto& mapping = _skeletonModel->getGeometry()->getMapping(); + if (mapping.value("name").isValid()) { + _fullAvatarModelName = mapping.value("name").toString(); + } + } - _skeletonModelLoaded = true; - } - QObject::disconnect(*skeletonConnection); - }); + initHeadBones(); + _skeletonModel->setCauterizeBoneSet(_headBoneSet); + _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl(); + initAnimGraph(); + initFlowFromFST(); + _skeletonModelLoaded = true; + } + QObject::disconnect(*skeletonConnection); + }); + saveAvatarUrl(); emit skeletonChanged(); } bool isWearableEntity(const EntityItemPointer& entity) { - return entity->isVisible() && (entity->getParentID() == DependencyManager::get()->getSessionUUID() || - entity->getParentID() == AVATAR_SELF_ID); + return entity->isVisible() + && (entity->getParentID() == DependencyManager::get()->getSessionUUID() + || entity->getParentID() == AVATAR_SELF_ID); } void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { @@ -2415,7 +2445,9 @@ void MyAvatar::removeWornAvatarEntity(const EntityItemID& entityID) { void MyAvatar::clearWornAvatarEntities() { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (auto entityID : avatarEntityIDs) { removeWornAvatarEntity(entityID); } @@ -2441,7 +2473,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto entity = entityTree->findEntityByID(entityID); if (!entity) { @@ -2466,6 +2500,7 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { return avatarEntitiesData; } + void MyAvatar::resetFullAvatarURL() { auto lastAvatarURL = getFullAvatarURLFromPreferences(); auto lastAvatarName = getFullAvatarModelName(); @@ -2474,8 +2509,11 @@ void MyAvatar::resetFullAvatarURL() { } void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) { + if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", Q_ARG(const QUrl&, fullAvatarURL), Q_ARG(const QString&, modelName)); + BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL", + Q_ARG(const QUrl&, fullAvatarURL), + Q_ARG(const QString&, modelName)); return; } @@ -2529,7 +2567,7 @@ controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action act if (iter != _controllerPoseMap.end()) { return iter->second; } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2538,7 +2576,7 @@ controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action acti if (pose.valid) { return pose.transform(getSensorToWorldMatrix()); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2548,7 +2586,7 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getWorldOrientation(), getWorldPosition())); return pose.transform(invAvatarMatrix); } else { - return controller::Pose(); // invalid pose + return controller::Pose(); // invalid pose } } @@ -2570,7 +2608,7 @@ void MyAvatar::updateMotors() { float verticalMotorTimescale; if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; } else { @@ -2580,7 +2618,7 @@ void MyAvatar::updateMotors() { if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) { if (_characterController.getState() == CharacterController::State::Hover || - _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { + _characterController.computeCollisionMask() == BULLET_COLLISION_MASK_COLLISIONLESS) { motorRotation = getMyHead()->getHeadOrientation(); } else { // non-hovering = walking: follow camera twist about vertical but not lift @@ -2588,15 +2626,14 @@ void MyAvatar::updateMotors() { // however, we need to perform the decomposition in the avatar-frame // using the local UP axis and then transform back into world-frame glm::quat orientation = getWorldOrientation(); - glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame + glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame glm::quat liftRotation; swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation); motorRotation = orientation * motorRotation; } if (_isPushing || _isBraking || !_isBeingPushed) { - _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_actionMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } else { // _isBeingPushed must be true --> disable action motor by giving it a long timescale, // otherwise it's attempt to "stand in in place" could defeat scripted motor/thrusts @@ -2616,8 +2653,7 @@ void MyAvatar::updateMotors() { _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale); } else { // dynamic mode - _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, - verticalMotorTimescale); + _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale); } } @@ -2722,7 +2758,8 @@ void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) { void MyAvatar::setScriptedMotorTimescale(float timescale) { // we clamp the timescale on the large side (instead of just the low side) to prevent // obnoxiously large values from introducing NaN into avatar's velocity - _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, DEFAULT_SCRIPTED_MOTOR_TIMESCALE); + _scriptedMotorTimescale = glm::clamp(timescale, MIN_SCRIPTED_MOTOR_TIMESCALE, + DEFAULT_SCRIPTED_MOTOR_TIMESCALE); } void MyAvatar::setScriptedMotorFrame(QString frame) { @@ -2763,18 +2800,21 @@ SharedSoundPointer MyAvatar::getCollisionSound() { return _collisionSound; } -void MyAvatar::attach(const QString& modelURL, - const QString& jointName, - const glm::vec3& translation, - const glm::quat& rotation, - float scale, - bool isSoft, - bool allowDuplicates, - bool useSaved) { +void MyAvatar::attach(const QString& modelURL, const QString& jointName, + const glm::vec3& translation, const glm::quat& rotation, + float scale, bool isSoft, + 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 glm::quat&, rotation), Q_ARG(float, scale), - Q_ARG(bool, isSoft), Q_ARG(bool, allowDuplicates), Q_ARG(bool, useSaved)); + BLOCKING_INVOKE_METHOD(this, "attach", + 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), + Q_ARG(bool, allowDuplicates), + Q_ARG(bool, useSaved) + ); return; } AttachmentData data; @@ -2792,7 +2832,10 @@ void MyAvatar::attach(const QString& modelURL, void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachOne", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachOne", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2804,7 +2847,10 @@ void MyAvatar::detachOne(const QString& modelURL, const QString& jointName) { void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "detachAll", Q_ARG(const QString&, modelURL), Q_ARG(const QString&, jointName)); + BLOCKING_INVOKE_METHOD(this, "detachAll", + Q_ARG(const QString&, modelURL), + Q_ARG(const QString&, jointName) + ); return; } QUuid entityID; @@ -2816,7 +2862,8 @@ void MyAvatar::detachAll(const QString& modelURL, const QString& jointName) { void MyAvatar::setAttachmentData(const QVector& attachmentData) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentData", Q_ARG(const QVector&, attachmentData)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentData", + Q_ARG(const QVector&, attachmentData)); return; } std::vector newEntitiesProperties; @@ -2839,10 +2886,12 @@ void MyAvatar::setAttachmentData(const QVector& attachmentData) emit attachmentsChanged(); } -QVector MyAvatar::getAttachmentData() const { +QVector MyAvatar::getAttachmentData() const { QVector attachmentData; QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto properties = DependencyManager::get()->getEntityProperties(entityID); AttachmentData data = entityPropertiesToAttachmentData(properties); @@ -2861,7 +2910,8 @@ QVariantList MyAvatar::getAttachmentsVariant() const { void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", Q_ARG(const QVariantList&, variant)); + BLOCKING_INVOKE_METHOD(this, "setAttachmentsVariant", + Q_ARG(const QVariantList&, variant)); return; } QVector newAttachments; @@ -2872,12 +2922,14 @@ void MyAvatar::setAttachmentsVariant(const QVariantList& variant) { newAttachments.append(attachment); } } - setAttachmentData(newAttachments); + setAttachmentData(newAttachments); } bool MyAvatar::findAvatarEntity(const QString& modelURL, const QString& jointName, QUuid& entityID) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); for (const auto& entityID : avatarEntityIDs) { auto props = DependencyManager::get()->getEntityProperties(entityID); if (props.getModelURL() == modelURL && @@ -2978,7 +3030,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) { emit animGraphUrlChanged(url); destroyAnimGraph(); - _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. + _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render. _currentAnimGraphUrl.set(url); _skeletonModel->getRig().initAnimGraph(url); @@ -3011,16 +3063,18 @@ void MyAvatar::destroyAnimGraph() { } void MyAvatar::animGraphLoaded() { - _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. - updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes + _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation.. + updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes _isAnimatingScale = true; _cauterizationNeedsUpdate = true; disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded())); } void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { + Avatar::postUpdate(deltaTime, scene); if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) { + auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton(); // the rig is in the skeletonModel frame @@ -3028,8 +3082,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { if (_enableDebugDrawDefaultPose && animSkeleton) { glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f); - AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, - _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); + AnimDebugDraw::getInstance().addAbsolutePoses("myAvatarDefaultPoses", animSkeleton, _skeletonModel->getRig().getAbsoluteDefaultPoses(), xform, gray); } if (_enableDebugDrawAnimPose && animSkeleton) { @@ -3050,15 +3103,13 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND); if (leftHandPose.isValid()) { - DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), - glm::vec4(1)); + DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("leftHandController"); } if (rightHandPose.isValid()) { - DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), - rightHandPose.getTranslation(), glm::vec4(1)); + DebugDraw::getInstance().addMarker("rightHandController", rightHandPose.getRotation(), rightHandPose.getTranslation(), glm::vec4(1)); } else { DebugDraw::getInstance().removeMarker("rightHandController"); } @@ -3075,9 +3126,14 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose rigToWorldPose(glm::vec3(1.0f), getWorldOrientation() * Quaternions::Y_180, getWorldPosition()); const int NUM_DEBUG_COLORS = 8; const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = { - glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), - glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), - glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? + glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.0f, 0.0f, 1.0f), + glm::vec4(0.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), + glm::vec4(0.25f, 1.0f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.25f, 1.0f, 1.0f), + glm::vec4(1.0f, 0.65f, 0.0f, 1.0f) // Orange you glad I added this color? }; if (_skeletonModel && _skeletonModel->isLoaded()) { @@ -3088,7 +3144,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { AnimPose jointPose; rig.getAbsoluteJointPoseInRigFrame(i, jointPose); const AnimPose pose = rigToWorldPose * jointPose; - auto& multiSphere = _multiSphereShapes[i]; + auto &multiSphere = _multiSphereShapes[i]; auto debugLines = multiSphere.getDebugLines(); DebugDraw::getInstance().drawRays(debugLines, DEBUG_COLORS[i % NUM_DEBUG_COLORS], pose.trans(), pose.rot()); } @@ -3098,6 +3154,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) { } void MyAvatar::preDisplaySide(const RenderArgs* renderArgs) { + // toggle using the cauterizedBones depending on where the camera is and the rendering pass type. const bool shouldDrawHead = shouldRenderHead(renderArgs); if (shouldDrawHead != _prevShouldDrawHead) { @@ -3142,7 +3199,7 @@ int MyAvatar::sendAvatarDataPacket(bool sendAll) { // Compute the next send window based on how much data we sent and what // data rate we're trying to max at. - milliseconds timeUntilNextSend{ bytesSent / maxDataRateBytesPerMilliseconds }; + milliseconds timeUntilNextSend { bytesSent / maxDataRateBytesPerMilliseconds }; _nextTraitsSendWindow += timeUntilNextSend; // Don't let the next send window lag behind if we're not sending a lot of data. @@ -3227,6 +3284,7 @@ void MyAvatar::setRotationThreshold(float angleRadians) { } void MyAvatar::updateOrientation(float deltaTime) { + // Smoothly rotate body with arrow keys float targetSpeed = getDriveKey(YAW) * _yawSpeed; if (targetSpeed != 0.0f) { @@ -3265,8 +3323,8 @@ void MyAvatar::updateOrientation(float deltaTime) { } // Use head/HMD roll to turn while flying, but not when standing still. - if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && - _hmdRollControlEnabled && hasDriveInput()) { + if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) { + // Turn with head roll. const float MIN_CONTROL_SPEED = 2.0f * getSensorToWorldScale(); // meters / sec const glm::vec3 characterForward = getWorldOrientation() * Vectors::UNIT_NEG_Z; @@ -3274,6 +3332,7 @@ void MyAvatar::updateOrientation(float deltaTime) { // only enable roll-turns if we are moving forward or backward at greater then MIN_CONTROL_SPEED if (fabsf(forwardSpeed) >= MIN_CONTROL_SPEED) { + float direction = forwardSpeed > 0.0f ? 1.0f : -1.0f; float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; @@ -3320,8 +3379,8 @@ void MyAvatar::updateOrientation(float deltaTime) { head->setBaseRoll(ROLL(euler)); } else { head->setBaseYaw(0.0f); - head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + - getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); + head->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime + + getDriveKey(DELTA_PITCH) * _pitchSpeed / PITCH_SPEED_DEFAULT); head->setBaseRoll(0.0f); } } @@ -3331,15 +3390,20 @@ float MyAvatar::calculateGearedSpeed(const float driveKey) { float sign = (driveKey < 0.0f) ? -1.0f : 1.0f; if (absDriveKey > getDriveGear5()) { return sign * 1.0f; - } else if (absDriveKey > getDriveGear4()) { + } + else if (absDriveKey > getDriveGear4()) { return sign * 0.8f; - } else if (absDriveKey > getDriveGear3()) { + } + else if (absDriveKey > getDriveGear3()) { return sign * 0.6f; - } else if (absDriveKey > getDriveGear2()) { + } + else if (absDriveKey > getDriveGear2()) { return sign * 0.4f; - } else if (absDriveKey > getDriveGear1()) { + } + else if (absDriveKey > getDriveGear1()) { return sign * 0.2f; - } else { + } + else { return sign * 0.0f; } } @@ -3371,10 +3435,8 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig case LocomotionControlsMode::CONTROLS_ANALOG: case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * - ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * - ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; + glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; + glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; direction = scaledForward + scaledRight; return direction; } else { @@ -3396,7 +3458,7 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig } } -glm::vec3 MyAvatar::calculateScaledDirection() { +glm::vec3 MyAvatar::calculateScaledDirection(){ CharacterController::State state = _characterController.getState(); // compute action input @@ -3452,8 +3514,8 @@ glm::vec3 MyAvatar::calculateScaledDirection() { void MyAvatar::updateActionMotor(float deltaTime) { bool thrustIsPushing = (glm::length2(_thrust) > EPSILON); - bool scriptedMotorIsPushing = - (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; + bool scriptedMotorIsPushing = (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) + && _scriptedMotorTimescale < MAX_CHARACTER_MOTOR_TIMESCALE; _isBeingPushed = thrustIsPushing || scriptedMotorIsPushing; if (_isPushing || _isBeingPushed) { // we don't want the motor to brake if a script is pushing the avatar around @@ -3483,7 +3545,7 @@ void MyAvatar::updateActionMotor(float deltaTime) { float motorSpeed = glm::length(_actionMotorVelocity); float finalMaxMotorSpeed = sensorToWorldScale * DEFAULT_AVATAR_MAX_FLYING_SPEED * _walkSpeedScalar; - float speedGrowthTimescale = 2.0f; + float speedGrowthTimescale = 2.0f; float speedIncreaseFactor = 1.8f * _walkSpeedScalar; motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor; const float maxBoostSpeed = sensorToWorldScale * MAX_BOOST_SPEED; @@ -3523,7 +3585,7 @@ void MyAvatar::updatePosition(float deltaTime) { float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale; vec3 velocity = getWorldVelocity(); float speed2 = glm::length2(velocity); - const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s + const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED; if (_moving) { // scan for walkability @@ -3548,17 +3610,12 @@ void MyAvatar::updateViewBoom() { } } -void MyAvatar::updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency) { +void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) { // COLLISION SOUND API in Audio has been removed } -bool findAvatarAvatarPenetration(const glm::vec3 positionA, - float radiusA, - float heightA, - const glm::vec3 positionB, - float radiusB, - float heightB, - glm::vec3& penetration) { +bool findAvatarAvatarPenetration(const glm::vec3 positionA, float radiusA, float heightA, + const glm::vec3 positionB, float radiusB, float heightB, glm::vec3& penetration) { glm::vec3 positionBA = positionB - positionA; float xzDistance = sqrt(positionBA.x * positionBA.x + positionBA.z * positionBA.z); if (xzDistance < (radiusA + radiusB)) { @@ -3620,7 +3677,9 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) { EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr; if (entityTree) { QList avatarEntityIDs; - _avatarEntitiesLock.withReadLock([&] { avatarEntityIDs = _packedAvatarEntityData.keys(); }); + _avatarEntitiesLock.withReadLock([&] { + avatarEntityIDs = _packedAvatarEntityData.keys(); + }); bool sendPackets = !DependencyManager::get()->getSessionUUID().isNull(); EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); entityTree->withWriteLock([&] { @@ -3764,18 +3823,16 @@ void MyAvatar::goToLocation(const QVariant& propertiesVar) { } void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, + bool hasOrientation, const glm::quat& newOrientation, bool shouldFaceLocation) { _goToFeetAjustment = true; goToLocation(newPosition, hasOrientation, newOrientation, shouldFaceLocation); } void MyAvatar::goToLocation(const glm::vec3& newPosition, - bool hasOrientation, - const glm::quat& newOrientation, - bool shouldFaceLocation, - bool withSafeLanding) { + bool hasOrientation, const glm::quat& newOrientation, + bool shouldFaceLocation, bool withSafeLanding) { + // Most cases of going to a place or user go through this now. Some possible improvements to think about in the future: // - It would be nice if this used the same teleport steps and smoothing as in the teleport.js script, as long as it // still worked if the target is in the air. @@ -3789,16 +3846,16 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, // compute the position (e.g., so that if I'm on stage, going to me would compute an available seat in the audience rather than // being in my face on-stage). Note that this could work for going to an entity as well as to a person. - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " << newPosition.y << ", " - << newPosition.z; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", " + << newPosition.y << ", " << newPosition.z; _goToPending = true; _goToPosition = newPosition; _goToSafe = withSafeLanding; _goToOrientation = getWorldOrientation(); if (hasOrientation) { - qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " << newOrientation.x << ", " - << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; + qCDebug(interfaceapp).nospace() << "MyAvatar goToLocation - new orientation is " + << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w; // orient the user to face the target glm::quat quatOrientation = cancelOutRollAndPitch(newOrientation); @@ -3817,7 +3874,7 @@ void MyAvatar::goToLocation(const glm::vec3& newPosition, emit transformChanged(); } -void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. +void MyAvatar::goToLocationAndEnableCollisions(const glm::vec3& position) { // See use case in safeLanding. goToLocation(position); QMetaObject::invokeMethod(this, "setCollisionsEnabled", Qt::QueuedConnection, Q_ARG(bool, true)); } @@ -3843,29 +3900,29 @@ bool MyAvatar::safeLanding(const glm::vec3& position) { } if (!getCollisionsEnabled()) { goToLocation(better); // recurses on next update - } else { // If you try to go while stuck, physics will keep you stuck. + } else { // If you try to go while stuck, physics will keep you stuck. setCollisionsEnabled(false); // Don't goToLocation just yet. Yield so that physics can act on the above. - QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", - Qt::QueuedConnection, // The equivalent of javascript nextTick - Q_ARG(glm::vec3, better)); - } - return true; + QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick + Q_ARG(glm::vec3, better)); + } + return true; } // If position is not reliably safe from being stuck by physics, answer true and place a candidate better position in betterPositionOut. bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& betterPositionOut) { + // We begin with utilities and tests. The Algorithm in four parts is below. // NOTE: we use estimated avatar height here instead of the bullet capsule halfHeight, because // the domain avatar height limiting might not have taken effect yet on the actual bullet shape. auto halfHeight = 0.5f * getHeight(); if (halfHeight == 0) { - return false; // zero height avatar + return false; // zero height avatar } auto entityTree = DependencyManager::get()->getTree(); if (!entityTree) { - return false; // no entity tree + return false; // no entity tree } // More utilities. const auto capsuleCenter = positionIn; @@ -3877,26 +3934,21 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette betterPositionOut = upperIntersection + (up * halfHeight); return true; }; - auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, - EntityItemID& entityIdOut, glm::vec3& normalOut) { + auto findIntersection = [&](const glm::vec3& startPointIn, const glm::vec3& directionIn, glm::vec3& intersectionOut, EntityItemID& entityIdOut, glm::vec3& normalOut) { OctreeElementPointer element; float distance; BoxFace face; - const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? + const auto lockType = Octree::Lock; // Should we refactor to take a lock just once? bool* accurateResult = NULL; // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable. // What we really want is to use the collision hull! // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders QVariantMap extraInfo; - EntityItemID entityID = - entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, - PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | - PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) | - PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | - PickFilter::getBitMask( - PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities - element, distance, face, normalOut, extraInfo, lockType, accurateResult); + EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore, + PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE) + | PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES)), // exclude Local entities + element, distance, face, normalOut, extraInfo, lockType, accurateResult); if (entityID.isNull()) { return false; } @@ -3911,12 +3963,12 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // We currently believe that physics will reliably push us out if our feet are embedded, // as long as our capsule center is out and there's room above us. Here we have those // conditions, so no need to check our feet below. - return false; // nothing above + return false; // nothing above } if (!findIntersection(capsuleCenter, down, lowerIntersection, lowerId, lowerNormal)) { // Our head may be embedded, but our center is out and there's room below. See corresponding comment above. - return false; // nothing below + return false; // nothing below } // See if we have room between entities above and below, but that we are not contained. @@ -3924,8 +3976,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette // I.e., we are in a clearing between two objects. if (isDown(upperNormal) && isUp(lowerNormal)) { auto spaceBetween = glm::distance(upperIntersection, lowerIntersection); - const float halfHeightFactor = - 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. + const float halfHeightFactor = 2.25f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. if (spaceBetween > (halfHeightFactor * halfHeight)) { // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. @@ -3937,7 +3988,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette ignore.push_back(upperId); if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! - return false; // enough room + return false; // enough room } if (isUp(upperNormal)) { // This new intersection is the top surface of an entity that we have not yet seen, which means we're contained within it. @@ -3952,18 +4003,19 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette } } - include.push_back(upperId); // We're now looking for the intersection from above onto this entity. + include.push_back(upperId); // We're now looking for the intersection from above onto this entity. const float big = (float)TREE_SCALE; const auto skyHigh = up * big; auto fromAbove = capsuleCenter + skyHigh; if (!findIntersection(fromAbove, down, upperIntersection, upperId, upperNormal)) { - return false; // Unable to find a landing + return false; // Unable to find a landing } // Our arbitrary rule is to always go up. There's no need to look down or sideways for a "closer" safe candidate. return mustMove(); } void MyAvatar::updateMotionBehaviorFromMenu() { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "updateMotionBehaviorFromMenu"); return; @@ -4047,7 +4099,7 @@ int MyAvatar::getMovementReference() { return _movementReference; } -void MyAvatar::setControlSchemeIndex(int index) { +void MyAvatar::setControlSchemeIndex(int index){ if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setControlSchemeIndex", Q_ARG(int, index)); return; @@ -4065,8 +4117,7 @@ void MyAvatar::setDriveGear1(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear1", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear1 = (shiftPoint < _driveGear2) ? shiftPoint : _driveGear1; } @@ -4087,8 +4138,7 @@ void MyAvatar::setDriveGear2(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear2", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear2 = (shiftPoint < _driveGear3 && shiftPoint >= _driveGear1) ? shiftPoint : _driveGear2; } @@ -4109,8 +4159,7 @@ void MyAvatar::setDriveGear3(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear3", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear3 = (shiftPoint < _driveGear4 && shiftPoint >= _driveGear2) ? shiftPoint : _driveGear3; } @@ -4131,8 +4180,7 @@ void MyAvatar::setDriveGear4(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear4", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear4 = (shiftPoint < _driveGear5 && shiftPoint >= _driveGear3) ? shiftPoint : _driveGear4; } @@ -4153,8 +4201,7 @@ void MyAvatar::setDriveGear5(float shiftPoint) { QMetaObject::invokeMethod(this, "setDriveGear5", Q_ARG(float, shiftPoint)); return; } - if (shiftPoint > 1.0f || shiftPoint < 0.0f) - return; + if (shiftPoint > 1.0f || shiftPoint < 0.0f) return; _driveGear5 = (shiftPoint > _driveGear4) ? shiftPoint : _driveGear5; } @@ -4180,6 +4227,7 @@ float MyAvatar::getAvatarScale() { } void MyAvatar::setAvatarScale(float val) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val)); return; @@ -4189,6 +4237,7 @@ void MyAvatar::setAvatarScale(float val) { } void MyAvatar::setCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4204,6 +4253,7 @@ bool MyAvatar::getCollisionsEnabled() { } void MyAvatar::setOtherAvatarsCollisionsEnabled(bool enabled) { + if (QThread::currentThread() != thread()) { QMetaObject::invokeMethod(this, "setOtherAvatarsCollisionsEnabled", Q_ARG(bool, enabled)); return; @@ -4359,7 +4409,7 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { // AJT: TODO: can remove this Y_180, if we remove the higher level one. glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead); - glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; + glm::vec3 neckToRoot = headOrientationYawOnly * Quaternions::Y_180 * -localNeck; float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight(); glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot); @@ -4395,8 +4445,7 @@ glm::mat4 MyAvatar::getSpine2RotationRigSpace() const { spine2UpRigSpace = glm::vec3(0.0f, 1.0f, 0.0f); } generateBasisVectors(spine2UpRigSpace, spine2FwdRigSpace, u, v, w); - glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), - glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); + glm::mat4 spine2RigSpace(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)); return spine2RigSpace; } @@ -4453,7 +4502,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { QString name; float weight; glm::vec3 position; - JointMass(){}; + JointMass() {}; JointMass(QString n, float w, glm::vec3 p) { name = n; weight = w; @@ -4474,14 +4523,12 @@ glm::vec3 MyAvatar::computeCounterBalance() { tposeHead = getAbsoluteDefaultJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgHeadMass.name)); } if (_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name) != -1) { - cgLeftHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); + cgLeftHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgLeftHandMass.name)); } else { cgLeftHandMass.position = DEFAULT_AVATAR_LEFTHAND_POS; } if (_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name) != -1) { - cgRightHandMass.position = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); + cgRightHandMass.position = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint(cgRightHandMass.name)); } else { cgRightHandMass.position = DEFAULT_AVATAR_RIGHTHAND_POS; } @@ -4493,8 +4540,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { } // find the current center of gravity position based on head and hand moments - glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + - (cgRightHandMass.weight * cgRightHandMass.position); + glm::vec3 sumOfMoments = (cgHeadMass.weight * cgHeadMass.position) + (cgLeftHandMass.weight * cgLeftHandMass.position) + (cgRightHandMass.weight * cgRightHandMass.position); float totalMass = cgHeadMass.weight + cgLeftHandMass.weight + cgRightHandMass.weight; glm::vec3 currentCg = (1.0f / totalMass) * sumOfMoments; @@ -4534,6 +4580,7 @@ glm::vec3 MyAvatar::computeCounterBalance() { // headOrientation, headPosition and hipsPosition are in avatar space // returns the matrix of the hips in Avatar space static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headPosition, glm::vec3 hipsPosition) { + glm::quat bodyOrientation = computeBodyFacingFromHead(headOrientation, Vectors::UNIT_Y); const float MIX_RATIO = 0.3f; @@ -4543,7 +4590,10 @@ static glm::mat4 computeNewHipsMatrix(glm::quat headOrientation, glm::vec3 headP glm::vec3 spineVec = headPosition - hipsPosition; glm::vec3 u, v, w; generateBasisVectors(glm::normalize(spineVec), hipsFacing, u, v, w); - return glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(hipsPosition, 1.0f)); + return glm::mat4(glm::vec4(w, 0.0f), + glm::vec4(u, 0.0f), + glm::vec4(v, 0.0f), + glm::vec4(hipsPosition, 1.0f)); } static void drawBaseOfSupport(float baseOfSupportScale, float footLocal, glm::mat4 avatarToWorld) { @@ -4584,8 +4634,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { if (_enableDebugDrawBaseOfSupport) { float scaleBaseOfSupport = getUserEyeHeight() / DEFAULT_AVATAR_EYE_HEIGHT; - glm::vec3 rightFootPositionLocal = - getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); + glm::vec3 rightFootPositionLocal = getAbsoluteJointTranslationInObjectFrame(_skeletonModel->getRig().indexOfJoint("RightFoot")); drawBaseOfSupport(scaleBaseOfSupport, rightFootPositionLocal.y, avatarToWorldMat); } @@ -4593,8 +4642,7 @@ glm::mat4 MyAvatar::deriveBodyUsingCgModel() { glm::vec3 cgHipsPosition = computeCounterBalance(); // find the new hips rotation using the new head-hips axis as the up axis - glm::mat4 avatarHipsMat = - computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); + glm::mat4 avatarHipsMat = computeNewHipsMatrix(glmExtractRotation(avatarHeadMat), extractTranslation(avatarHeadMat), cgHipsPosition); // convert hips from avatar to sensor space // The Y_180 is to convert from z forward to -z forward. @@ -4618,7 +4666,7 @@ static bool withinBaseOfSupport(const controller::Pose& head) { bool withinFrontBase = isInsideLine(userScale * frontLeft, userScale * frontRight, head.getTranslation()); bool withinBackBase = isInsideLine(userScale * backRight, userScale * backLeft, head.getTranslation()); bool withinLateralBase = (isInsideLine(userScale * frontRight, userScale * backRight, head.getTranslation()) && - isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); + isInsideLine(userScale * backLeft, userScale * frontLeft, head.getTranslation())); isWithinSupport = (withinFrontBase && withinBackBase && withinLateralBase); } return isWithinSupport; @@ -4652,8 +4700,7 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { std::map freq; - for (auto recentModeReadingsIterator = _recentModeReadings.begin(); - recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { + for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator) { freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; @@ -4666,23 +4713,21 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && getControllerPoseInAvatarFrame(controller::Action::HEAD).isValid()) { setResetMode(false); - float resetModeInCentimeters = - glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR) * CENTIMETERS_PER_METER); + float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); } else { // if not greater and no reset, keep the mode as it is modeInMeters = getCurrentStandingHeight(); + } } } return modeInMeters; } -static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, - const controller::Pose& rightHand, - const controller::Pose& head) { +static bool handDirectionMatchesHeadDirection(const controller::Pose& leftHand, const controller::Pose& rightHand, const controller::Pose& head) { const float VELOCITY_EPSILON = 0.02f; bool leftHandDirectionMatchesHead = true; bool rightHandDirectionMatchesHead = true; @@ -4720,7 +4765,7 @@ static bool handAngularVelocityBelowThreshold(const controller::Pose& leftHand, rightHandXZAngularVelocity = glm::length(xzRightHandAngularVelocity); } return ((leftHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD) && - (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); + (rightHandXZAngularVelocity < DEFAULT_HANDS_ANGULAR_VELOCITY_STEPPING_THRESHOLD)); } static bool headVelocityGreaterThanThreshold(const controller::Pose& head) { @@ -4743,8 +4788,7 @@ static bool isHeadLevel(const controller::Pose& head, const glm::quat& averageHe glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation())); diffFromAverageEulers = averageHeadEulers - currentHeadEulers; } - return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && - (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); + return ((fabs(diffFromAverageEulers.x) < DEFAULT_HEAD_PITCH_STEPPING_TOLERANCE) && (fabs(diffFromAverageEulers.z) < DEFAULT_HEAD_ROLL_STEPPING_TOLERANCE)); } float MyAvatar::getUserHeight() const { @@ -4794,6 +4838,7 @@ float MyAvatar::getWalkSpeed() const { } else { return _defaultWalkSpeed.get(); } + } float MyAvatar::getWalkBackwardSpeed() const { @@ -4810,6 +4855,7 @@ float MyAvatar::getWalkBackwardSpeed() const { } else { return _defaultWalkBackwardSpeed.get(); } + } bool MyAvatar::isReadyForPhysics() const { @@ -4819,7 +4865,8 @@ bool MyAvatar::isReadyForPhysics() const { void MyAvatar::setSprintMode(bool sprint) { if (qApp->isHMDMode()) { _walkSpeedScalar = sprint ? AVATAR_DESKTOP_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; - } else { + } + else { _walkSpeedScalar = sprint ? AVATAR_HMD_SPRINT_SPEED_SCALAR : AVATAR_WALK_SPEED_SCALAR; } } @@ -4843,6 +4890,7 @@ void MyAvatar::setIsInSittingState(bool isSitting) { } void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) { + _userRecenterModel.set(modelName); switch (modelName) { @@ -4918,7 +4966,7 @@ void MyAvatar::setWalkBackwardSpeed(float value) { changed = false; break; } - + if (changed && prevVal != value) { emit walkBackwardSpeedChanged(value); } @@ -4941,7 +4989,6 @@ void MyAvatar::setSprintSpeed(float value) { _analogPlusSprintSpeed.set(value); break; default: - changed = false; break; } @@ -5089,6 +5136,7 @@ void driveKeysFromScriptValue(const QScriptValue& object, MyAvatar::DriveKeys& d driveKeys = static_cast(object.toUInt16()); } + void MyAvatar::lateUpdatePalms() { Avatar::updatePalms(); } @@ -5146,17 +5194,13 @@ void MyAvatar::FollowHelper::decrementTimeRemaining(float dt) { } } -bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float FOLLOW_ROTATION_THRESHOLD = cosf(myAvatar.getRotationThreshold()); glm::vec2 bodyFacing = getFacingDir2D(currentBodyMatrix); return glm::dot(-myAvatar.getHeadControllerFacingMovingAverage(), bodyFacing) < FOLLOW_ROTATION_THRESHOLD; } -bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { // -z axis of currentBodyMatrix in world space. glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2])); // x axis of currentBodyMatrix in world space. @@ -5187,6 +5231,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, } bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) const { + // get the current readings controller::Pose currentHeadPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD); controller::Pose currentLeftHandPose = myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND); @@ -5199,7 +5244,8 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons if (myAvatar.getIsInWalkingState()) { stepDetected = true; } else { - if (!withinBaseOfSupport(currentHeadPose) && headAngularVelocityBelowThreshold(currentHeadPose) && + if (!withinBaseOfSupport(currentHeadPose) && + headAngularVelocityBelowThreshold(currentHeadPose) && isWithinThresholdHeightMode(currentHeadSensorPose, myAvatar.getCurrentStandingHeight(), myScale) && handDirectionMatchesHeadDirection(currentLeftHandPose, currentRightHandPose, currentHeadPose) && handAngularVelocityBelowThreshold(currentLeftHandPose, currentRightHandPose) && @@ -5211,15 +5257,13 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons myAvatar.setIsInWalkingState(true); } } else { - glm::vec3 defaultHipsPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); - glm::vec3 defaultHeadPosition = - myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); + glm::vec3 defaultHipsPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Hips")); + glm::vec3 defaultHeadPosition = myAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(myAvatar.getJointIndex("Head")); glm::vec3 currentHeadPosition = currentHeadPose.getTranslation(); float anatomicalHeadToHipsDistance = glm::length(defaultHeadPosition - defaultHipsPosition); - if (!isActive(Horizontal) && (!isActive(Vertical)) && - (glm::length(currentHeadPosition - defaultHipsPosition) > - (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { + if (!isActive(Horizontal) && + (!isActive(Vertical)) && + (glm::length(currentHeadPosition - defaultHipsPosition) > (anatomicalHeadToHipsDistance + (DEFAULT_AVATAR_SPINE_STRETCH_LIMIT * anatomicalHeadToHipsDistance)))) { myAvatar.setResetMode(true); stepDetected = true; if (glm::length(currentHeadPose.velocity) > DEFAULT_AVATAR_WALK_SPEED_THRESHOLD) { @@ -5231,9 +5275,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontalCG(MyAvatar& myAvatar) cons return stepDetected; } -bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix) const { +bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const { const float CYLINDER_TOP = 2.0f; const float CYLINDER_BOTTOM = -1.5f; const float SITTING_BOTTOM = -0.02f; @@ -5264,11 +5306,11 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, return returnValue; } -void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, - const glm::mat4& desiredBodyMatrix, - const glm::mat4& currentBodyMatrix, - bool hasDriveInput) { - if (myAvatar.getHMDLeanRecenterEnabled() && qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { +void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, + const glm::mat4& currentBodyMatrix, bool hasDriveInput) { + + if (myAvatar.getHMDLeanRecenterEnabled() && + qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Rotation); myAvatar.setHeadControllerFacingMovingAverage(myAvatar.getHeadControllerFacing()); @@ -5283,8 +5325,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, } } else { // center of gravity model is not enabled - if (!isActive(Horizontal) && - (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { + if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Horizontal); if (myAvatar.getEnableStepResetRotation() && !myAvatar.getIsInSittingState()) { activate(Rotation); @@ -5321,7 +5362,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, glm::quat currentHipsLocal = myAvatar.getAbsoluteJointRotationInObjectFrame(myAvatar.getJointIndex("Hips")); const glm::quat hipsinWorldSpace = followWorldPose.rot() * (Quaternions::Y_180 * (currentHipsLocal)); - const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot() * (Vectors::UP)); + const glm::vec3 avatarUpWorld = glm::normalize(followWorldPose.rot()*(Vectors::UP)); glm::quat resultingSwingInWorld; glm::quat resultingTwistInWorld; swingTwistDecomposition(hipsinWorldSpace, avatarUpWorld, resultingSwingInWorld, resultingTwistInWorld); @@ -5330,8 +5371,8 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, followWorldPose.scale() = glm::vec3(1.0f); if (isActive(Rotation)) { - //use the hmd reading for the hips follow - followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); + //use the hmd reading for the hips follow + followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix); } if (isActive(Horizontal)) { glm::vec3 desiredTranslation = extractTranslation(desiredWorldMatrix); @@ -5359,8 +5400,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(MyAvatar& myAvatar, const gl glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix); glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement); - glm::quat sensorAngularDisplacement = - glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); + glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix); glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix), sensorLinearDisplacement + extractTranslation(currentBodyMatrix)); @@ -5428,8 +5468,7 @@ bool MyAvatar::didTeleport() { } bool MyAvatar::hasDriveInput() const { - return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || - fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; + return fabsf(getDriveKey(TRANSLATE_X)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Y)) > 0.0f || fabsf(getDriveKey(TRANSLATE_Z)) > 0.0f; } void MyAvatar::setAway(bool value) { @@ -5445,6 +5484,7 @@ void MyAvatar::setAway(bool value) { // Specificly, if we are rendering using a third person camera. We would like to render the hand controllers in front of the camera, // not in front of the avatar. glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& controllerSensorMatrix) const { + // Fetch the current camera transform. glm::mat4 cameraWorldMatrix = qApp->getCamera().getTransform(); if (qApp->getCamera().getMode() == CAMERA_MODE_MIRROR) { @@ -5471,7 +5511,7 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5500,13 +5540,15 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return glmExtractRotation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointRotationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointRotationInObjectFrame(index); + } } } glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { if (index < 0) { - index += numeric_limits::max() + 1; // 65536 + index += numeric_limits::max() + 1; // 65536 } switch (index) { @@ -5535,7 +5577,9 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const { glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix(); return extractTranslation(invAvatarMat * qApp->getCamera().getTransform()); } - default: { return Avatar::getAbsoluteJointTranslationInObjectFrame(index); } + default: { + return Avatar::getAbsoluteJointTranslationInObjectFrame(index); + } } } @@ -5544,15 +5588,12 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const { int rightEyeIndex = _skeletonModel->getRig().indexOfJoint("RightEye"); int leftEyeIndex = _skeletonModel->getRig().indexOfJoint("LeftEye"); if (rightEyeIndex >= 0 && leftEyeIndex >= 0) { - auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + - getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * - 0.5f; + auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f; auto centerEyeRot = Quaternions::Y_180; return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale()); } else { glm::mat4 headMat = getHeadCalibrationMat(); - return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, - extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); + return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, extractTranslation(headMat) + DEFAULT_AVATAR_HEAD_TO_MIDDLE_EYE_OFFSET); } } @@ -5721,6 +5762,7 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose& if (entityTree) { // lateAvatarUpdate will modify entity position & orientation, so we need an entity write lock entityTree->withWriteLock([&] { + // to prevent actions from adding or removing themselves from the _holdActions vector // while we are iterating, we need to enter a critical section. std::lock_guard guard(_holdActionsMutex); @@ -5756,24 +5798,26 @@ SpatialParentTree* MyAvatar::getParentTree() const { return entityTree.get(); } -const QUuid MyAvatar::grab(const QUuid& targetID, - int parentJointIndex, - glm::vec3 positionalOffset, - glm::quat rotationalOffset) { +const QUuid MyAvatar::grab(const QUuid& targetID, int parentJointIndex, + glm::vec3 positionalOffset, glm::quat rotationalOffset) { auto grabID = QUuid::createUuid(); // create a temporary grab object to get grabData QString hand = "none"; - if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || - parentJointIndex == FARGRAB_RIGHTHAND_INDEX || parentJointIndex == getJointIndex("RightHand")) { + if (parentJointIndex == CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX || + parentJointIndex == FARGRAB_RIGHTHAND_INDEX || + parentJointIndex == getJointIndex("RightHand")) { hand = "right"; - } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || - parentJointIndex == FARGRAB_LEFTHAND_INDEX || parentJointIndex == getJointIndex("LeftHand")) { + } else if (parentJointIndex == CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX || + parentJointIndex == FARGRAB_LEFTHAND_INDEX || + parentJointIndex == getJointIndex("LeftHand")) { hand = "left"; } - Grab tmpGrab(DependencyManager::get()->getSessionUUID(), targetID, parentJointIndex, hand, positionalOffset, - rotationalOffset); + Grab tmpGrab(DependencyManager::get()->getSessionUUID(), + targetID, parentJointIndex, hand, positionalOffset, rotationalOffset); QByteArray grabData = tmpGrab.toByteArray(); bool dataChanged = updateAvatarGrabData(grabID, grabData); @@ -5786,9 +5830,10 @@ const QUuid MyAvatar::grab(const QUuid& targetID, } void MyAvatar::releaseGrab(const QUuid& grabID) { - bool tellHandler{ false }; + bool tellHandler { false }; _avatarGrabsLock.withWriteLock([&] { + std::map::iterator itr; itr = _avatarGrabs.find(grabID); if (itr != _avatarGrabs.end()) { @@ -5817,12 +5862,13 @@ void MyAvatar::releaseGrab(const QUuid& grabID) { void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", Q_ARG(const std::shared_ptr&, otherAvatar)); + QMetaObject::invokeMethod(this, "addAvatarHandsToFlow", + Q_ARG(const std::shared_ptr&, otherAvatar)); return; } - auto& flow = _skeletonModel->getRig().getFlow(); + auto &flow = _skeletonModel->getRig().getFlow(); if (otherAvatar != nullptr && flow.getActive()) { - for (auto& handJointName : HAND_COLLISION_JOINTS) { + for (auto &handJointName : HAND_COLLISION_JOINTS) { int jointIndex = otherAvatar->getJointIndex(handJointName); if (jointIndex != -1) { glm::vec3 position = otherAvatar->getJointPosition(jointIndex); @@ -5850,18 +5896,18 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr& otherAvatar) * @property {number} [radius=0.05] - Collision sphere radius. * @property {number} [offset=Vec3.ZERO] - Offset of the collision sphere from the joint. */ -void MyAvatar::useFlow(bool isActive, - bool isCollidable, - const QVariantMap& physicsConfig, - const QVariantMap& collisionsConfig) { +void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) { if (QThread::currentThread() != thread()) { - QMetaObject::invokeMethod(this, "useFlow", Q_ARG(bool, isActive), Q_ARG(bool, isCollidable), - Q_ARG(const QVariantMap&, physicsConfig), Q_ARG(const QVariantMap&, collisionsConfig)); + QMetaObject::invokeMethod(this, "useFlow", + Q_ARG(bool, isActive), + Q_ARG(bool, isCollidable), + Q_ARG(const QVariantMap&, physicsConfig), + Q_ARG(const QVariantMap&, collisionsConfig)); return; } if (_skeletonModel->isLoaded()) { - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); if (!flow.isInitialized() && isActive) { _skeletonModel->getRig().initFlow(true); } else { @@ -5870,7 +5916,7 @@ void MyAvatar::useFlow(bool isActive, collisionSystem.setActive(isCollidable); auto physicsGroups = physicsConfig.keys(); if (physicsGroups.size() > 0) { - for (auto& groupName : physicsGroups) { + for (auto &groupName : physicsGroups) { auto settings = physicsConfig[groupName].toMap(); FlowPhysicsSettings physicsSettings; if (settings.contains("active")) { @@ -5900,7 +5946,7 @@ void MyAvatar::useFlow(bool isActive, auto collisionJoints = collisionsConfig.keys(); if (collisionJoints.size() > 0) { collisionSystem.clearSelfCollisions(); - for (auto& jointName : collisionJoints) { + for (auto &jointName : collisionJoints) { int jointIndex = getJointIndex(jointName); FlowCollisionSettings collisionsSettings; auto settings = collisionsConfig[jointName].toMap(); @@ -5954,13 +6000,14 @@ void MyAvatar::useFlow(bool isActive, QVariantMap MyAvatar::getFlowData() { QVariantMap result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getFlowData", Q_RETURN_ARG(QVariantMap, result)); + BLOCKING_INVOKE_METHOD(this, "getFlowData", + Q_RETURN_ARG(QVariantMap, result)); return result; } if (_skeletonModel->isLoaded()) { auto jointNames = getJointNames(); - auto& flow = _skeletonModel->getRig().getFlow(); - auto& collisionSystem = flow.getCollisionSystem(); + auto &flow = _skeletonModel->getRig().getFlow(); + auto &collisionSystem = flow.getCollisionSystem(); bool initialized = flow.isInitialized(); result.insert("initialized", initialized); result.insert("active", flow.getActive()); @@ -5970,17 +6017,17 @@ QVariantMap MyAvatar::getFlowData() { QVariantMap threadData; std::map groupJointsMap; QVariantList jointCollisionData; - auto& groups = flow.getGroupSettings(); - for (auto& joint : flow.getJoints()) { - auto& groupName = joint.second.getGroup(); + auto &groups = flow.getGroupSettings(); + for (auto &joint : flow.getJoints()) { + auto &groupName = joint.second.getGroup(); if (groups.find(groupName) != groups.end()) { if (groupJointsMap.find(groupName) == groupJointsMap.end()) { groupJointsMap.insert(std::pair(groupName, QVariantList())); } groupJointsMap[groupName].push_back(joint.second.getIndex()); } - } - for (auto& group : groups) { + } + for (auto &group : groups) { QVariantMap settingsObject; QString groupName = group.first; FlowPhysicsSettings groupSettings = group.second; @@ -5995,8 +6042,8 @@ QVariantMap MyAvatar::getFlowData() { physicsData.insert(groupName, settingsObject); } - auto& collisions = collisionSystem.getCollisions(); - for (auto& collision : collisions) { + auto &collisions = collisionSystem.getCollisions(); + for (auto &collision : collisions) { QVariantMap collisionObject; collisionObject.insert("offset", vec3toVariant(collision._offset)); collisionObject.insert("radius", collision._radius); @@ -6004,7 +6051,7 @@ QVariantMap MyAvatar::getFlowData() { QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown"; collisionsData.insert(jointName, collisionObject); } - for (auto& thread : flow.getThreads()) { + for (auto &thread : flow.getThreads()) { QVariantList indices; for (int index : thread._joints) { indices.append(index); @@ -6021,13 +6068,14 @@ QVariantMap MyAvatar::getFlowData() { QVariantList MyAvatar::getCollidingFlowJoints() { QVariantList result; if (QThread::currentThread() != thread()) { - BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", Q_RETURN_ARG(QVariantList, result)); + BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints", + Q_RETURN_ARG(QVariantList, result)); return result; } if (_skeletonModel->isLoaded()) { auto& flow = _skeletonModel->getRig().getFlow(); - for (auto& joint : flow.getJoints()) { + for (auto &joint : flow.getJoints()) { if (joint.second.isColliding()) { result.append(joint.second.getIndex()); } @@ -6038,7 +6086,7 @@ QVariantList MyAvatar::getCollidingFlowJoints() { void MyAvatar::initFlowFromFST() { if (_skeletonModel->isLoaded()) { - auto& flowData = _skeletonModel->getHFMModel().flowData; + auto &flowData = _skeletonModel->getHFMModel().flowData; if (flowData.shouldInitFlow()) { useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig); } @@ -6056,3 +6104,4 @@ void MyAvatar::sendPacket(const QUuid& entityID) const { }); } } + From e89f499c1a6a00edca6f62537691cf3c0fb64bde Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 12:02:15 -0700 Subject: [PATCH 088/100] this should work --- interface/src/avatar/MyAvatar.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b60bfd3f29..b91217da63 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -4989,6 +4989,7 @@ void MyAvatar::setSprintSpeed(float value) { _analogPlusSprintSpeed.set(value); break; default: + changed = false; break; } From 9498e0a462ec3590a74403ef63ea03b1ad12c552 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 12:47:04 -0700 Subject: [PATCH 089/100] addressing comment concerning preferences --- interface/src/ui/PreferencesDialog.cpp | 215 ++++++++++++++----------- 1 file changed, 124 insertions(+), 91 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index fb7b0ef993..380035fcb4 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -30,9 +30,9 @@ void setupPreferences() { auto preferences = DependencyManager::get(); auto myAvatar = DependencyManager::get()->getMyAvatar(); - static const QString AVATAR_BASICS { "Avatar Basics" }; + static const QString AVATAR_BASICS{ "Avatar Basics" }; { - auto getter = [myAvatar]()->QString { return myAvatar->getDisplayName(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getDisplayName(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDisplayName(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar display name (optional)", getter, setter); preference->setPlaceholderText("Not showing a name"); @@ -40,7 +40,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]()->QString { return myAvatar->getCollisionSoundURL(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getCollisionSoundURL(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setCollisionSoundURL(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar collision sound URL (optional)", getter, setter); preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something"); @@ -48,22 +48,21 @@ void setupPreferences() { } { - auto getter = [myAvatar]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; - auto setter = [myAvatar](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; + auto setter = [myAvatar](const QString& value) { + myAvatar->useFullAvatarURL(value, ""); + qApp->clearAvatarOverrideUrl(); + }; auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); preferences->addPreference(preference); } // Graphics quality - static const QString GRAPHICS_QUALITY { "Graphics Quality" }; + static const QString GRAPHICS_QUALITY{ "Graphics Quality" }; { - auto getter = []()->float { - return DependencyManager::get()->getWorldDetailQuality(); - }; + auto getter = []() -> float { return DependencyManager::get()->getWorldDetailQuality(); }; - auto setter = [](float value) { - DependencyManager::get()->setWorldDetailQuality(value); - }; + auto setter = [](float value) { DependencyManager::get()->setWorldDetailQuality(value); }; auto wodSlider = new SliderPreference(GRAPHICS_QUALITY, "World Detail", getter, setter); wodSlider->setMin(0.25f); @@ -71,7 +70,7 @@ void setupPreferences() { wodSlider->setStep(0.25f); preferences->addPreference(wodSlider); - auto getterShadow = []()->bool { + auto getterShadow = []() -> bool { auto menu = Menu::getInstance(); return menu->isOptionChecked(MenuOption::Shadows); }; @@ -83,43 +82,48 @@ void setupPreferences() { } { - auto getter = []()->QString { + auto getter = []() -> QString { RefreshRateManager::RefreshRateProfile refreshRateProfile = qApp->getRefreshRateManager().getRefreshRateProfile(); return QString::fromStdString(RefreshRateManager::refreshRateProfileToString(refreshRateProfile)); }; auto setter = [](QString value) { std::string profileName = value.toStdString(); - RefreshRateManager::RefreshRateProfile refreshRateProfile = RefreshRateManager::refreshRateProfileFromString(profileName); + RefreshRateManager::RefreshRateProfile refreshRateProfile = + RefreshRateManager::refreshRateProfileFromString(profileName); qApp->getRefreshRateManager().setRefreshRateProfile(refreshRateProfile); }; auto preference = new ComboBoxPreference(GRAPHICS_QUALITY, "Refresh Rate", getter, setter); - QStringList refreshRateProfiles - { QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::ECO)), - QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::INTERACTIVE)), - QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::REALTIME)) }; + QStringList refreshRateProfiles{ QString::fromStdString(RefreshRateManager::refreshRateProfileToString( + RefreshRateManager::RefreshRateProfile::ECO)), + QString::fromStdString(RefreshRateManager::refreshRateProfileToString( + RefreshRateManager::RefreshRateProfile::INTERACTIVE)), + QString::fromStdString(RefreshRateManager::refreshRateProfileToString( + RefreshRateManager::RefreshRateProfile::REALTIME)) }; preference->setItems(refreshRateProfiles); preferences->addPreference(preference); } // UI - static const QString UI_CATEGORY { "User Interface" }; + static const QString UI_CATEGORY{ "User Interface" }; { - auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; + auto getter = []() -> bool { return qApp->getSettingConstrainToolbarPosition(); }; auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(value); }; - preferences->addPreference(new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); - } - - { - auto getter = []()->bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; - auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); }; - preferences->addPreference(new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); + preferences->addPreference( + new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); } { - auto getter = []()->float { return qApp->getDesktopTabletScale(); }; + auto getter = []() -> bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; + auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); }; + preferences->addPreference( + new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); + } + + { + auto getter = []() -> float { return qApp->getDesktopTabletScale(); }; auto setter = [](float value) { qApp->setDesktopTabletScale(value); }; auto preference = new SpinnerPreference(UI_CATEGORY, "Desktop Tablet Scale %", getter, setter); preference->setMin(20); @@ -128,7 +132,7 @@ void setupPreferences() { } { - auto getter = []()->float { return qApp->getHMDTabletScale(); }; + auto getter = []() -> float { return qApp->getHMDTabletScale(); }; auto setter = [](float value) { qApp->setHMDTabletScale(value); }; auto preference = new SpinnerPreference(UI_CATEGORY, "VR Tablet Scale %", getter, setter); preference->setMin(20); @@ -138,41 +142,42 @@ void setupPreferences() { { static const QString RETICLE_ICON_NAME = { Cursor::Manager::getIconName(Cursor::Icon::RETICLE) }; - auto getter = []()->bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; + auto getter = []() -> bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; auto setter = [](bool value) { qApp->setPreferredCursor(value ? RETICLE_ICON_NAME : QString()); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use reticle cursor instead of arrow", getter, setter)); } { - auto getter = []()->bool { return qApp->getMiniTabletEnabled(); }; + auto getter = []() -> bool { return qApp->getMiniTabletEnabled(); }; auto setter = [](bool value) { qApp->setMiniTabletEnabled(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use mini tablet", getter, setter)); } { - auto getter = []()->int { return DependencyManager::get()->getUse3DKeyboard(); }; + auto getter = []() -> int { return DependencyManager::get()->getUse3DKeyboard(); }; auto setter = [](int value) { DependencyManager::get()->setUse3DKeyboard(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use Virtual Keyboard", getter, setter)); } { - auto getter = []()->bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; + auto getter = []() -> bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; auto setter = [](bool value) { return DependencyManager::get()->setPreferMalletsOverLasers((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Keyboard laser / mallets", getter, setter); QStringList items; - items << "Lasers" << "Mallets"; + items << "Lasers" + << "Mallets"; preference->setItems(items); preference->setIndented(true); preferences->addPreference(preference); } - { - auto getter = []()->int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; + auto getter = []() -> int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; auto setter = [](int value) { qApp->setPreferStylusOverLaser((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Tablet stylys / laser", getter, setter); QStringList items; - items << "Lasers" << "Stylus"; + items << "Lasers" + << "Stylus"; preference->setHeading("Tablet Input Mechanism"); preference->setItems(items); preferences->addPreference(preference); @@ -180,15 +185,16 @@ void setupPreferences() { static const QString VIEW_CATEGORY{ "View" }; { - auto getter = [myAvatar]()->float { return myAvatar->getRealWorldFieldOfView(); }; + auto getter = [myAvatar]() -> float { return myAvatar->getRealWorldFieldOfView(); }; auto setter = [myAvatar](float value) { myAvatar->setRealWorldFieldOfView(value); }; - auto preference = new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); + auto preference = + new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); preference->setMin(1); preference->setMax(180); preferences->addPreference(preference); } { - auto getter = []()->float { return qApp->getFieldOfView(); }; + auto getter = []() -> float { return qApp->getFieldOfView(); }; auto setter = [](float value) { qApp->setFieldOfView(value); }; auto preference = new SpinnerPreference(VIEW_CATEGORY, "Vertical field of view", getter, setter); preference->setMin(1); @@ -206,15 +212,18 @@ void setupPreferences() { }*/ // Snapshots - static const QString SNAPSHOTS { "Snapshots" }; + static const QString SNAPSHOTS{ "Snapshots" }; { - auto getter = []()->QString { return DependencyManager::get()->_snapshotsLocation.get(); }; - auto setter = [](const QString& value) { DependencyManager::get()->_snapshotsLocation.set(value); emit DependencyManager::get()->snapshotLocationSet(value); }; + auto getter = []() -> QString { return DependencyManager::get()->_snapshotsLocation.get(); }; + auto setter = [](const QString& value) { + DependencyManager::get()->_snapshotsLocation.set(value); + emit DependencyManager::get()->snapshotLocationSet(value); + }; auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter); preferences->addPreference(preference); } { - auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; + auto getter = []() -> float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); }; auto preference = new SpinnerPreference(SNAPSHOTS, "Animated Snapshot Duration", getter, setter); preference->setMin(1); @@ -224,22 +233,25 @@ void setupPreferences() { } { - auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); }; + auto getter = []() -> bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); }; auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); }; - preferences->addPreference(new CheckPreference("Privacy", "Send data - High Fidelity uses information provided by your " + preferences->addPreference( + new CheckPreference("Privacy", + "Send data - High Fidelity uses information provided by your " "client to improve the product through the logging of errors, tracking of usage patterns, " "installation and system details, and crash events. By allowing High Fidelity to collect " - "this information you are helping to improve the product. ", getter, setter)); + "this information you are helping to improve the product. ", + getter, setter)); } - - static const QString AVATAR_TUNING { "Avatar Tuning" }; + + static const QString AVATAR_TUNING{ "Avatar Tuning" }; { - auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]()->float { return myAvatar->getTargetScale(); }; + auto getter = [myAvatar]() -> float { return myAvatar->getTargetScale(); }; auto setter = [myAvatar](float value) { myAvatar->setTargetScale(value); }; auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter); preference->setMin(0.25); @@ -247,15 +259,15 @@ void setupPreferences() { preference->setStep(0.05f); preference->setDecimals(2); preferences->addPreference(preference); - - // When the Interface is first loaded, this section setupPreferences(); is loaded - + + // When the Interface is first loaded, this section setupPreferences(); is loaded - // causing the myAvatar->getDomainMinScale() and myAvatar->getDomainMaxScale() to get set to incorrect values // which can't be changed across domain switches. Having these values loaded up when you load the Dialog each time // is a way around this, therefore they're not specified here but in the QML. } { - auto getter = [myAvatar]()->QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setAnimGraphOverrideUrl(QUrl(value)); }; auto preference = new EditPreference(AVATAR_TUNING, "Avatar animation JSON", getter, setter); preference->setPlaceholderText("default"); @@ -263,44 +275,49 @@ void setupPreferences() { } { - auto getter = [myAvatar]()->bool { return myAvatar->getCollisionsEnabled(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->getCollisionsEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setCollisionsEnabled(value); }; auto preference = new CheckPreference(AVATAR_TUNING, "Enable Avatar collisions", getter, setter); preferences->addPreference(preference); } + static const QString FACE_TRACKING{ "Face Tracking" }; { - auto getter = []()->float { return DependencyManager::get()->getEyeClosingThreshold(); }; +#ifdef HAVE_DDE + auto getter = []() -> float { return DependencyManager::get()->getEyeClosingThreshold(); }; auto setter = [](float value) { DependencyManager::get()->setEyeClosingThreshold(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Closing Threshold", getter, setter)); +#endif } + + { - auto getter = []()->float { return FaceTracker::getEyeDeflection(); }; + auto getter = []() -> float { return FaceTracker::getEyeDeflection(); }; auto setter = [](float value) { FaceTracker::setEyeDeflection(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Deflection", getter, setter)); } static const QString VR_MOVEMENT{ "VR Movement" }; { - auto getter = [myAvatar]()->bool { return myAvatar->getAllowTeleporting(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->getAllowTeleporting(); }; auto setter = [myAvatar](bool value) { myAvatar->setAllowTeleporting(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->useAdvancedMovementControls(); }; auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Walking", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->bool { return myAvatar->getStrafeEnabled(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->getStrafeEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setStrafeEnabled(value); }; preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Strafing", getter, setter)); } { - auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->getFlyingHMDPref(); }; auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Jumping and flying", getter, setter); preference->setIndented(true); @@ -313,43 +330,48 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]()->int { return myAvatar->getMovementReference(); }; - auto setter = [myAvatar](int value) { myAvatar->setMovementReference(value); }; + auto getter = [myAvatar]() -> int { return myAvatar->getMovementReference(); }; + auto setter = [myAvatar](int value) { myAvatar->setMovementReference(value); }; //auto preference = new CheckPreference(VR_MOVEMENT, "Hand-Relative Movement", getter, setter); auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Movement Direction", getter, setter); QStringList items; - items << "HMD-Relative" << "Hand-Relative" << "Hand-Relative (Leveled)"; + items << "HMD-Relative" + << "Hand-Relative" + << "Hand-Relative (Leveled)"; preference->setHeading("Movement Direction"); preference->setItems(items); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(VR_MOVEMENT, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; + auto getter = [myAvatar]() -> int { return myAvatar->getSnapTurn() ? 0 : 1; }; auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Snap turn / Smooth turn", getter, setter); QStringList items; - items << "Snap turn" << "Smooth turn"; + items << "Snap turn" + << "Smooth turn"; preference->setHeading("Rotation mode"); preference->setItems(items); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->int { return myAvatar->getControlScheme(); }; + auto getter = [myAvatar]() -> int { return myAvatar->getControlScheme(); }; auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Control Scheme", getter, setter); QStringList items; - items << "Default" << "Analog" << "Analog++"; + items << "Default" + << "Analog" + << "Analog++"; preference->setHeading("Control Scheme Selection"); preference->setItems(items); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->float { return myAvatar->getAnalogPlusWalkSpeed(); }; + auto getter = [myAvatar]() -> float { return myAvatar->getAnalogPlusWalkSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setAnalogPlusWalkSpeed(value); }; auto preference = new SpinnerSliderPreference(VR_MOVEMENT, "Analog++ Walk Speed", getter, setter); preference->setMin(6.0f); @@ -359,16 +381,16 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]()->bool { return myAvatar->getShowPlayArea(); }; + auto getter = [myAvatar]() -> bool { return myAvatar->getShowPlayArea(); }; auto setter = [myAvatar](bool value) { myAvatar->setShowPlayArea(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Show room boundaries while teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]()->int { + auto getter = [myAvatar]() -> int { switch (myAvatar->getUserRecenterModel()) { case MyAvatar::SitStandModelType::Auto: - default: + default: return 0; case MyAvatar::SitStandModelType::ForceSit: return 1; @@ -395,15 +417,19 @@ void setupPreferences() { break; } }; - auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Force Stand / Disable Recenter", getter, setter); + auto preference = + new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Force Stand / Disable Recenter", getter, setter); QStringList items; - items << "Auto - turns on avatar leaning when standing in real world" << "Seated - disables all avatar leaning while sitting in real world" << "Standing - enables avatar leaning while sitting in real world" << "Disabled - allows avatar sitting on the floor [Experimental]"; + items << "Auto - turns on avatar leaning when standing in real world" + << "Seated - disables all avatar leaning while sitting in real world" + << "Standing - enables avatar leaning while sitting in real world" + << "Disabled - allows avatar sitting on the floor [Experimental]"; preference->setHeading("Avatar leaning behavior"); preference->setItems(items); preferences->addPreference(preference); } { - auto getter = [=]()->float { return myAvatar->getUserHeight(); }; + auto getter = [=]() -> float { return myAvatar->getUserHeight(); }; auto setter = [=](float value) { myAvatar->setUserHeight(value); }; auto preference = new SpinnerPreference(VR_MOVEMENT, "User real-world height (meters)", getter, setter); preference->setMin(1.0f); @@ -415,7 +441,7 @@ void setupPreferences() { static const QString AVATAR_CAMERA{ "Mouse Sensitivity" }; { - auto getter = [myAvatar]()->float { return myAvatar->getPitchSpeed(); }; + auto getter = [myAvatar]() -> float { return myAvatar->getPitchSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setPitchSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "Y input:", getter, setter); preference->setMin(1.0f); @@ -425,7 +451,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]()->float { return myAvatar->getYawSpeed(); }; + auto getter = [myAvatar]() -> float { return myAvatar->getYawSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setYawSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "X input:", getter, setter); preference->setMin(1.0f); @@ -437,14 +463,22 @@ void setupPreferences() { static const QString AUDIO_BUFFERS("Audio Buffers"); { - auto getter = []()->bool { return !DependencyManager::get()->getReceivedAudioStream().dynamicJitterBufferEnabled(); }; - auto setter = [](bool value) { DependencyManager::get()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); }; + auto getter = []() -> bool { + return !DependencyManager::get()->getReceivedAudioStream().dynamicJitterBufferEnabled(); + }; + auto setter = [](bool value) { + DependencyManager::get()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); + }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable dynamic jitter buffer", getter, setter); preferences->addPreference(preference); } { - auto getter = []()->float { return DependencyManager::get()->getReceivedAudioStream().getStaticJitterBufferFrames(); }; - auto setter = [](float value) { DependencyManager::get()->getReceivedAudioStream().setStaticJitterBufferFrames(value); }; + auto getter = []() -> float { + return DependencyManager::get()->getReceivedAudioStream().getStaticJitterBufferFrames(); + }; + auto setter = [](float value) { + DependencyManager::get()->getReceivedAudioStream().setStaticJitterBufferFrames(value); + }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Static jitter buffer frames", getter, setter); preference->setMin(0); preference->setMax(2000); @@ -452,13 +486,13 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = []()->bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; + auto getter = []() -> bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; auto setter = [](bool value) { DependencyManager::get()->setOutputStarveDetectionEnabled(!value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable output starve detection", getter, setter); preferences->addPreference(preference); } { - auto getter = []()->float { return DependencyManager::get()->getOutputBufferSize(); }; + auto getter = []() -> float { return DependencyManager::get()->getOutputBufferSize(); }; auto setter = [](float value) { DependencyManager::get()->setOutputBufferSize(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Output buffer initial frames", getter, setter); preference->setMin(AudioClient::MIN_BUFFER_FRAMES); @@ -468,13 +502,13 @@ void setupPreferences() { } #if DEV_BUILD || PR_BUILD { - auto getter = []()->bool { return DependencyManager::get()->isSimulatingJitter(); }; + auto getter = []() -> bool { return DependencyManager::get()->isSimulatingJitter(); }; auto setter = [](bool value) { return DependencyManager::get()->setIsSimulatingJitter(value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Packet jitter simulator", getter, setter); preferences->addPreference(preference); } { - auto getter = []()->float { return DependencyManager::get()->getGateThreshold(); }; + auto getter = []() -> float { return DependencyManager::get()->getGateThreshold(); }; auto setter = [](float value) { return DependencyManager::get()->setGateThreshold(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Packet throttle threshold", getter, setter); preference->setMin(1); @@ -489,8 +523,8 @@ void setupPreferences() { QWeakPointer nodeListWeak = DependencyManager::get(); { - static const int MIN_PORT_NUMBER { 0 }; - static const int MAX_PORT_NUMBER { 65535 }; + static const int MIN_PORT_NUMBER{ 0 }; + static const int MAX_PORT_NUMBER{ 65535 }; auto getter = [nodeListWeak] { auto nodeList = nodeListWeak.lock(); if (nodeList) { @@ -512,7 +546,7 @@ void setupPreferences() { } { - auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); }; + auto getter = []() -> float { return qApp->getMaxOctreePacketsPerSecond(); }; auto setter = [](float value) { qApp->setMaxOctreePacketsPerSecond(value); }; auto preference = new SpinnerPreference(NETWORKING, "Max entities packets sent each second", getter, setter); preference->setMin(60); @@ -520,6 +554,5 @@ void setupPreferences() { preference->setStep(10); preferences->addPreference(preference); } - } } From fd7dd7948f0e2d80fd888c278fc18a05a452c5cc Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 13:41:14 -0700 Subject: [PATCH 090/100] reverted vs spacing changes --- interface/src/Application.cpp | 8 +-- interface/src/ui/PreferencesDialog.cpp | 87 +++++++++----------------- 2 files changed, 33 insertions(+), 62 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7efa17cb8c..eaaf9502cf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5182,11 +5182,11 @@ ivec2 Application::getMouse() const { FaceTracker* Application::getActiveFaceTracker() { auto dde = DependencyManager::get(); - if(dde){ - return dde->isActive() ? static_cast(dde.data()) : nullptr; - }else{ - return nullptr; + if(dde && dde->isActive()){ + return static_cast(dde.data()); } + + return nullptr; } FaceTracker* Application::getSelectedFaceTracker() { diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 380035fcb4..a13d19741d 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -49,10 +49,7 @@ void setupPreferences() { { auto getter = [myAvatar]() -> QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; - auto setter = [myAvatar](const QString& value) { - myAvatar->useFullAvatarURL(value, ""); - qApp->clearAvatarOverrideUrl(); - }; + auto setter = [myAvatar](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); }; auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); preferences->addPreference(preference); } @@ -60,9 +57,13 @@ void setupPreferences() { // Graphics quality static const QString GRAPHICS_QUALITY{ "Graphics Quality" }; { - auto getter = []() -> float { return DependencyManager::get()->getWorldDetailQuality(); }; + auto getter = []()->float { + return DependencyManager::get()->getWorldDetailQuality(); + }; - auto setter = [](float value) { DependencyManager::get()->setWorldDetailQuality(value); }; + auto setter = [](float value) { + DependencyManager::get()->setWorldDetailQuality(value); + }; auto wodSlider = new SliderPreference(GRAPHICS_QUALITY, "World Detail", getter, setter); wodSlider->setMin(0.25f); @@ -95,12 +96,10 @@ void setupPreferences() { }; auto preference = new ComboBoxPreference(GRAPHICS_QUALITY, "Refresh Rate", getter, setter); - QStringList refreshRateProfiles{ QString::fromStdString(RefreshRateManager::refreshRateProfileToString( - RefreshRateManager::RefreshRateProfile::ECO)), - QString::fromStdString(RefreshRateManager::refreshRateProfileToString( - RefreshRateManager::RefreshRateProfile::INTERACTIVE)), - QString::fromStdString(RefreshRateManager::refreshRateProfileToString( - RefreshRateManager::RefreshRateProfile::REALTIME)) }; + QStringList refreshRateProfiles + { QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::ECO)), + QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::INTERACTIVE)), + QString::fromStdString(RefreshRateManager::refreshRateProfileToString(RefreshRateManager::RefreshRateProfile::REALTIME)) }; preference->setItems(refreshRateProfiles); preferences->addPreference(preference); @@ -111,15 +110,13 @@ void setupPreferences() { { auto getter = []() -> bool { return qApp->getSettingConstrainToolbarPosition(); }; auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(value); }; - preferences->addPreference( - new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); + preferences->addPreference(new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); } { auto getter = []() -> bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); }; - preferences->addPreference( - new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); + preferences->addPreference(new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); } { @@ -164,20 +161,19 @@ void setupPreferences() { auto setter = [](bool value) { return DependencyManager::get()->setPreferMalletsOverLasers((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Keyboard laser / mallets", getter, setter); QStringList items; - items << "Lasers" - << "Mallets"; + items << "Lasers" << "Mallets"; preference->setItems(items); preference->setIndented(true); preferences->addPreference(preference); } + { auto getter = []() -> int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; auto setter = [](int value) { qApp->setPreferStylusOverLaser((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Tablet stylys / laser", getter, setter); QStringList items; - items << "Lasers" - << "Stylus"; + items << "Lasers" << "Stylus"; preference->setHeading("Tablet Input Mechanism"); preference->setItems(items); preferences->addPreference(preference); @@ -187,8 +183,7 @@ void setupPreferences() { { auto getter = [myAvatar]() -> float { return myAvatar->getRealWorldFieldOfView(); }; auto setter = [myAvatar](float value) { myAvatar->setRealWorldFieldOfView(value); }; - auto preference = - new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); + auto preference = new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); preference->setMin(1); preference->setMax(180); preferences->addPreference(preference); @@ -215,10 +210,7 @@ void setupPreferences() { static const QString SNAPSHOTS{ "Snapshots" }; { auto getter = []() -> QString { return DependencyManager::get()->_snapshotsLocation.get(); }; - auto setter = [](const QString& value) { - DependencyManager::get()->_snapshotsLocation.set(value); - emit DependencyManager::get()->snapshotLocationSet(value); - }; + auto setter = [](const QString& value) { DependencyManager::get()->_snapshotsLocation.set(value); emit DependencyManager::get()->snapshotLocationSet(value); }; auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter); preferences->addPreference(preference); } @@ -235,13 +227,10 @@ void setupPreferences() { { auto getter = []() -> bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); }; auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); }; - preferences->addPreference( - new CheckPreference("Privacy", - "Send data - High Fidelity uses information provided by your " + preferences->addPreference(new CheckPreference("Privacy", "Send data - High Fidelity uses information provided by your " "client to improve the product through the logging of errors, tracking of usage patterns, " "installation and system details, and crash events. By allowing High Fidelity to collect " - "this information you are helping to improve the product. ", - getter, setter)); + "this information you are helping to improve the product. ", getter, setter)); } static const QString AVATAR_TUNING{ "Avatar Tuning" }; @@ -281,7 +270,6 @@ void setupPreferences() { preferences->addPreference(preference); } - static const QString FACE_TRACKING{ "Face Tracking" }; { #ifdef HAVE_DDE @@ -335,9 +323,7 @@ void setupPreferences() { //auto preference = new CheckPreference(VR_MOVEMENT, "Hand-Relative Movement", getter, setter); auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Movement Direction", getter, setter); QStringList items; - items << "HMD-Relative" - << "Hand-Relative" - << "Hand-Relative (Leveled)"; + items << "HMD-Relative" << "Hand-Relative" << "Hand-Relative (Leveled)"; preference->setHeading("Movement Direction"); preference->setItems(items); preferences->addPreference(preference); @@ -352,8 +338,7 @@ void setupPreferences() { auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Snap turn / Smooth turn", getter, setter); QStringList items; - items << "Snap turn" - << "Smooth turn"; + items << "Snap turn" << "Smooth turn"; preference->setHeading("Rotation mode"); preference->setItems(items); preferences->addPreference(preference); @@ -363,9 +348,7 @@ void setupPreferences() { auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Control Scheme", getter, setter); QStringList items; - items << "Default" - << "Analog" - << "Analog++"; + items << "Default" << "Analog" << "Analog++"; preference->setHeading("Control Scheme Selection"); preference->setItems(items); preferences->addPreference(preference); @@ -417,13 +400,9 @@ void setupPreferences() { break; } }; - auto preference = - new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Force Stand / Disable Recenter", getter, setter); + auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Auto / Force Sit / Force Stand / Disable Recenter", getter, setter); QStringList items; - items << "Auto - turns on avatar leaning when standing in real world" - << "Seated - disables all avatar leaning while sitting in real world" - << "Standing - enables avatar leaning while sitting in real world" - << "Disabled - allows avatar sitting on the floor [Experimental]"; + items << "Auto - turns on avatar leaning when standing in real world" << "Seated - disables all avatar leaning while sitting in real world" << "Standing - enables avatar leaning while sitting in real world" << "Disabled - allows avatar sitting on the floor [Experimental]"; preference->setHeading("Avatar leaning behavior"); preference->setItems(items); preferences->addPreference(preference); @@ -463,22 +442,14 @@ void setupPreferences() { static const QString AUDIO_BUFFERS("Audio Buffers"); { - auto getter = []() -> bool { - return !DependencyManager::get()->getReceivedAudioStream().dynamicJitterBufferEnabled(); - }; - auto setter = [](bool value) { - DependencyManager::get()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); - }; + auto getter = []()->bool { return !DependencyManager::get()->getReceivedAudioStream().dynamicJitterBufferEnabled(); }; + auto setter = [](bool value) { DependencyManager::get()->getReceivedAudioStream().setDynamicJitterBufferEnabled(!value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable dynamic jitter buffer", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { - return DependencyManager::get()->getReceivedAudioStream().getStaticJitterBufferFrames(); - }; - auto setter = [](float value) { - DependencyManager::get()->getReceivedAudioStream().setStaticJitterBufferFrames(value); - }; + auto getter = []()->float { return DependencyManager::get()->getReceivedAudioStream().getStaticJitterBufferFrames(); }; + auto setter = [](float value) { DependencyManager::get()->getReceivedAudioStream().setStaticJitterBufferFrames(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Static jitter buffer frames", getter, setter); preference->setMin(0); preference->setMax(2000); From 64534913af8edf5e7eeb07b9990508b036be1963 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 13:59:18 -0700 Subject: [PATCH 091/100] more vs changes udo --- interface/src/ui/PreferencesDialog.cpp | 101 ++++++++++++------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index a13d19741d..65595bac95 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -32,7 +32,7 @@ void setupPreferences() { auto myAvatar = DependencyManager::get()->getMyAvatar(); static const QString AVATAR_BASICS{ "Avatar Basics" }; { - auto getter = [myAvatar]() -> QString { return myAvatar->getDisplayName(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDisplayName(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDisplayName(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar display name (optional)", getter, setter); preference->setPlaceholderText("Not showing a name"); @@ -40,7 +40,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getCollisionSoundURL(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getCollisionSoundURL(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setCollisionSoundURL(value); }; auto preference = new EditPreference(AVATAR_BASICS, "Avatar collision sound URL (optional)", getter, setter); preference->setPlaceholderText("Enter the URL of a sound to play when you bump into something"); @@ -48,7 +48,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); }; auto setter = [myAvatar](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); }; auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter); preferences->addPreference(preference); @@ -71,7 +71,7 @@ void setupPreferences() { wodSlider->setStep(0.25f); preferences->addPreference(wodSlider); - auto getterShadow = []() -> bool { + auto getterShadow = []()->bool { auto menu = Menu::getInstance(); return menu->isOptionChecked(MenuOption::Shadows); }; @@ -83,15 +83,14 @@ void setupPreferences() { } { - auto getter = []() -> QString { + auto getter = []()->QString { RefreshRateManager::RefreshRateProfile refreshRateProfile = qApp->getRefreshRateManager().getRefreshRateProfile(); return QString::fromStdString(RefreshRateManager::refreshRateProfileToString(refreshRateProfile)); }; auto setter = [](QString value) { std::string profileName = value.toStdString(); - RefreshRateManager::RefreshRateProfile refreshRateProfile = - RefreshRateManager::refreshRateProfileFromString(profileName); + RefreshRateManager::RefreshRateProfile refreshRateProfile = RefreshRateManager::refreshRateProfileFromString(profileName); qApp->getRefreshRateManager().setRefreshRateProfile(refreshRateProfile); }; @@ -108,19 +107,19 @@ void setupPreferences() { // UI static const QString UI_CATEGORY{ "User Interface" }; { - auto getter = []() -> bool { return qApp->getSettingConstrainToolbarPosition(); }; + auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Constrain Toolbar Position to Horizontal Center", getter, setter)); } { - auto getter = []() -> bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; + auto getter = []()->bool { return qApp->getAwayStateWhenFocusLostInVREnabled(); }; auto setter = [](bool value) { qApp->setAwayStateWhenFocusLostInVREnabled(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Go into away state when interface window loses focus in VR", getter, setter)); } { - auto getter = []() -> float { return qApp->getDesktopTabletScale(); }; + auto getter = []()->float { return qApp->getDesktopTabletScale(); }; auto setter = [](float value) { qApp->setDesktopTabletScale(value); }; auto preference = new SpinnerPreference(UI_CATEGORY, "Desktop Tablet Scale %", getter, setter); preference->setMin(20); @@ -129,7 +128,7 @@ void setupPreferences() { } { - auto getter = []() -> float { return qApp->getHMDTabletScale(); }; + auto getter = []()->float { return qApp->getHMDTabletScale(); }; auto setter = [](float value) { qApp->setHMDTabletScale(value); }; auto preference = new SpinnerPreference(UI_CATEGORY, "VR Tablet Scale %", getter, setter); preference->setMin(20); @@ -139,25 +138,25 @@ void setupPreferences() { { static const QString RETICLE_ICON_NAME = { Cursor::Manager::getIconName(Cursor::Icon::RETICLE) }; - auto getter = []() -> bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; + auto getter = []()->bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; }; auto setter = [](bool value) { qApp->setPreferredCursor(value ? RETICLE_ICON_NAME : QString()); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use reticle cursor instead of arrow", getter, setter)); } { - auto getter = []() -> bool { return qApp->getMiniTabletEnabled(); }; + auto getter = []()->bool { return qApp->getMiniTabletEnabled(); }; auto setter = [](bool value) { qApp->setMiniTabletEnabled(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use mini tablet", getter, setter)); } { - auto getter = []() -> int { return DependencyManager::get()->getUse3DKeyboard(); }; + auto getter = []()->int { return DependencyManager::get()->getUse3DKeyboard(); }; auto setter = [](int value) { DependencyManager::get()->setUse3DKeyboard(value); }; preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use Virtual Keyboard", getter, setter)); } { - auto getter = []() -> bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; + auto getter = []()->bool { return DependencyManager::get()->getPreferMalletsOverLasers() ? 1 : 0; }; auto setter = [](bool value) { return DependencyManager::get()->setPreferMalletsOverLasers((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Keyboard laser / mallets", getter, setter); QStringList items; @@ -169,7 +168,7 @@ void setupPreferences() { { - auto getter = []() -> int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; + auto getter = []()->int { return qApp->getPreferStylusOverLaser() ? 1 : 0; }; auto setter = [](int value) { qApp->setPreferStylusOverLaser((bool)value); }; auto preference = new RadioButtonsPreference(UI_CATEGORY, "Tablet stylys / laser", getter, setter); QStringList items; @@ -181,7 +180,7 @@ void setupPreferences() { static const QString VIEW_CATEGORY{ "View" }; { - auto getter = [myAvatar]() -> float { return myAvatar->getRealWorldFieldOfView(); }; + auto getter = [myAvatar]()->float { return myAvatar->getRealWorldFieldOfView(); }; auto setter = [myAvatar](float value) { myAvatar->setRealWorldFieldOfView(value); }; auto preference = new SpinnerPreference(VIEW_CATEGORY, "Real world vertical field of view (angular size of monitor)", getter, setter); preference->setMin(1); @@ -189,7 +188,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = []() -> float { return qApp->getFieldOfView(); }; + auto getter = []()->float { return qApp->getFieldOfView(); }; auto setter = [](float value) { qApp->setFieldOfView(value); }; auto preference = new SpinnerPreference(VIEW_CATEGORY, "Vertical field of view", getter, setter); preference->setMin(1); @@ -209,13 +208,13 @@ void setupPreferences() { // Snapshots static const QString SNAPSHOTS{ "Snapshots" }; { - auto getter = []() -> QString { return DependencyManager::get()->_snapshotsLocation.get(); }; + auto getter = []()->QString { return DependencyManager::get()->_snapshotsLocation.get(); }; auto setter = [](const QString& value) { DependencyManager::get()->_snapshotsLocation.set(value); emit DependencyManager::get()->snapshotLocationSet(value); }; auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; + auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); }; auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); }; auto preference = new SpinnerPreference(SNAPSHOTS, "Animated Snapshot Duration", getter, setter); preference->setMin(1); @@ -225,7 +224,7 @@ void setupPreferences() { } { - auto getter = []() -> bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); }; + auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); }; auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); }; preferences->addPreference(new CheckPreference("Privacy", "Send data - High Fidelity uses information provided by your " "client to improve the product through the logging of errors, tracking of usage patterns, " @@ -233,14 +232,14 @@ void setupPreferences() { "this information you are helping to improve the product. ", getter, setter)); } - static const QString AVATAR_TUNING{ "Avatar Tuning" }; + static const QString AVATAR_TUNING { "Avatar Tuning" }; { - auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]() -> float { return myAvatar->getTargetScale(); }; + auto getter = [myAvatar]()->float { return myAvatar->getTargetScale(); }; auto setter = [myAvatar](float value) { myAvatar->setTargetScale(value); }; auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter); preference->setMin(0.25); @@ -256,7 +255,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getAnimGraphOverrideUrl().toString(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setAnimGraphOverrideUrl(QUrl(value)); }; auto preference = new EditPreference(AVATAR_TUNING, "Avatar animation JSON", getter, setter); preference->setPlaceholderText("default"); @@ -264,7 +263,7 @@ void setupPreferences() { } { - auto getter = [myAvatar]() -> bool { return myAvatar->getCollisionsEnabled(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getCollisionsEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setCollisionsEnabled(value); }; auto preference = new CheckPreference(AVATAR_TUNING, "Enable Avatar collisions", getter, setter); preferences->addPreference(preference); @@ -273,7 +272,7 @@ void setupPreferences() { static const QString FACE_TRACKING{ "Face Tracking" }; { #ifdef HAVE_DDE - auto getter = []() -> float { return DependencyManager::get()->getEyeClosingThreshold(); }; + auto getter = []()->float { return DependencyManager::get()->getEyeClosingThreshold(); }; auto setter = [](float value) { DependencyManager::get()->setEyeClosingThreshold(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Closing Threshold", getter, setter)); #endif @@ -281,44 +280,44 @@ void setupPreferences() { { - auto getter = []() -> float { return FaceTracker::getEyeDeflection(); }; + auto getter = []()->float { return FaceTracker::getEyeDeflection(); }; auto setter = [](float value) { FaceTracker::setEyeDeflection(value); }; preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Deflection", getter, setter)); } static const QString VR_MOVEMENT{ "VR Movement" }; { - auto getter = [myAvatar]() -> bool { return myAvatar->getAllowTeleporting(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getAllowTeleporting(); }; auto setter = [myAvatar](bool value) { myAvatar->setAllowTeleporting(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->useAdvancedMovementControls(); }; + auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Walking", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getStrafeEnabled(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getStrafeEnabled(); }; auto setter = [myAvatar](bool value) { myAvatar->setStrafeEnabled(value); }; preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Strafing", getter, setter)); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getFlyingHMDPref(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Jumping and flying", getter, setter); preference->setIndented(true); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->hoverWhenUnsupported(); }; + auto getter = [myAvatar]()->bool { return myAvatar->hoverWhenUnsupported(); }; auto setter = [myAvatar](bool value) { myAvatar->setHoverWhenUnsupported(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Hover When Unsupported", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { return myAvatar->getMovementReference(); }; + auto getter = [myAvatar]()->int { return myAvatar->getMovementReference(); }; auto setter = [myAvatar](int value) { myAvatar->setMovementReference(value); }; //auto preference = new CheckPreference(VR_MOVEMENT, "Hand-Relative Movement", getter, setter); auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Movement Direction", getter, setter); @@ -329,12 +328,12 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> QString { return myAvatar->getDominantHand(); }; + auto getter = [myAvatar]()->QString { return myAvatar->getDominantHand(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDominantHand(value); }; preferences->addPreference(new PrimaryHandPreference(VR_MOVEMENT, "Dominant Hand", getter, setter)); } { - auto getter = [myAvatar]() -> int { return myAvatar->getSnapTurn() ? 0 : 1; }; + auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Snap turn / Smooth turn", getter, setter); QStringList items; @@ -344,7 +343,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { return myAvatar->getControlScheme(); }; + auto getter = [myAvatar]()->int { return myAvatar->getControlScheme(); }; auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); }; auto preference = new RadioButtonsPreference(VR_MOVEMENT, "Control Scheme", getter, setter); QStringList items; @@ -354,7 +353,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> float { return myAvatar->getAnalogPlusWalkSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getAnalogPlusWalkSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setAnalogPlusWalkSpeed(value); }; auto preference = new SpinnerSliderPreference(VR_MOVEMENT, "Analog++ Walk Speed", getter, setter); preference->setMin(6.0f); @@ -364,16 +363,16 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> bool { return myAvatar->getShowPlayArea(); }; + auto getter = [myAvatar]()->bool { return myAvatar->getShowPlayArea(); }; auto setter = [myAvatar](bool value) { myAvatar->setShowPlayArea(value); }; auto preference = new CheckPreference(VR_MOVEMENT, "Show room boundaries while teleporting", getter, setter); preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> int { + auto getter = [myAvatar]()->int { switch (myAvatar->getUserRecenterModel()) { case MyAvatar::SitStandModelType::Auto: - default: + default: return 0; case MyAvatar::SitStandModelType::ForceSit: return 1; @@ -408,7 +407,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [=]() -> float { return myAvatar->getUserHeight(); }; + auto getter = [=]()->float { return myAvatar->getUserHeight(); }; auto setter = [=](float value) { myAvatar->setUserHeight(value); }; auto preference = new SpinnerPreference(VR_MOVEMENT, "User real-world height (meters)", getter, setter); preference->setMin(1.0f); @@ -420,7 +419,7 @@ void setupPreferences() { static const QString AVATAR_CAMERA{ "Mouse Sensitivity" }; { - auto getter = [myAvatar]() -> float { return myAvatar->getPitchSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getPitchSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setPitchSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "Y input:", getter, setter); preference->setMin(1.0f); @@ -430,7 +429,7 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = [myAvatar]() -> float { return myAvatar->getYawSpeed(); }; + auto getter = [myAvatar]()->float { return myAvatar->getYawSpeed(); }; auto setter = [myAvatar](float value) { myAvatar->setYawSpeed(value); }; auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "X input:", getter, setter); preference->setMin(1.0f); @@ -457,13 +456,13 @@ void setupPreferences() { preferences->addPreference(preference); } { - auto getter = []() -> bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; + auto getter = []()->bool { return !DependencyManager::get()->getOutputStarveDetectionEnabled(); }; auto setter = [](bool value) { DependencyManager::get()->setOutputStarveDetectionEnabled(!value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Disable output starve detection", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return DependencyManager::get()->getOutputBufferSize(); }; + auto getter = []()->float { return DependencyManager::get()->getOutputBufferSize(); }; auto setter = [](float value) { DependencyManager::get()->setOutputBufferSize(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Output buffer initial frames", getter, setter); preference->setMin(AudioClient::MIN_BUFFER_FRAMES); @@ -473,13 +472,13 @@ void setupPreferences() { } #if DEV_BUILD || PR_BUILD { - auto getter = []() -> bool { return DependencyManager::get()->isSimulatingJitter(); }; + auto getter = []()->bool { return DependencyManager::get()->isSimulatingJitter(); }; auto setter = [](bool value) { return DependencyManager::get()->setIsSimulatingJitter(value); }; auto preference = new CheckPreference(AUDIO_BUFFERS, "Packet jitter simulator", getter, setter); preferences->addPreference(preference); } { - auto getter = []() -> float { return DependencyManager::get()->getGateThreshold(); }; + auto getter = []()->float { return DependencyManager::get()->getGateThreshold(); }; auto setter = [](float value) { return DependencyManager::get()->setGateThreshold(value); }; auto preference = new SpinnerPreference(AUDIO_BUFFERS, "Packet throttle threshold", getter, setter); preference->setMin(1); @@ -494,8 +493,8 @@ void setupPreferences() { QWeakPointer nodeListWeak = DependencyManager::get(); { - static const int MIN_PORT_NUMBER{ 0 }; - static const int MAX_PORT_NUMBER{ 65535 }; + static const int MIN_PORT_NUMBER { 0 }; + static const int MAX_PORT_NUMBER { 65535 }; auto getter = [nodeListWeak] { auto nodeList = nodeListWeak.lock(); if (nodeList) { @@ -517,7 +516,7 @@ void setupPreferences() { } { - auto getter = []() -> float { return qApp->getMaxOctreePacketsPerSecond(); }; + auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); }; auto setter = [](float value) { qApp->setMaxOctreePacketsPerSecond(value); }; auto preference = new SpinnerPreference(NETWORKING, "Max entities packets sent each second", getter, setter); preference->setMin(60); From c61f0bcf3ec38ba7fd30f5768fc632629673ae3c Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 14:07:06 -0700 Subject: [PATCH 092/100] more vs cleanup --- interface/src/ui/PreferencesDialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 65595bac95..9149762fa4 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -55,7 +55,7 @@ void setupPreferences() { } // Graphics quality - static const QString GRAPHICS_QUALITY{ "Graphics Quality" }; + static const QString GRAPHICS_QUALITY { "Graphics Quality" }; { auto getter = []()->float { return DependencyManager::get()->getWorldDetailQuality(); @@ -105,7 +105,7 @@ void setupPreferences() { } // UI - static const QString UI_CATEGORY{ "User Interface" }; + static const QString UI_CATEGORY { "User Interface" }; { auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(value); }; @@ -206,7 +206,7 @@ void setupPreferences() { }*/ // Snapshots - static const QString SNAPSHOTS{ "Snapshots" }; + static const QString SNAPSHOTS { "Snapshots" }; { auto getter = []()->QString { return DependencyManager::get()->_snapshotsLocation.get(); }; auto setter = [](const QString& value) { DependencyManager::get()->_snapshotsLocation.set(value); emit DependencyManager::get()->snapshotLocationSet(value); }; From 049ff8e618f1584c8fa45c7e89ceec29d0bdf9e8 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 14:11:13 -0700 Subject: [PATCH 093/100] fixed last space --- interface/src/ui/PreferencesDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 9149762fa4..e0505770f5 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -30,7 +30,7 @@ void setupPreferences() { auto preferences = DependencyManager::get(); auto myAvatar = DependencyManager::get()->getMyAvatar(); - static const QString AVATAR_BASICS{ "Avatar Basics" }; + static const QString AVATAR_BASICS { "Avatar Basics" }; { auto getter = [myAvatar]()->QString { return myAvatar->getDisplayName(); }; auto setter = [myAvatar](const QString& value) { myAvatar->setDisplayName(value); }; From f2c6cb79f74900597aa21289e8e2acf77fad1489 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 14:17:49 -0700 Subject: [PATCH 094/100] if formatting --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index eaaf9502cf..0e873cbb70 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5182,7 +5182,7 @@ ivec2 Application::getMouse() const { FaceTracker* Application::getActiveFaceTracker() { auto dde = DependencyManager::get(); - if(dde && dde->isActive()){ + if (dde && dde->isActive()) { return static_cast(dde.data()); } From 129d96a997d0557e89de76c8aa0322e53382dede Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Fri, 7 Jun 2019 14:51:24 -0700 Subject: [PATCH 095/100] get rid of lightmapMap --- .../src/RenderableMaterialEntityItem.cpp | 4 +-- .../src/RenderableShapeEntityItem.cpp | 4 +-- libraries/entities/src/MaterialEntityItem.h | 2 +- .../src/graphics-scripting/Forward.h | 4 +-- .../GraphicsScriptingInterface.cpp | 8 ++--- .../graphics-scripting/ScriptableModel.cpp | 6 ++-- libraries/graphics/src/graphics/Material.cpp | 2 +- libraries/graphics/src/graphics/Material.h | 14 ++++---- .../src/graphics/MaterialTextures.slh | 4 +-- .../src/material-networking/MaterialCache.cpp | 20 +++++------ .../src/material-networking/MaterialCache.h | 2 +- .../render-utils/src/MeshPartPayload.cpp | 8 ++--- .../render-utils/src/RenderPipelines.cpp | 36 +++++++++---------- libraries/render/src/render/ShapePipeline.h | 10 +++--- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp index 9a634a85ad..01eac7b203 100644 --- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp @@ -257,7 +257,7 @@ ShapeKey MaterialEntityRenderer::getShapeKey() { bool isTranslucent = drawMaterialKey.isTranslucent(); bool hasTangents = drawMaterialKey.isNormalMap(); - bool hasLightmap = drawMaterialKey.isLightmapMap(); + bool hasLightmap = drawMaterialKey.isLightMap(); bool isUnlit = drawMaterialKey.isUnlit(); ShapeKey::Builder builder; @@ -270,7 +270,7 @@ ShapeKey MaterialEntityRenderer::getShapeKey() { builder.withTangents(); } if (hasLightmap) { - builder.withLightmap(); + builder.withLightMap(); } if (isUnlit) { builder.withUnlit(); diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp index fbc24cb4a5..7faebfdf56 100644 --- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp @@ -197,7 +197,7 @@ ShapeKey ShapeEntityRenderer::getShapeKey() { bool isTranslucent = drawMaterialKey.isTranslucent(); bool hasTangents = drawMaterialKey.isNormalMap(); - bool hasLightmap = drawMaterialKey.isLightmapMap(); + bool hasLightmap = drawMaterialKey.isLightMap(); bool isUnlit = drawMaterialKey.isUnlit(); ShapeKey::Builder builder; @@ -210,7 +210,7 @@ ShapeKey ShapeEntityRenderer::getShapeKey() { builder.withTangents(); } if (hasLightmap) { - builder.withLightmap(); + builder.withLightMap(); } if (isUnlit) { builder.withUnlit(); diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h index b9e83a7fe5..717ceb4ee0 100644 --- a/libraries/entities/src/MaterialEntityItem.h +++ b/libraries/entities/src/MaterialEntityItem.h @@ -88,7 +88,7 @@ private: // emissive, albedo // urls to textures: // emissiveMap, albedoMap (set opacityMap = albedoMap for transparency), metallicMap or specularMap, roughnessMap or glossMap, - // normalMap or bumpMap, occlusionMap, lightmapMap (broken, FIXME), scatteringMap (only works if normal mapped) + // normalMap or bumpMap, occlusionMap, lightMap (broken, FIXME), scatteringMap (only works if normal mapped) QString _materialURL; // Type of material. "uv" or "projected". MaterialMappingMode _materialMappingMode { UV }; diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h index 6d1b9d83d2..428c08e9f6 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h +++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h @@ -57,7 +57,7 @@ namespace scriptable { * @property {string} normalMap * @property {string} bumpMap * @property {string} occlusionMap - * @property {string} lightmapMap + * @property {string} lightMap * @property {string} scatteringMap * @property {Mat4|string} texCoordTransform0 * @property {Mat4|string} texCoordTransform1 @@ -91,7 +91,7 @@ namespace scriptable { QString normalMap; QString bumpMap; QString occlusionMap; - QString lightmapMap; + QString lightMap; QString scatteringMap; std::array texCoordTransforms; diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp index eb4bfa197c..404e2d3ac6 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp +++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp @@ -430,10 +430,10 @@ namespace scriptable { obj.setProperty("occlusionMap", material.occlusionMap); } - if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::LIGHTMAP_MAP_BIT)) { - obj.setProperty("lightmapMap", FALLTHROUGH); - } else if (!material.lightmapMap.isEmpty()) { - obj.setProperty("lightmapMap", material.lightmapMap); + if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::LIGHT_MAP_BIT)) { + obj.setProperty("lightMap", FALLTHROUGH); + } else if (!material.lightMap.isEmpty()) { + obj.setProperty("lightMap", material.lightMap); } if (hasPropertyFallthroughs && material.propertyFallthroughs.at(graphics::MaterialKey::SCATTERING_MAP_BIT)) { diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp index 8825a26bfe..e9cc7930ae 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp +++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp @@ -39,7 +39,7 @@ scriptable::ScriptableMaterial& scriptable::ScriptableMaterial::operator=(const normalMap = material.normalMap; bumpMap = material.bumpMap; occlusionMap = material.occlusionMap; - lightmapMap = material.lightmapMap; + lightMap = material.lightMap; scatteringMap = material.scatteringMap; defaultFallthrough = material.defaultFallthrough; @@ -110,9 +110,9 @@ scriptable::ScriptableMaterial::ScriptableMaterial(const graphics::MaterialPoint occlusionMap = map->getTextureSource()->getUrl().toString(); } - map = material->getTextureMap(graphics::Material::MapChannel::LIGHTMAP_MAP); + map = material->getTextureMap(graphics::Material::MapChannel::LIGHT_MAP); if (map && map->getTextureSource()) { - lightmapMap = map->getTextureSource()->getUrl().toString(); + lightMap = map->getTextureSource()->getUrl().toString(); } map = material->getTextureMap(graphics::Material::MapChannel::SCATTERING_MAP); diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp index 3ef407b7d9..6be8ec5f68 100755 --- a/libraries/graphics/src/graphics/Material.cpp +++ b/libraries/graphics/src/graphics/Material.cpp @@ -129,7 +129,7 @@ void Material::setTextureMap(MapChannel channel, const TextureMapPointer& textur _texcoordTransforms[1] = (textureMap ? textureMap->getTextureTransform().getMatrix() : glm::mat4()); } - if (channel == MaterialKey::LIGHTMAP_MAP) { + if (channel == MaterialKey::LIGHT_MAP) { // update the texcoord1 with lightmap _texcoordTransforms[1] = (textureMap ? textureMap->getTextureTransform().getMatrix() : glm::mat4()); _lightmapParams = (textureMap ? glm::vec2(textureMap->getLightmapOffsetScale()) : glm::vec2(0.0, 1.0)); diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h index 330feaa61c..25601c5743 100755 --- a/libraries/graphics/src/graphics/Material.h +++ b/libraries/graphics/src/graphics/Material.h @@ -53,7 +53,7 @@ public: ROUGHNESS_MAP_BIT, NORMAL_MAP_BIT, OCCLUSION_MAP_BIT, - LIGHTMAP_MAP_BIT, + LIGHT_MAP_BIT, SCATTERING_MAP_BIT, NUM_FLAGS, @@ -67,7 +67,7 @@ public: ROUGHNESS_MAP, NORMAL_MAP, OCCLUSION_MAP, - LIGHTMAP_MAP, + LIGHT_MAP, SCATTERING_MAP, NUM_MAP_CHANNELS, @@ -107,7 +107,7 @@ public: Builder& withNormalMap() { _flags.set(NORMAL_MAP_BIT); return (*this); } Builder& withOcclusionMap() { _flags.set(OCCLUSION_MAP_BIT); return (*this); } - Builder& withLightmapMap() { _flags.set(LIGHTMAP_MAP_BIT); return (*this); } + Builder& withLightMap() { _flags.set(LIGHT_MAP_BIT); return (*this); } Builder& withScatteringMap() { _flags.set(SCATTERING_MAP_BIT); return (*this); } // Convenient standard keys that we will keep on using all over the place @@ -157,8 +157,8 @@ public: void setOcclusionMap(bool value) { _flags.set(OCCLUSION_MAP_BIT, value); } bool isOcclusionMap() const { return _flags[OCCLUSION_MAP_BIT]; } - void setLightmapMap(bool value) { _flags.set(LIGHTMAP_MAP_BIT, value); } - bool isLightmapMap() const { return _flags[LIGHTMAP_MAP_BIT]; } + void setLightMap(bool value) { _flags.set(LIGHT_MAP_BIT, value); } + bool isLightMap() const { return _flags[LIGHT_MAP_BIT]; } void setScattering(bool value) { _flags.set(SCATTERING_VAL_BIT, value); } bool isScattering() const { return _flags[SCATTERING_VAL_BIT]; } @@ -235,8 +235,8 @@ public: Builder& withoutOcclusionMap() { _value.reset(MaterialKey::OCCLUSION_MAP_BIT); _mask.set(MaterialKey::OCCLUSION_MAP_BIT); return (*this); } Builder& withOcclusionMap() { _value.set(MaterialKey::OCCLUSION_MAP_BIT); _mask.set(MaterialKey::OCCLUSION_MAP_BIT); return (*this); } - Builder& withoutLightmapMap() { _value.reset(MaterialKey::LIGHTMAP_MAP_BIT); _mask.set(MaterialKey::LIGHTMAP_MAP_BIT); return (*this); } - Builder& withLightmapMap() { _value.set(MaterialKey::LIGHTMAP_MAP_BIT); _mask.set(MaterialKey::LIGHTMAP_MAP_BIT); return (*this); } + Builder& withoutLightMap() { _value.reset(MaterialKey::LIGHT_MAP_BIT); _mask.set(MaterialKey::LIGHT_MAP_BIT); return (*this); } + Builder& withLightMap() { _value.set(MaterialKey::LIGHT_MAP_BIT); _mask.set(MaterialKey::LIGHT_MAP_BIT); return (*this); } Builder& withoutScattering() { _value.reset(MaterialKey::SCATTERING_VAL_BIT); _mask.set(MaterialKey::SCATTERING_VAL_BIT); return (*this); } Builder& withScattering() { _value.set(MaterialKey::SCATTERING_VAL_BIT); _mask.set(MaterialKey::SCATTERING_VAL_BIT); return (*this); } diff --git a/libraries/graphics/src/graphics/MaterialTextures.slh b/libraries/graphics/src/graphics/MaterialTextures.slh index 92e76e5736..bf0416c7bf 100644 --- a/libraries/graphics/src/graphics/MaterialTextures.slh +++ b/libraries/graphics/src/graphics/MaterialTextures.slh @@ -178,7 +178,7 @@ float fetchScatteringMap(vec2 uv) { float <$occlusion$> = mix(1.0, fetchOcclusionMap(<$texcoord1$>), float((<$matKey$> & OCCLUSION_MAP_BIT) != 0)); <@endif@> <@if lightmap@> - vec3 <$lightmap$> = fetchLightmapMap(<$texcoord1$>); + vec3 <$lightmap$> = fetchLightMap(<$texcoord1$>); <@endif@> <@endfunc@> @@ -189,7 +189,7 @@ float fetchScatteringMap(vec2 uv) { <$declareMaterialTexMapArrayBuffer()$> LAYOUT(binding=GRAPHICS_TEXTURE_MATERIAL_EMISSIVE_LIGHTMAP) uniform sampler2D emissiveMap; -vec3 fetchLightmapMap(vec2 uv) { +vec3 fetchLightMap(vec2 uv) { vec2 lightmapParams = getTexMapArray()._lightmapParams; return (vec3(lightmapParams.x) + lightmapParams.y * texture(emissiveMap, uv).rgb); } diff --git a/libraries/material-networking/src/material-networking/MaterialCache.cpp b/libraries/material-networking/src/material-networking/MaterialCache.cpp index 745504fb3d..5e86ea506a 100644 --- a/libraries/material-networking/src/material-networking/MaterialCache.cpp +++ b/libraries/material-networking/src/material-networking/MaterialCache.cpp @@ -362,9 +362,9 @@ std::pair> NetworkMaterialResource if (value.isString()) { auto valueString = value.toString(); if (valueString == FALLTHROUGH) { - material->setPropertyDoesFallthrough(graphics::MaterialKey::FlagBit::LIGHTMAP_MAP_BIT); + material->setPropertyDoesFallthrough(graphics::MaterialKey::FlagBit::LIGHT_MAP_BIT); } else { - material->setLightmapMap(baseUrl.resolved(valueString)); + material->setLightMap(baseUrl.resolved(valueString)); } } } else if (key == "texCoordTransform0") { @@ -567,12 +567,12 @@ void NetworkMaterial::setScatteringMap(const QUrl& url) { } } -void NetworkMaterial::setLightmapMap(const QUrl& url) { - auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP); +void NetworkMaterial::setLightMap(const QUrl& url) { + auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHT_MAP); if (map) { //map->setTextureTransform(_lightmapTransform); //map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y); - setTextureMap(MapChannel::LIGHTMAP_MAP, map); + setTextureMap(MapChannel::LIGHT_MAP, map); } } @@ -640,14 +640,14 @@ NetworkMaterial::NetworkMaterial(const HFMMaterial& material, const QUrl& textur } if (!material.lightmapTexture.filename.isEmpty()) { - auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP); + auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHT_MAP); if (map) { _lightmapTransform = material.lightmapTexture.transform; _lightmapParams = material.lightmapParams; map->setTextureTransform(_lightmapTransform); map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y); } - setTextureMap(MapChannel::LIGHTMAP_MAP, map); + setTextureMap(MapChannel::LIGHT_MAP, map); } } @@ -660,7 +660,7 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) { const auto& metallicName = getTextureName(MapChannel::METALLIC_MAP); const auto& occlusionName = getTextureName(MapChannel::OCCLUSION_MAP); const auto& emissiveName = getTextureName(MapChannel::EMISSIVE_MAP); - const auto& lightmapName = getTextureName(MapChannel::LIGHTMAP_MAP); + const auto& lightmapName = getTextureName(MapChannel::LIGHT_MAP); const auto& scatteringName = getTextureName(MapChannel::SCATTERING_MAP); if (!albedoName.isEmpty()) { @@ -715,12 +715,12 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) { if (!lightmapName.isEmpty()) { auto url = textureMap.contains(lightmapName) ? textureMap[lightmapName].toUrl() : QUrl(); - auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP); + auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHT_MAP); if (map) { map->setTextureTransform(_lightmapTransform); map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y); } - setTextureMap(MapChannel::LIGHTMAP_MAP, map); + setTextureMap(MapChannel::LIGHT_MAP, map); } } diff --git a/libraries/material-networking/src/material-networking/MaterialCache.h b/libraries/material-networking/src/material-networking/MaterialCache.h index 7ed0453187..66e6b8250b 100644 --- a/libraries/material-networking/src/material-networking/MaterialCache.h +++ b/libraries/material-networking/src/material-networking/MaterialCache.h @@ -31,7 +31,7 @@ public: void setOcclusionMap(const QUrl& url); void setEmissiveMap(const QUrl& url); void setScatteringMap(const QUrl& url); - void setLightmapMap(const QUrl& url); + void setLightMap(const QUrl& url); bool isMissingTexture(); void checkResetOpacityMap(); diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp index cb3aa76468..1a6e5dbadc 100644 --- a/libraries/render-utils/src/MeshPartPayload.cpp +++ b/libraries/render-utils/src/MeshPartPayload.cpp @@ -115,8 +115,8 @@ ShapeKey MeshPartPayload::getShapeKey() const { if (drawMaterialKey.isNormalMap()) { builder.withTangents(); } - if (drawMaterialKey.isLightmapMap()) { - builder.withLightmap(); + if (drawMaterialKey.isLightMap()) { + builder.withLightMap(); } return builder.build(); } @@ -354,7 +354,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, PrimitiveMode pr bool isTranslucent = drawMaterialKey.isTranslucent(); bool hasTangents = drawMaterialKey.isNormalMap() && _hasTangents; - bool hasLightmap = drawMaterialKey.isLightmapMap(); + bool hasLightmap = drawMaterialKey.isLightMap(); bool isUnlit = drawMaterialKey.isUnlit(); bool isDeformed = _isBlendShaped || _isSkinned; @@ -374,7 +374,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, PrimitiveMode pr builder.withTangents(); } if (hasLightmap) { - builder.withLightmap(); + builder.withLightMap(); } if (isUnlit) { builder.withUnlit(); diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp index 2817abb4a1..69a76cce00 100644 --- a/libraries/render-utils/src/RenderPipelines.cpp +++ b/libraries/render-utils/src/RenderPipelines.cpp @@ -107,7 +107,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip model_translucent_normal_map, nullptr, nullptr); addPipeline( // FIXME: Ignore lightmap for translucents meshpart - Key::Builder().withMaterial().withTranslucent().withLightmap(), + Key::Builder().withMaterial().withTranslucent().withLightMap(), model_translucent, nullptr, nullptr); // Same thing but with Fade on addPipeline( @@ -127,21 +127,21 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip model_translucent_normal_map_fade, batchSetter, itemSetter); addPipeline( // FIXME: Ignore lightmap for translucents meshpart - Key::Builder().withMaterial().withTranslucent().withLightmap().withFade(), + Key::Builder().withMaterial().withTranslucent().withLightMap().withFade(), model_translucent_fade, batchSetter, itemSetter); // Lightmapped addPipeline( - Key::Builder().withMaterial().withLightmap(), + Key::Builder().withMaterial().withLightMap(), model_lightmap, nullptr, nullptr); addPipeline( - Key::Builder().withMaterial().withLightmap().withTangents(), + Key::Builder().withMaterial().withLightMap().withTangents(), model_lightmap_normal_map, nullptr, nullptr); // Same thing but with Fade on addPipeline( - Key::Builder().withMaterial().withLightmap().withFade(), + Key::Builder().withMaterial().withLightMap().withFade(), model_lightmap_fade, batchSetter, itemSetter); addPipeline( - Key::Builder().withMaterial().withLightmap().withTangents().withFade(), + Key::Builder().withMaterial().withLightMap().withTangents().withFade(), model_lightmap_normal_map_fade, batchSetter, itemSetter); // matrix palette skinned @@ -228,10 +228,10 @@ void initForwardPipelines(ShapePlumber& plumber) { // Opaques addPipeline(Key::Builder().withMaterial(), program::forward_model); - addPipeline(Key::Builder().withMaterial().withLightmap(), program::forward_model_lightmap); + addPipeline(Key::Builder().withMaterial().withLightMap(), program::forward_model_lightmap); addPipeline(Key::Builder().withMaterial().withUnlit(), program::forward_model_unlit); addPipeline(Key::Builder().withMaterial().withTangents(), program::forward_model_normal_map); - addPipeline(Key::Builder().withMaterial().withTangents().withLightmap(), program::forward_model_normal_map_lightmap); + addPipeline(Key::Builder().withMaterial().withTangents().withLightMap(), program::forward_model_normal_map_lightmap); // Deformed Opaques addPipeline(Key::Builder().withMaterial().withDeformed(), program::forward_deformed_model); @@ -581,7 +581,7 @@ void RenderPipelines::updateMultiMaterial(graphics::MultiMaterial& multiMaterial break; case graphics::MaterialKey::EMISSIVE_MAP_BIT: // Lightmap takes precendence over emissive map for legacy reasons - if (materialKey.isEmissiveMap() && !materialKey.isLightmapMap()) { + if (materialKey.isEmissiveMap() && !materialKey.isLightMap()) { auto itr = textureMaps.find(graphics::MaterialKey::EMISSIVE_MAP); if (itr != textureMaps.end()) { if (itr->second->isDefined()) { @@ -595,14 +595,14 @@ void RenderPipelines::updateMultiMaterial(graphics::MultiMaterial& multiMaterial forceDefault = true; } schemaKey.setEmissiveMap(true); - } else if (materialKey.isLightmapMap()) { + } else if (materialKey.isLightMap()) { // We'll set this later when we check the lightmap wasSet = true; } break; - case graphics::MaterialKey::LIGHTMAP_MAP_BIT: - if (materialKey.isLightmapMap()) { - auto itr = textureMaps.find(graphics::MaterialKey::LIGHTMAP_MAP); + case graphics::MaterialKey::LIGHT_MAP_BIT: + if (materialKey.isLightMap()) { + auto itr = textureMaps.find(graphics::MaterialKey::LIGHT_MAP); if (itr != textureMaps.end()) { if (itr->second->isDefined()) { drawMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, itr->second->getTextureView()); @@ -614,7 +614,7 @@ void RenderPipelines::updateMultiMaterial(graphics::MultiMaterial& multiMaterial } else { forceDefault = true; } - schemaKey.setLightmapMap(true); + schemaKey.setLightMap(true); } break; case graphics::Material::TEXCOORDTRANSFORM0: @@ -712,12 +712,12 @@ void RenderPipelines::updateMultiMaterial(graphics::MultiMaterial& multiMaterial } break; case graphics::MaterialKey::EMISSIVE_MAP_BIT: - if (schemaKey.isEmissiveMap() && !schemaKey.isLightmapMap()) { + if (schemaKey.isEmissiveMap() && !schemaKey.isLightMap()) { drawMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getGrayTexture()); } break; - case graphics::MaterialKey::LIGHTMAP_MAP_BIT: - if (schemaKey.isLightmapMap()) { + case graphics::MaterialKey::LIGHT_MAP_BIT: + if (schemaKey.isLightMap()) { drawMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getBlackTexture()); } break; @@ -765,7 +765,7 @@ bool RenderPipelines::bindMaterials(graphics::MultiMaterial& multiMaterial, gpu: batch.setResourceTextureTable(multiMaterial.getTextureTable()); } else { if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE) { - if (key.isLightmapMap()) { + if (key.isLightMap()) { defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getBlackTexture()); } else if (key.isEmissiveMap()) { defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getGrayTexture()); diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h index 159d2ba6f3..ad91ea61ef 100644 --- a/libraries/render/src/render/ShapePipeline.h +++ b/libraries/render/src/render/ShapePipeline.h @@ -74,7 +74,7 @@ public: Builder& withMaterial() { _flags.set(MATERIAL); return (*this); } Builder& withTranslucent() { _flags.set(TRANSLUCENT); return (*this); } - Builder& withLightmap() { _flags.set(LIGHTMAP); return (*this); } + Builder& withLightMap() { _flags.set(LIGHTMAP); return (*this); } Builder& withTangents() { _flags.set(TANGENTS); return (*this); } Builder& withUnlit() { _flags.set(UNLIT); return (*this); } Builder& withDeformed() { _flags.set(DEFORMED); return (*this); } @@ -116,8 +116,8 @@ public: Builder& withTranslucent() { _flags.set(TRANSLUCENT); _mask.set(TRANSLUCENT); return (*this); } Builder& withOpaque() { _flags.reset(TRANSLUCENT); _mask.set(TRANSLUCENT); return (*this); } - Builder& withLightmap() { _flags.set(LIGHTMAP); _mask.set(LIGHTMAP); return (*this); } - Builder& withoutLightmap() { _flags.reset(LIGHTMAP); _mask.set(LIGHTMAP); return (*this); } + Builder& withLightMap() { _flags.set(LIGHTMAP); _mask.set(LIGHTMAP); return (*this); } + Builder& withoutLightMap() { _flags.reset(LIGHTMAP); _mask.set(LIGHTMAP); return (*this); } Builder& withTangents() { _flags.set(TANGENTS); _mask.set(TANGENTS); return (*this); } Builder& withoutTangents() { _flags.reset(TANGENTS); _mask.set(TANGENTS); return (*this); } @@ -160,7 +160,7 @@ public: }; bool useMaterial() const { return _flags[MATERIAL]; } - bool hasLightmap() const { return _flags[LIGHTMAP]; } + bool hasLightMap() const { return _flags[LIGHTMAP]; } bool hasTangents() const { return _flags[TANGENTS]; } bool isUnlit() const { return _flags[UNLIT]; } bool isTranslucent() const { return _flags[TRANSLUCENT]; } @@ -199,7 +199,7 @@ inline QDebug operator<<(QDebug debug, const ShapeKey& key) { } else { debug << "[ShapeKey:" << "useMaterial:" << key.useMaterial() - << "hasLightmap:" << key.hasLightmap() + << "hasLightmap:" << key.hasLightMap() << "hasTangents:" << key.hasTangents() << "isUnlit:" << key.isUnlit() << "isTranslucent:" << key.isTranslucent() From a0753f6393313f0ffebce8439bd5e91917213d3a Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Fri, 7 Jun 2019 15:41:44 -0700 Subject: [PATCH 096/100] removed ctrl+b and ctrl+n as shortcuts --- interface/resources/qml/hifi/Desktop.qml | 1 - interface/src/Application.cpp | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index a97d94d91c..5fa6234504 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -25,7 +25,6 @@ OriginalDesktop.Desktop { Action { text: "Open Browser" - shortcut: "Ctrl+B" onTriggered: { console.log("Open browser"); browserBuilder.createObject(desktop); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4a0bce5103..a2813eaa57 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4303,10 +4303,7 @@ void Application::keyPressEvent(QKeyEvent* event) { break; case Qt::Key_B: - if (isMeta) { - auto offscreenUi = getOffscreenUI(); - offscreenUi->load("Browser.qml"); - } else if (isOption) { + if (isOption) { controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance(); inputRecorder->stopPlayback(); } @@ -4345,12 +4342,6 @@ void Application::keyPressEvent(QKeyEvent* event) { } break; - case Qt::Key_N: - if (!isOption && !isShifted && isMeta) { - DependencyManager::get()->toggleIgnoreRadius(); - } - break; - case Qt::Key_S: if (isShifted && isMeta && !isOption) { Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings); From da071abd8b56333983755d1f0d32b705a6df9316 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 16:25:04 -0700 Subject: [PATCH 097/100] wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist --- interface/src/Application.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0e873cbb70..7807014dd6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -274,6 +274,8 @@ static QTimer pingTimer; #if defined(Q_OS_ANDROID) static bool DISABLE_WATCHDOG = true; #else + + static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" }; static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG); #endif @@ -5180,11 +5182,13 @@ ivec2 Application::getMouse() const { } FaceTracker* Application::getActiveFaceTracker() { +#ifdef HAVE_DDE auto dde = DependencyManager::get(); if (dde && dde->isActive()) { return static_cast(dde.data()); } +#endif return nullptr; } @@ -7228,6 +7232,9 @@ void Application::nodeKilled(SharedNodePointer node) { _entityEditSender.nodeKilled(node); + qDebug() << "NODE KIlled: " << node->getType() << "********************************************************"; + + if (node->getType() == NodeType::AudioMixer) { QMetaObject::invokeMethod(DependencyManager::get().data(), "audioMixerKilled"); } else if (node->getType() == NodeType::EntityServer) { From b57e4869c8b29f19c42e16db6e25b9daa1a1df44 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 16:26:21 -0700 Subject: [PATCH 098/100] removed debug info --- interface/src/Application.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7807014dd6..8286f73ff0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -274,8 +274,6 @@ static QTimer pingTimer; #if defined(Q_OS_ANDROID) static bool DISABLE_WATCHDOG = true; #else - - static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" }; static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG); #endif @@ -7231,10 +7229,7 @@ void Application::nodeKilled(SharedNodePointer node) { _octreeProcessor.nodeKilled(node); _entityEditSender.nodeKilled(node); - - qDebug() << "NODE KIlled: " << node->getType() << "********************************************************"; - - + if (node->getType() == NodeType::AudioMixer) { QMetaObject::invokeMethod(DependencyManager::get().data(), "audioMixerKilled"); } else if (node->getType() == NodeType::EntityServer) { From 00bba828ee12471249307bfdf7e5642358510918 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Fri, 7 Jun 2019 16:41:56 -0700 Subject: [PATCH 099/100] Fix crash using Settings in the Tablet in VR This was introduced in Qt5.12.3. There are several issues in their bug tracker about this issue. https://bugreports.qt.io/browse/QTBUG-75516 https://bugreports.qt.io/browse/QTBUG-75335 To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us. --- interface/resources/qml/hifi/tablet/TabletMenuStack.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml index fe636dafa5..76d170cba8 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml @@ -49,7 +49,10 @@ Item { } function pushSource(path) { - d.push(Qt.resolvedUrl("../../" + path)); + // Workaround issue https://bugreports.qt.io/browse/QTBUG-75516 in Qt 5.12.3 + // by creating the manually, instead of letting StackView do it for us. + var item = Qt.createComponent(Qt.resolvedUrl("../../" + path)); + d.push(item); if (d.currentItem.sendToScript !== undefined) { d.currentItem.sendToScript.connect(tabletMenu.sendToScript); } From 9d57f5ac6295a6b7b8d69a7322d4713f4fdd8747 Mon Sep 17 00:00:00 2001 From: Ken Cooke Date: Fri, 7 Jun 2019 18:35:39 -0700 Subject: [PATCH 100/100] Defer DependencyManager::destroy() until all ScriptAudioInjectors have been destroyed --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4a0bce5103..106ecfc606 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2759,7 +2759,6 @@ void Application::cleanupBeforeQuit() { // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine QMetaObject::invokeMethod(DependencyManager::get().data(), "stop"); DependencyManager::destroy(); - DependencyManager::destroy(); DependencyManager::destroy(); // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted, @@ -2819,6 +2818,7 @@ Application::~Application() { DependencyManager::destroy(); + DependencyManager::destroy(); DependencyManager::destroy(); DependencyManager::destroy(); DependencyManager::destroy();