From 5abd608ccc040cd816320dc621bdef332a852bf8 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 16 Jun 2015 15:55:37 -0700 Subject: [PATCH] fix typo --- libraries/render-utils/src/Model.cpp | 22 +++++++++++----------- libraries/render-utils/src/Model.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 062f08debb..3b2943b65b 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -83,7 +83,7 @@ Model::Model(QObject* parent) : _blendNumber(0), _appliedBlendNumber(0), _calculatedMeshPartBoxesValid(false), - _calculatedMeshPartOffetValid(false), + _calculatedMeshPartOffsetValid(false), _calculatedMeshBoxesValid(false), _calculatedMeshTrianglesValid(false), _meshGroupsKnown(false), @@ -666,22 +666,22 @@ bool Model::convexHullContains(glm::vec3 point) { } void Model::recalculateMeshPartOffsets() { - if (!_calculatedMeshPartOffetValid) { + if (!_calculatedMeshPartOffsetValid) { const FBXGeometry& geometry = _geometry->getFBXGeometry(); int numberOfMeshes = geometry.meshes.size(); - _calculatedMeshPartOffet.clear(); + _calculatedMeshPartOffset.clear(); for (int i = 0; i < numberOfMeshes; i++) { const FBXMesh& mesh = geometry.meshes.at(i); qint64 partOffset = 0; for (int j = 0; j < mesh.parts.size(); j++) { const FBXMeshPart& part = mesh.parts.at(j); - _calculatedMeshPartOffet[QPair(i, j)] = partOffset; + _calculatedMeshPartOffset[QPair(i, j)] = partOffset; partOffset += part.quadIndices.size() * sizeof(int); partOffset += part.triangleIndices.size() * sizeof(int); } } - _calculatedMeshPartOffetValid = true; + _calculatedMeshPartOffsetValid = true; } } // TODO: we seem to call this too often when things haven't actually changed... look into optimizing this @@ -699,8 +699,8 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) { _calculatedMeshTriangles.clear(); _calculatedMeshTriangles.resize(numberOfMeshes); _calculatedMeshPartBoxes.clear(); - _calculatedMeshPartOffet.clear(); - _calculatedMeshPartOffetValid = false; + _calculatedMeshPartOffset.clear(); + _calculatedMeshPartOffsetValid = false; for (int i = 0; i < numberOfMeshes; i++) { const FBXMesh& mesh = geometry.meshes.at(i); Extents scaledMeshExtents = calculateScaledOffsetExtents(mesh.meshExtents); @@ -795,7 +795,7 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) { } } _calculatedMeshPartBoxes[QPair(i, j)] = thisPartBounds; - _calculatedMeshPartOffet[QPair(i, j)] = partOffset; + _calculatedMeshPartOffset[QPair(i, j)] = partOffset; partOffset += part.quadIndices.size() * sizeof(int); partOffset += part.triangleIndices.size() * sizeof(int); @@ -803,7 +803,7 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) { } _calculatedMeshTriangles[i] = thisMeshTriangles; _calculatedMeshPartBoxesValid = true; - _calculatedMeshPartOffetValid = true; + _calculatedMeshPartOffsetValid = true; } } _calculatedMeshBoxesValid = true; @@ -1809,7 +1809,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran } // We need to make sure we have valid offsets calculated before we can render - if (!_calculatedMeshPartOffetValid) { + if (!_calculatedMeshPartOffsetValid) { recalculateMeshPartOffsets(); } auto textureCache = DependencyManager::get(); @@ -2018,7 +2018,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran } } - qint64 offset = _calculatedMeshPartOffet[QPair(meshIndex, partIndex)]; + qint64 offset = _calculatedMeshPartOffset[QPair(meshIndex, partIndex)]; if (part.quadIndices.size() > 0) { batch.drawIndexed(gpu::QUADS, part.quadIndices.size(), offset); diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 84393c99e1..6dfe223581 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -369,8 +369,8 @@ private: }; QHash, AABox> _calculatedMeshPartBoxes; // world coordinate AABoxes for all sub mesh part boxes - QHash, qint64> _calculatedMeshPartOffet; - bool _calculatedMeshPartOffetValid; + QHash, qint64> _calculatedMeshPartOffset; + bool _calculatedMeshPartOffsetValid; bool _calculatedMeshPartBoxesValid;