Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 14:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unused variables/implicit type conversions

Browse source
This commit is contained in:
sabrina-shanman 2019-11-08 10:04:34 -08:00
parent 33bb0e2b19
commit a42e09aef8
2 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -357,7 +357,6 @@ bool RenderableModelEntityItem::isReadyToComputeShape() const {
void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) { void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
const uint32_t TRIANGLE_STRIDE = 3; const uint32_t TRIANGLE_STRIDE = 3;
const uint32_t QUAD_STRIDE = 4;
ShapeType type = getShapeType(); ShapeType type = getShapeType();
@ -439,8 +438,8 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
// multiply each point by scale before handing the point-set off to the physics engine. // multiply each point by scale before handing the point-set off to the physics engine.
// also determine the extents of the collision model. // also determine the extents of the collision model.
glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()); glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint());
for (int32_t i = 0; i < pointCollection.size(); i++) { for (size_t i = 0; i < pointCollection.size(); i++) {
for (int32_t j = 0; j < pointCollection[i].size(); j++) { for (size_t j = 0; j < pointCollection[i].size(); j++) {
// back compensate for registration so we can apply that offset to the shapeInfo later // back compensate for registration so we can apply that offset to the shapeInfo later
pointCollection[i][j] = scaleToFit * (pointCollection[i][j] + model->getOffset()) - registrationOffset; pointCollection[i][j] = scaleToFit * (pointCollection[i][j] + model->getOffset()) - registrationOffset;
} }
@ -454,32 +453,9 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
model->updateGeometry(); model->updateGeometry();
// compute meshPart local transforms // compute meshPart local transforms
QVector<glm::mat4> localTransforms;
const HFMModel& hfmModel = model->getHFMModel(); const HFMModel& hfmModel = model->getHFMModel();
uint32_t numHFMShapes = (uint32_t)hfmModel.shapes.size();
localTransforms.reserve(numHFMShapes);
glm::vec3 dimensions = getScaledDimensions(); glm::vec3 dimensions = getScaledDimensions();
glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT)); glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
for (uint32_t s = 0; s < numHFMShapes; s++) {
const HFMShape& shape = hfmModel.shapes[s];
if (shape.joint != hfm::UNDEFINED_KEY) {
auto jointMatrix = model->getRig().getJointTransform(shape.joint);
// we backtranslate by the registration offset so we can apply that offset to the shapeInfo later
if (shape.skinDeformer != hfm::UNDEFINED_KEY) {
const auto& skinDeformer = hfmModel.skinDeformers[shape.skinDeformer];
glm::mat4 inverseBindMatrix;
if (!skinDeformer.clusters.empty()) {
const auto& cluster = skinDeformer.clusters.back();
inverseBindMatrix = cluster.inverseBindMatrix;
}
localTransforms.push_back(invRegistraionOffset * jointMatrix * inverseBindMatrix);
} else {
localTransforms.push_back(invRegistraionOffset * jointMatrix);
}
} else {
localTransforms.push_back(invRegistraionOffset);
}
}
ShapeInfo::TriangleIndices& triangleIndices = shapeInfo.getTriangleIndices(); ShapeInfo::TriangleIndices& triangleIndices = shapeInfo.getTriangleIndices();
triangleIndices.clear(); triangleIndices.clear();
@ -664,7 +640,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
} }
} }
for (auto points : pointCollection) { for (auto points : pointCollection) {
for (int32_t i = 0; i < points.size(); ++i) { for (size_t i = 0; i < points.size(); ++i) {
points[i] = (points[i] * scaleToFit); points[i] = (points[i] * scaleToFit);
} }
} }

4
libraries/physics/src/ShapeFactory.cpp
View file

@ -109,7 +109,7 @@ btConvexHullShape* createConvexHull(const ShapeInfo::PointList& points) {
glm::vec3 center = points[0]; glm::vec3 center = points[0];
glm::vec3 maxCorner = center; glm::vec3 maxCorner = center;
glm::vec3 minCorner = center; glm::vec3 minCorner = center;
for (int i = 1; i < points.size(); i++) { for (size_t i = 1; i < points.size(); i++) {
center += points[i]; center += points[i];
maxCorner = glm::max(maxCorner, points[i]); maxCorner = glm::max(maxCorner, points[i]);
minCorner = glm::min(minCorner, points[i]); minCorner = glm::min(minCorner, points[i]);
@ -149,7 +149,7 @@ btConvexHullShape* createConvexHull(const ShapeInfo::PointList& points) {
// add the points, correcting for margin // add the points, correcting for margin
glm::vec3 relativeScale = (diagonal - glm::vec3(2.0f * margin)) / diagonal; glm::vec3 relativeScale = (diagonal - glm::vec3(2.0f * margin)) / diagonal;
glm::vec3 correctedPoint; glm::vec3 correctedPoint;
for (int i = 0; i < points.size(); ++i) { for (size_t i = 0; i < points.size(); ++i) {
correctedPoint = (points[i] - center) * relativeScale + center; correctedPoint = (points[i] - center) * relativeScale + center;
hull->addPoint(btVector3(correctedPoint[0], correctedPoint[1], correctedPoint[2]), false); hull->addPoint(btVector3(correctedPoint[0], correctedPoint[1], correctedPoint[2]), false);
} }