MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/JapaMala/dfhack

develop
Warmist 2013-06-23 21:46:58 +03:00
parent 1361b38f27 fd0c053a80
commit 84ed3797d4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/rendermax/renderer_light.cpp
Unescape Escape View File

@ -271,15 +271,15 @@ void lightingEngineViewscreen::doOcupancyAndLights()
{ {
if(bld->mat_type == 3)//green glass if(bld->mat_type == 3)//green glass
{ {
curCell=lightCell(0.1f,0.9f,0.5f); curCell*=lightCell(0.1f,0.9f,0.5f);
} }
else if(bld->mat_type == 4)//clear glass else if(bld->mat_type == 4)//clear glass
{ {
curCell=lightCell(0.5f,0.95f,0.9f); curCell*=lightCell(0.5f,0.95f,0.9f);
} }
else if(bld->mat_type == 5)//crystal glass else if(bld->mat_type == 5)//crystal glass
{ {
curCell=lightCell(0.75f,0.95f,0.95f); curCell*=lightCell(0.75f,0.95f,0.95f);
} }
} }
} }

11
plugins/rendermax/renderer_opengl.hpp
Unescape Escape View File

@ -199,6 +199,17 @@ struct lightCell
{ {
return lightCell(r*val,g*val,b*val); return lightCell(r*val,g*val,b*val);
} }
lightCell operator*(lightCell cell)
{
return lightCell(r*cell.r,g*cell.g,b*cell.b);
}
lightCell operator*=(lightCell cell)
{
r*=cell.r;
g*=cell.g;
b*=cell.b;
return lightCell(r,g,b);
}
lightCell operator+(const lightCell& other) lightCell operator+(const lightCell& other)
{ {
return lightCell(r+other.r,g+other.g,b+other.b); return lightCell(r+other.r,g+other.g,b+other.b);