|
|
|
@ -530,8 +530,6 @@ std::optional<MeshData3D> ObjImporter::doMesh3D(UnsignedInt id) { |
|
|
|
std::vector<Vector3> positions, normals; |
|
|
|
std::vector<Vector3> positions, normals; |
|
|
|
std::vector<Vector2> textureCoords; |
|
|
|
std::vector<Vector2> textureCoords; |
|
|
|
|
|
|
|
|
|
|
|
Debug() << "Have" << mesh.indices.size() << "vertices"; //
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// resolve indices... probably use combineIndexArrays instead?
|
|
|
|
// resolve indices... probably use combineIndexArrays instead?
|
|
|
|
positions.reserve(mesh.indices.size()); |
|
|
|
positions.reserve(mesh.indices.size()); |
|
|
|
normals.reserve(mesh.indices.size()); |
|
|
|
normals.reserve(mesh.indices.size()); |
|
|
|
@ -602,8 +600,6 @@ std::optional<ImageData2D> ObjImporter::doImage2D(UnsignedInt id) { |
|
|
|
return std::nullopt; |
|
|
|
return std::nullopt; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Debug() << "Loading image2D" << _fileRoot + _state->textures[id]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return imageImporter->image2D(0); |
|
|
|
return imageImporter->image2D(0); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|