Merge branch 'main' into hidmic/csv-data

gazebosim · Aug 16, 2022 · be13770 · be13770
2 parents 4008a99 + 81c2ebd
commit be13770
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc
@@ -579,8 +579,7 @@ SubMesh AssimpLoader::Implementation::CreateSubMesh(
  math::Vector3d texcoords;
  texcoords.X(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].x);
  texcoords.Y(_assimpMesh->mTextureCoords[uvIdx][vertexIdx].y);
- // TODO(luca) why do we need 1.0 - Y?
- subMesh.AddTexCoordBySet(texcoords.X(), 1.0 - texcoords.Y(), uvIdx);
+ subMesh.AddTexCoordBySet(texcoords.X(), texcoords.Y(), uvIdx);
  ++uvIdx;
  }
  }
@@ -618,6 +617,7 @@ Mesh *AssimpLoader::Load(const std::string &_filename)
  aiProcess_JoinIdenticalVertices |
  aiProcess_RemoveRedundantMaterials |
  aiProcess_SortByPType |
+ aiProcess_FlipUVs |
 #ifndef GZ_ASSIMP_PRE_5_2_0
  aiProcess_PopulateArmatureData |
 #endif

diff --git a/graphics/src/MeshManager.cc b/graphics/src/MeshManager.cc
@@ -111,7 +111,6 @@ MeshManager::MeshManager()
  this->dataPtr->fileExtensions.insert("gltf");
  this->dataPtr->fileExtensions.insert("glb");
  this->dataPtr->fileExtensions.insert("fbx");
-
 }
 
 //////////////////////////////////////////////////