diff --git a/.gitignore b/.gitignore index 056712c..e5390c9 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ fabric.properties # Object files *.o *.ko -*.obj *.elf # Linker output diff --git a/assets/buildings/stone_mason/stone_mason.webp b/assets/buildings/stone_mason/stone_mason.webp new file mode 100644 index 0000000..125d9b0 Binary files /dev/null and b/assets/buildings/stone_mason/stone_mason.webp differ diff --git a/src/engine/renderer/loader/OBJLoader.cpp b/src/engine/renderer/loader/OBJLoader.cpp index cf9c606..c49a82f 100644 --- a/src/engine/renderer/loader/OBJLoader.cpp +++ b/src/engine/renderer/loader/OBJLoader.cpp @@ -38,7 +38,7 @@ std::shared_ptr OBJLoader::loadModel(const std::string &modelPath // UV-Koordinaten if (!attrib.texcoords.empty()) { uvs.push_back(attrib.texcoords[2*index.texcoord_index + 0]); - uvs.push_back(attrib.texcoords[2*index.texcoord_index + 1]); + uvs.push_back(1.0f - attrib.texcoords[2*index.texcoord_index + 1]); } else { uvs.push_back(0.0f); uvs.push_back(0.0f); diff --git a/src/game/GameLayer.cpp b/src/game/GameLayer.cpp index 0a652d0..b5ccaab 100644 --- a/src/game/GameLayer.cpp +++ b/src/game/GameLayer.cpp @@ -52,9 +52,10 @@ void GameLayer::onAttach() entityManager->addComponent(entityID, std::make_shared(entity->getModel())); } + const std::string stoneMasonPath = "assets/buildings/stone_mason/"; auto cabinModel = AssetManager::loadModel("cabin", "assets/cabin/cabin.obj", "assets/cabin/cabin.jpg", loader); - auto stoneMasonModel = AssetManager::loadModel("stoneMason", "assets/prehistoric_house/stone_mason.obj", "assets/prehistoric_house/Faerberhaus.jpg", loader); + auto stoneMasonModel = AssetManager::loadModel("stoneMason", stoneMasonPath + "stone_mason.obj", stoneMasonPath + "stone_mason.png", loader); //entities.push_back(std::make_shared(Entity(cabinModel, glm::vec3(0,0,0), 0,0,0, 1.f))); /*auto transformComponent = std::make_shared(glm::vec3(0,0,0), glm::vec3(0), 1.f);