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

Torches for statues, candles on the tables.

develop
Warmist 2013-06-23 22:28:26 +03:00
parent 1c4b5c2d38
commit 471eb9c02d
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,9 @@ void lightingEngineViewscreen::doOcupancyAndLights()
{ {
lightSource sun(lightCell(1,1,1),15); lightSource sun(lightCell(1,1,1),15);
lightSource lava(lightCell(0.8f,0.2f,0.2f),5); lightSource lava(lightCell(0.8f,0.2f,0.2f),5);
lightSource candle(lightCell(0.96f,0.84f,0.03f),5);
candle.flicker=true;
lightSource torch(lightCell(0.96f,0.5f,0.1f),8);
rect2d vp=getMapViewport(); rect2d vp=getMapViewport();
int window_x=*df::global::window_x; int window_x=*df::global::window_x;
@ -356,6 +358,25 @@ void lightingEngineViewscreen::doOcupancyAndLights()
curCell*=lightCell(0.75f,0.95f,0.95f); curCell*=lightCell(0.75f,0.95f,0.95f);
} }
} }
if (type == df::enums::building_type::Table)
{
addLight(tile,candle);
}
if (type==df::enums::building_type::Statue)
{
addLight(tile,torch);
}
if (type==df::enums::building_type::WindowGem)
{
DFHack::MaterialInfo mat(bld->mat_index,bld->mat_type);
if(mat.isInorganic())
{
int color=mat.inorganic->material.basic_color[0];
curCell*=lightCell(df::global::enabler->ccolor[color][0]/255.0f,
df::global::enabler->ccolor[color][1]/255.0f,
df::global::enabler->ccolor[color][2]/255.0f);
}
}
} }
} }
} }
@ -364,7 +385,6 @@ void lightingEngineViewscreen::doOcupancyAndLights()
{ {
curCell*=lightCell(0.7f,0.7f,0.8f); curCell*=lightCell(0.7f,0.7f,0.8f);
} }
//todo constructions
//lights //lights
if((d->bits.liquid_type && d->bits.flow_size>0)|| if((d->bits.liquid_type && d->bits.flow_size>0)||
@ -388,6 +408,7 @@ void lightingEngineViewscreen::doOcupancyAndLights()
for(int blocky=window_y/16;blocky<=endBlocky;blocky++) for(int blocky=window_y/16;blocky<=endBlocky;blocky++)
{ {
df::map_block* block=Maps::getBlock(blockx,blocky,window_z); df::map_block* block=Maps::getBlock(blockx,blocky,window_z);
if(!block) if(!block)
continue; continue;
for(int i=0;i<block->flows.size();i++) for(int i=0;i<block->flows.size();i++)