Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-25 11:52:40 +01:00
Code Issues Projects Releases Activity

Merge pull request #474 from NFSMONSTR/fix_loading_zonecylinder_texture

Browse Source 
Fixed loading ZoneCylinder texture
This commit is contained in:
Daniel Evans 2018-05-22 23:21:56 +01:00 committed by GitHub
commit c226432e88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,6 +409,15 @@ ClumpPtr GameData::loadClump(const std::string& name) {
return m;
}
ClumpPtr GameData::loadClump(const std::string& name, const std::string& textureSlot) {
std::string currentSlot = currenttextureslot;
if (!textureSlot.empty())
currenttextureslot = textureSlot;
ClumpPtr result = loadClump(name);
currenttextureslot = currentSlot;
return result;
}
void GameData::loadModelFile(const std::string& name) {
auto file = index.openFilePath(name);
if (!file) {

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

@ -142,6 +142,11 @@ public:
*/
ClumpPtr loadClump(const std::string& name);
/**
* Loads an archived model and returns it directly
*/
ClumpPtr loadClump(const std::string& name, const std::string& textureSlot);
/**
* Loads a DFF and associates its atomics with models.
*/

10
rwgame/RWGame.cpp
View File

@ -26,10 +26,10 @@
#include <iomanip>
#include <iostream>
std::map<GameRenderer::SpecialModel, std::string> kSpecialModels = {
{GameRenderer::ZoneCylinderA, "zonecyla.dff"},
{GameRenderer::ZoneCylinderB, "zonecylb.dff"},
{GameRenderer::Arrow, "arrow.dff"}};
const std::map<GameRenderer::SpecialModel, std::pair<std::string,std::string>> kSpecialModels = {
{GameRenderer::ZoneCylinderA, std::pair<std::string,std::string>("zonecyla.dff", "particle")},
{GameRenderer::ZoneCylinderB, std::pair<std::string,std::string>("zonecylb.dff", "particle")},
{GameRenderer::Arrow, std::pair<std::string,std::string>("arrow.dff", "")}};
namespace {
constexpr float kMaxPhysicsSubSteps = 2;
@ -60,7 +60,7 @@ RWGame::RWGame(Logger& log, int argc, char* argv[])
data.load();
for (const auto& p : kSpecialModels) {
auto model = data.loadClump(p.second);
auto model = data.loadClump(p.second.first, p.second.second);
renderer.setSpecialModel(p.first, model);
}