Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 18:32:44 +01:00
Code Issues Projects Releases Activity

Reduce code duplication for DFF texture lookup

Browse Source
This commit is contained in:
Daniel Evans 2016-12-03 21:50:34 +00:00
parent d75c476221
commit c00145e551
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rwengine/src/engine/GameData.cpp
View File

@ -5,7 +5,6 @@
#include <engine/GameState.hpp>
#include <engine/GameWorld.hpp>
#include <loaders/LoaderCOL.hpp>
#include <loaders/LoaderDFF.hpp>
#include <loaders/LoaderIDE.hpp>
#include <loaders/LoaderIPL.hpp>
#include <script/SCMFile.hpp>
@ -23,6 +22,10 @@
GameData::GameData(Logger* log, const std::string& path)
: datpath(path), logger(log), engine(nullptr) {
dffLoader.setTextureLookupCallback(
[&](const std::string& texture, const std::string&) {
return findSlotTexture(currenttextureslot, texture);
});
}
GameData::~GameData() {
@ -353,13 +356,7 @@ Model* GameData::loadClump(const std::string& name) {
logger->error("Data", "Failed to load model " + name);
return nullptr;
}
LoaderDFF l;
l.setTextureLookupCallback(
[&](const std::string& texture, const std::string&) {
// Lookup the texture in the current texture slot
return findSlotTexture(currenttextureslot, texture);
});
auto m = l.loadFromMemory(file);
auto m = dffLoader.loadFromMemory(file);
if (!m) {
logger->error("Data", "Error loading model file " + name);
return nullptr;
@ -373,14 +370,7 @@ void GameData::loadModelFile(const std::string& name) {
logger->log("Data", Logger::Error, "Failed to load model file " + name);
return;
}
LoaderDFF l;
l.setTextureLookupCallback(
[&](const std::string& texture, const std::string&) {
// Lookup the texture in the current texture slot
return findSlotTexture(currenttextureslot, texture);
});
auto m = l.loadFromMemory(file);
auto m = dffLoader.loadFromMemory(file);
if (!m) {
logger->log("Data", Logger::Error, "Error loading model file " + name);
return;
@ -444,13 +434,7 @@ void GameData::loadModel(ModelID model) {
std::to_string(model) + " [" + name + "]");
return;
}
LoaderDFF l;
l.setTextureLookupCallback(
[&](const std::string& texture, const std::string&) {
// Lookup the texture in the current texture slot
return findSlotTexture(currenttextureslot, texture);
});
auto m = l.loadFromMemory(file);
auto m = dffLoader.loadFromMemory(file);
if (!m) {
logger->error("Data",
"Error loading model file for " + std::to_string(model));

1
rwengine/src/engine/GameData.hpp
View File

@ -42,6 +42,7 @@ private:
std::string currenttextureslot;
Logger* logger;
LoaderDFF dffLoader;
public:
/**
* ctor