ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed remaining hardcoded shader directories.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12537 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-03-01 05:42:38 +00:00
parent 5e59de20fe
commit e7f58450e1
2 changed files with 43 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/graphics/hardware_skinning.cpp
View File

@ -15,8 +15,11 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "graphics/irr_driver.hpp"
#include "graphics/hardware_skinning.hpp"
#include "graphics/irr_driver.hpp"
#include "io/file_manager.hpp"
#include <IAnimatedMeshSceneNode.h>
#include <IAnimatedMesh.h>
#include <ISkinnedMesh.h>
@ -36,16 +39,11 @@ void HardwareSkinning::prepareNode(scene::IAnimatedMeshSceneNode *node)
// Compile the shaders and associate the callback
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
"../data/shaders/skinning.vert", "main", video::EVST_VS_2_0,
"", "main", video::EPST_PS_2_0,
callback, video::EMT_SOLID);
/*s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
"../data/shaders/skinning.vert", "main", video::EVST_VS_2_0,
"../data/shaders/skinning.frag", "main", video::EPST_PS_2_0,
callback, video::EMT_SOLID);
*/
(file_manager->getShaderDir()+"skinning.vert").c_str(),
"main", video::EVST_VS_2_0, "",
"main", video::EPST_PS_2_0,
callback, video::EMT_SOLID);
// Drop
callback->drop();

85
src/graphics/material.cpp
View File

@ -912,16 +912,11 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
IGPUProgrammingServices* gpu =
irr_driver->getVideoDriver()->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getDataDir() +
"shaders/spheremap.vert").c_str(),
"main",
video::EVST_VS_2_0,
(file_manager->getDataDir() +
"shaders/spheremap.frag").c_str(),
"main",
video::EPST_PS_2_0,
m_shaders[SPHERE_MAP],
video::EMT_SOLID_2_LAYER );
(file_manager->getShaderDir() + "spheremap.vert").c_str(),
"main", video::EVST_VS_2_0,
(file_manager->getShaderDir() + "spheremap.frag").c_str(),
"main", video::EPST_PS_2_0,
m_shaders[SPHERE_MAP], video::EMT_SOLID_2_LAYER );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
}
else
@ -1020,21 +1015,20 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
}
}
const char* vertex_shader = "shaders/normalmap.vert";
const char* pixel_shader = "shaders/normalmap.frag";
const char* vertex_shader = "normalmap.vert";
const char* pixel_shader = "normalmap.frag";
// Material and shaders
IGPUProgrammingServices* gpu =
video_driver->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getDataDir() + vertex_shader).c_str(),
"main",
video::EVST_VS_2_0,
(file_manager->getDataDir() + pixel_shader).c_str(),
"main",
video::EPST_PS_2_0,
m_shaders[with_lightmap ? NORMAL_MAP_WITH_LIGHTMAP : NORMAL_MAP],
video::EMT_SOLID_2_LAYER );
(file_manager->getShaderDir() + vertex_shader).c_str(),
"main", video::EVST_VS_2_0,
(file_manager->getShaderDir() + pixel_shader).c_str(),
"main", video::EPST_PS_2_0,
m_shaders[with_lightmap ? NORMAL_MAP_WITH_LIGHTMAP
: NORMAL_MAP],
video::EMT_SOLID_2_LAYER );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
m->Lighting = false;
m->ZWriteEnable = true;
@ -1092,16 +1086,11 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
IGPUProgrammingServices* gpu =
irr_driver->getVideoDriver()->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getDataDir() +
"shaders/splatting.vert").c_str(),
"main",
video::EVST_VS_2_0,
(file_manager->getDataDir() +
"shaders/splatting.frag").c_str(),
"main",
video::EPST_PS_2_0,
m_shaders[SPLATTING],
video::EMT_SOLID_2_LAYER );
(file_manager->getShaderDir() + "splatting.vert").c_str(),
"main",video::EVST_VS_2_0,
(file_manager->getShaderDir() + "splatting.frag").c_str(),
"main",video::EPST_PS_2_0,
m_shaders[SPLATTING], video::EMT_SOLID_2_LAYER );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
}
@ -1120,17 +1109,13 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
// Material and shaders
IGPUProgrammingServices* gpu = video_driver->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getDataDir() + "shaders/bubble.vert").c_str(),
"main",
video::EVST_VS_2_0,
(file_manager->getDataDir() + "shaders/bubble.frag").c_str(),
"main",
video::EPST_PS_2_0,
m_bubble_provider[mb],
(m_alpha_blending ?
video::EMT_TRANSPARENT_ALPHA_CHANNEL :
video::EMT_SOLID)
);
(file_manager->getShaderDir() + "bubble.vert").c_str(),
"main", video::EVST_VS_2_0,
(file_manager->getShaderDir() + "bubble.frag").c_str(),
"main", video::EPST_PS_2_0,
m_bubble_provider[mb],
(m_alpha_blending ? video::EMT_TRANSPARENT_ALPHA_CHANNEL
: video::EMT_SOLID) );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
// alpha blending and bubble shading can work together so when both are enabled
@ -1160,8 +1145,8 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
m->setTexture(2, irr_driver->getTexture(file_manager->getTextureFile("waternormals2.jpg")));
bool fog = World::getWorld()->getTrack()->isFogEnabled();
const char* vertex_shader = (fog ? "shaders/water_fog.vert" : "shaders/water.vert");
const char* pixel_shader = (fog ? "shaders/water_fog.frag" : "shaders/water.frag");
const char* vertex_shader = (fog ? "water_fog.vert" : "water.vert");
const char* pixel_shader = (fog ? "water_fog.frag" : "water.frag");
((WaterShaderProvider*)m_shaders[WATER_SHADER])->enableFog(fog);
@ -1169,14 +1154,12 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
IGPUProgrammingServices* gpu =
irr_driver->getVideoDriver()->getGPUProgrammingServices();
s32 material_type = gpu->addHighLevelShaderMaterialFromFiles(
(file_manager->getDataDir() + vertex_shader).c_str(),
"main",
video::EVST_VS_2_0,
(file_manager->getDataDir() + pixel_shader).c_str(),
"main",
video::EPST_PS_2_0,
m_shaders[WATER_SHADER],
video::EMT_SOLID_2_LAYER );
(file_manager->getShaderDir() + vertex_shader).c_str(),
"main", video::EVST_VS_2_0,
(file_manager->getShaderDir() + pixel_shader ).c_str(),
"main", video::EPST_PS_2_0,
m_shaders[WATER_SHADER],
video::EMT_SOLID_2_LAYER );
m->MaterialType = (E_MATERIAL_TYPE)material_type;
}
modes++;