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

finish name changes as per PR feedback

Browse source
This commit is contained in:
Andrew Meadows 2016-07-08 23:08:49 -07:00
parent 25fdea6bac
commit c50d41c532
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -210,21 +210,21 @@ void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxG
} }
std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>(); std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
std::shared_ptr<GeometryMeshParts> shapes = std::make_shared<GeometryMeshParts>(); std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
int meshID = 0; int meshID = 0;
for (const FBXMesh& mesh : _fbxGeometry->meshes) { for (const FBXMesh& mesh : _fbxGeometry->meshes) {
// Copy mesh pointers // Copy mesh pointers
meshes->emplace_back(mesh._mesh); meshes->emplace_back(mesh._mesh);
int partID = 0; int partID = 0;
for (const FBXMeshPart& part : mesh.parts) { for (const FBXMeshPart& part : mesh.parts) {
// Construct local shapes // Construct local parts
shapes->push_back(std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID])); parts->push_back(std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]));
partID++; partID++;
} }
meshID++; meshID++;
} }
_meshes = meshes; _meshes = meshes;
_meshParts = shapes; _meshParts = parts;
finishedLoading(true); finishedLoading(true);
} }
@ -334,9 +334,9 @@ bool Geometry::areTexturesLoaded() const {
return true; return true;
} }
const std::shared_ptr<const NetworkMaterial> Geometry::getShapeMaterial(int shapeID) const { const std::shared_ptr<const NetworkMaterial> Geometry::getShapeMaterial(int partID) const {
if ((shapeID >= 0) && (shapeID < (int)_meshParts->size())) { if ((partID >= 0) && (partID < (int)_meshParts->size())) {
int materialID = _meshParts->at(shapeID)->materialID; int materialID = _meshParts->at(partID)->materialID;
if ((materialID >= 0) && (materialID < (int)_materials.size())) { if ((materialID >= 0) && (materialID < (int)_materials.size())) {
return _materials[materialID]; return _materials[materialID];
} }