From fe7b86ca45fe8a7d1c2a538b5baa6d53a57d6ab2 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 19 Mar 2010 09:14:58 +0000 Subject: [PATCH] changed the path used to refer the shaders --- src/fgt/decorate_shadow/shadow_mapping.cpp | 2 +- src/fgt/decorate_shadow/ssao.cpp | 6 +++--- src/fgt/decorate_shadow/variance_shadow_mapping.cpp | 4 ++-- src/fgt/decorate_shadow/variance_shadow_mapping_blur.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fgt/decorate_shadow/shadow_mapping.cpp b/src/fgt/decorate_shadow/shadow_mapping.cpp index 031fa48bc..2b4ce9857 100644 --- a/src/fgt/decorate_shadow/shadow_mapping.cpp +++ b/src/fgt/decorate_shadow/shadow_mapping.cpp @@ -55,7 +55,7 @@ bool ShadowMapping::init() this->_shadowMappingProgram, this->_shadowMappingVert, this->_shadowMappingFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/sm/object"))); + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/sm/object"))); } void ShadowMapping::renderingFromLightSetup(MeshModel& m, GLArea* gla){ diff --git a/src/fgt/decorate_shadow/ssao.cpp b/src/fgt/decorate_shadow/ssao.cpp index 8428c440e..c3cc54db7 100644 --- a/src/fgt/decorate_shadow/ssao.cpp +++ b/src/fgt/decorate_shadow/ssao.cpp @@ -90,17 +90,17 @@ bool SSAO::init() this->_ssaoShaderProgram, this->_ssaoVert, this->_ssaoFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/ssao/ssao"))) || + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/ssao/ssao"))) || !compileAndLink( this->_normalMapShaderProgram, this->_normalMapVert, this->_normalMapFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/ssao/normalMap"))) || + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/ssao/normalMap"))) || !compileAndLink( this->_blurShaderProgram, this->_blurVert, this->_blurFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/ssao/blur")))) + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/ssao/blur")))) return false; return true; } diff --git a/src/fgt/decorate_shadow/variance_shadow_mapping.cpp b/src/fgt/decorate_shadow/variance_shadow_mapping.cpp index 6dc7683ee..4e95b6279 100644 --- a/src/fgt/decorate_shadow/variance_shadow_mapping.cpp +++ b/src/fgt/decorate_shadow/variance_shadow_mapping.cpp @@ -54,12 +54,12 @@ bool VarianceShadowMapping::init() this->_depthShaderProgram, this->_depthVert, this->_depthFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/vsm/depthVSM"))) || + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/vsm/depthVSM"))) || !compileAndLink( this->_shadowMappingProgram, this->_shadowMappingVert, this->_shadowMappingFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/vsm/objectVSM")))) + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/vsm/objectVSM")))) return false; return true; diff --git a/src/fgt/decorate_shadow/variance_shadow_mapping_blur.cpp b/src/fgt/decorate_shadow/variance_shadow_mapping_blur.cpp index 61e12f020..7853cd895 100644 --- a/src/fgt/decorate_shadow/variance_shadow_mapping_blur.cpp +++ b/src/fgt/decorate_shadow/variance_shadow_mapping_blur.cpp @@ -55,17 +55,17 @@ bool VarianceShadowMappingBlur::init() this->_depthShaderProgram, this->_depthVert, this->_depthFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/vsmb/depthVSM"))) || + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/vsmb/depthVSM"))) || !compileAndLink( this->_shadowMappingProgram, this->_shadowMappingVert, this->_shadowMappingFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/vsmb/objectVSM"))) || + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/vsmb/objectVSM"))) || !compileAndLink( this->_blurShaderProgram, this->_blurVert, this->_blurFrag, - PluginManager::getBaseDirPath().append(QString("/../fgt/decorate_shadow/shader/vsmb/blurVSM")))) + PluginManager::getBaseDirPath().append(QString("/shaders/decorate_shadow/vsmb/blurVSM")))) return false; return true; }