Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix typo

Browse source
This commit is contained in:
ZappoMan 2015-06-16 15:55:37 -07:00
parent 1beb95cfe7
commit 5abd608ccc
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/render-utils/src/Model.cpp
View file

@ -83,7 +83,7 @@ Model::Model(QObject* parent) :
_blendNumber(0), _blendNumber(0),
_appliedBlendNumber(0), _appliedBlendNumber(0),
_calculatedMeshPartBoxesValid(false), _calculatedMeshPartBoxesValid(false),
_calculatedMeshPartOffetValid(false), _calculatedMeshPartOffsetValid(false),
_calculatedMeshBoxesValid(false), _calculatedMeshBoxesValid(false),
_calculatedMeshTrianglesValid(false), _calculatedMeshTrianglesValid(false),
_meshGroupsKnown(false), _meshGroupsKnown(false),
@ -666,22 +666,22 @@ bool Model::convexHullContains(glm::vec3 point) {
} }
void Model::recalculateMeshPartOffsets() { void Model::recalculateMeshPartOffsets() {
if (!_calculatedMeshPartOffetValid) { if (!_calculatedMeshPartOffsetValid) {
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
int numberOfMeshes = geometry.meshes.size(); int numberOfMeshes = geometry.meshes.size();
_calculatedMeshPartOffet.clear(); _calculatedMeshPartOffset.clear();
for (int i = 0; i < numberOfMeshes; i++) { for (int i = 0; i < numberOfMeshes; i++) {
const FBXMesh& mesh = geometry.meshes.at(i); const FBXMesh& mesh = geometry.meshes.at(i);
qint64 partOffset = 0; qint64 partOffset = 0;
for (int j = 0; j < mesh.parts.size(); j++) { for (int j = 0; j < mesh.parts.size(); j++) {
const FBXMeshPart& part = mesh.parts.at(j); const FBXMeshPart& part = mesh.parts.at(j);
_calculatedMeshPartOffet[QPair<int,int>(i, j)] = partOffset; _calculatedMeshPartOffset[QPair<int,int>(i, j)] = partOffset;
partOffset += part.quadIndices.size() * sizeof(int); partOffset += part.quadIndices.size() * sizeof(int);
partOffset += part.triangleIndices.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 // 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.clear();
_calculatedMeshTriangles.resize(numberOfMeshes); _calculatedMeshTriangles.resize(numberOfMeshes);
_calculatedMeshPartBoxes.clear(); _calculatedMeshPartBoxes.clear();
_calculatedMeshPartOffet.clear(); _calculatedMeshPartOffset.clear();
_calculatedMeshPartOffetValid = false; _calculatedMeshPartOffsetValid = false;
for (int i = 0; i < numberOfMeshes; i++) { for (int i = 0; i < numberOfMeshes; i++) {
const FBXMesh& mesh = geometry.meshes.at(i); const FBXMesh& mesh = geometry.meshes.at(i);
Extents scaledMeshExtents = calculateScaledOffsetExtents(mesh.meshExtents); Extents scaledMeshExtents = calculateScaledOffsetExtents(mesh.meshExtents);
@ -795,7 +795,7 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) {
} }
} }
_calculatedMeshPartBoxes[QPair<int,int>(i, j)] = thisPartBounds; _calculatedMeshPartBoxes[QPair<int,int>(i, j)] = thisPartBounds;
_calculatedMeshPartOffet[QPair<int,int>(i, j)] = partOffset; _calculatedMeshPartOffset[QPair<int,int>(i, j)] = partOffset;
partOffset += part.quadIndices.size() * sizeof(int); partOffset += part.quadIndices.size() * sizeof(int);
partOffset += part.triangleIndices.size() * sizeof(int); partOffset += part.triangleIndices.size() * sizeof(int);
@ -803,7 +803,7 @@ void Model::recalculateMeshBoxes(bool pickAgainstTriangles) {
} }
_calculatedMeshTriangles[i] = thisMeshTriangles; _calculatedMeshTriangles[i] = thisMeshTriangles;
_calculatedMeshPartBoxesValid = true; _calculatedMeshPartBoxesValid = true;
_calculatedMeshPartOffetValid = true; _calculatedMeshPartOffsetValid = true;
} }
} }
_calculatedMeshBoxesValid = 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 // We need to make sure we have valid offsets calculated before we can render
if (!_calculatedMeshPartOffetValid) { if (!_calculatedMeshPartOffsetValid) {
recalculateMeshPartOffsets(); recalculateMeshPartOffsets();
} }
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();
@ -2018,7 +2018,7 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran
} }
} }
qint64 offset = _calculatedMeshPartOffet[QPair<int,int>(meshIndex, partIndex)]; qint64 offset = _calculatedMeshPartOffset[QPair<int,int>(meshIndex, partIndex)];
if (part.quadIndices.size() > 0) { if (part.quadIndices.size() > 0) {
batch.drawIndexed(gpu::QUADS, part.quadIndices.size(), offset); batch.drawIndexed(gpu::QUADS, part.quadIndices.size(), offset);

4
libraries/render-utils/src/Model.h
View file

@ -369,8 +369,8 @@ private:
}; };
QHash<QPair<int,int>, AABox> _calculatedMeshPartBoxes; // world coordinate AABoxes for all sub mesh part boxes QHash<QPair<int,int>, AABox> _calculatedMeshPartBoxes; // world coordinate AABoxes for all sub mesh part boxes
QHash<QPair<int,int>, qint64> _calculatedMeshPartOffet; QHash<QPair<int,int>, qint64> _calculatedMeshPartOffset;
bool _calculatedMeshPartOffetValid; bool _calculatedMeshPartOffsetValid;
bool _calculatedMeshPartBoxesValid; bool _calculatedMeshPartBoxesValid;