mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-07 12:54:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled

Browse Source
This commit is contained in:
scrawl 2013-01-10 01:46:00 +01:00
parent 35015ef110
commit 55769aaf91
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/engine.cpp
View File

@ -391,8 +391,6 @@ void OMW::Engine::go()
MWBase::Environment::get().getWorld()->changeToInteriorCell (mCellName, pos);
}
std::cout << "\nPress Q/ESC or close window to exit.\n";
mOgre->getRoot()->addFrameListener (this);
// Play some good 'ol tunes
@ -420,7 +418,7 @@ void OMW::Engine::go()
// Save user settings
settings.saveUser(settingspath);
std::cout << "Quitting peacefully.\n";
std::cout << "Quitting peacefully." << std::endl;
}
void OMW::Engine::activate()

1
files/materials/selection.mat
View File

@ -1,5 +1,6 @@
material SelectionColour
{
allow_fixed_function false
pass
{
vertex_program selection_vertex

2
files/materials/water.mat
View File

@ -2,7 +2,7 @@ material Water
{
pass
{
emissive 0.6 0.7 1.0
emissive 1.0 1.0 1.0
ambient 0 0 0
diffuse 0 0 0 1
specular 0 0 0 32

2
files/materials/water.shader
View File

@ -42,7 +42,7 @@
SH_START_PROGRAM
{
shOutputColour(0).xyz = shSample(animatedTexture, UV * 15).xyz * float3(0.6, 0.7, 1.0);
shOutputColour(0).xyz = shSample(animatedTexture, UV * 15).xyz * float3(1.0, 1.0, 1.0);
shOutputColour(0).w = 0.7;
float fogValue = shSaturate((depth - fogParams.y) * fogParams.w);