sebastian/Dicewars-Siedler
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

UPD: gitignore

Browse Source
This commit is contained in:
sebastian 2026-02-13 18:49:54 +01:00
parent e85cee21d2
commit c224479efc
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -84,7 +84,6 @@ fabric.properties
# Object files # Object files
*.o *.o
*.ko *.ko
*.obj
*.elf *.elf
# Linker output # Linker output

BIN
assets/buildings/stone_mason/stone_mason.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 KiB

2
src/engine/renderer/loader/OBJLoader.cpp
View File

@ -38,7 +38,7 @@ std::shared_ptr<TexturedModel> OBJLoader::loadModel(const std::string &modelPath
// UV-Koordinaten // UV-Koordinaten
if (!attrib.texcoords.empty()) { if (!attrib.texcoords.empty()) {
uvs.push_back(attrib.texcoords[2*index.texcoord_index + 0]); 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 { } else {
uvs.push_back(0.0f); uvs.push_back(0.0f);
uvs.push_back(0.0f); uvs.push_back(0.0f);

3
src/game/GameLayer.cpp
View File

@ -52,9 +52,10 @@ void GameLayer::onAttach()
entityManager->addComponent(entityID, std::make_shared<ModelComponent>(entity->getModel())); entityManager->addComponent(entityID, std::make_shared<ModelComponent>(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 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>(Entity(cabinModel, glm::vec3(0,0,0), 0,0,0, 1.f))); //entities.push_back(std::make_shared<Entity>(Entity(cabinModel, glm::vec3(0,0,0), 0,0,0, 1.f)));
/*auto transformComponent = std::make_shared<TransformComponent>(glm::vec3(0,0,0), glm::vec3(0), 1.f); /*auto transformComponent = std::make_shared<TransformComponent>(glm::vec3(0,0,0), glm::vec3(0), 1.f);