From fe1e94d1672dcbd32e3524a444b8438ba567587c Mon Sep 17 00:00:00 2001 From: Daniel Evans Date: Tue, 11 Feb 2014 14:16:14 +0000 Subject: [PATCH] Fix textures in rwviewer for some models --- rwviewer/ViewerWidget.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rwviewer/ViewerWidget.cpp b/rwviewer/ViewerWidget.cpp index 25c80369..e244be96 100644 --- a/rwviewer/ViewerWidget.cpp +++ b/rwviewer/ViewerWidget.cpp @@ -46,10 +46,10 @@ void ViewerWidget::paintGL() glUseProgram(r.worldProgram); - /*glUniform1f(uniFogStart, weather.fogStart); - glUniform1f(uniFogEnd, camera.frustum.far);*/ + glUniform1f(r.uniFogStart, 90.f); + glUniform1f(r.uniFogEnd, 100.f); - glUniform4f(r.uniAmbientCol, 1.f, 1.f, 1.f, 1.f); + glUniform4f(r.uniAmbientCol, .1f, .1f, .1f, 1.f); glUniform4f(r.uniDynamicCol, 1.f, 1.f, 1.f, 1.f); //glUniform3f(uniSunDirection, sunDirection.x, sunDirection.y, sunDirection.z); glUniform1f(r.uniMatDiffuse, 0.9f); @@ -86,7 +86,10 @@ void ViewerWidget::showFile(const QString& file) void ViewerWidget::showDFF(const QString& file) { gworld->gameData.loadDFF(file.toStdString()); - auto mit = gworld->gameData.models.find(file.left(file.size()-4).toStdString()); + QString basename(file.left(file.size()-4)); + // HACK this + gworld->gameData.loadTXD((basename+".txd").toStdString()); + auto mit = gworld->gameData.models.find(basename.toStdString()); if(mit != gworld->gameData.models.end()) { // TODO better error handling currentModel = mit->second;