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

fix for map_block lights, fix for gem window color, dimmed the plant lights.

develop
Warmist 2013-06-24 00:10:52 +03:00
parent 06915aeded
commit 6cd926b67e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,9 +244,9 @@ void addPlant(const std::string& id,std::map<int,lightSource>& map,const lightSo
void lightingEngineViewscreen::initRawSpecific() void lightingEngineViewscreen::initRawSpecific()
{ {
addPlant("TOWER_CAP",glowPlants,lightSource(lightCell(0.65,0.65,0.65),6)); addPlant("TOWER_CAP",glowPlants,lightSource(lightCell(0.65,0.65,0.65),6));
addPlant("MUSHROOM_CUP_DIMPLE",glowPlants,lightSource(lightCell(0.03,0.03,0.9),3)); addPlant("MUSHROOM_CUP_DIMPLE",glowPlants,lightSource(lightCell(0.03,0.03,0.5),3));
addPlant("CAVE MOSS",glowPlants,lightSource(lightCell(0.3,0.3,0.9),2)); addPlant("CAVE MOSS",glowPlants,lightSource(lightCell(0.1,0.1,0.4),2));
addPlant("MUSHROOM_HELMET_PLUMP",glowPlants,lightSource(lightCell(0.5,0.2,0.9),2)); addPlant("MUSHROOM_HELMET_PLUMP",glowPlants,lightSource(lightCell(0.2,0.1,0.6),2));
} }
static size_t max_list_size = 100000; // Avoid iterating over huge lists static size_t max_list_size = 100000; // Avoid iterating over huge lists
void lightingEngineViewscreen::doOcupancyAndLights() void lightingEngineViewscreen::doOcupancyAndLights()
@ -332,7 +332,7 @@ void lightingEngineViewscreen::doOcupancyAndLights()
DFHack::MaterialInfo mat(bld->mat_index,bld->mat_type); DFHack::MaterialInfo mat(bld->mat_index,bld->mat_type);
if(mat.isInorganic()) if(mat.isInorganic())
{ {
int color=mat.inorganic->material.build_color[0]+8*mat.inorganic->material.build_color[2]; int color=mat.inorganic->material.basic_color[0]+8*mat.inorganic->material.basic_color[2];
curCell*=getStandartColor(color); curCell*=getStandartColor(color);
} }
} }
@ -370,7 +370,7 @@ void lightingEngineViewscreen::doOcupancyAndLights()
} }
for(int blockx=window_x/16;blockx<(window_x+vpW)/16;blockx++) for(int blockx=window_x/16;blockx<(window_x+vpW)/16;blockx++)
for(int blocky=window_y/16;blocky<(window_x+vpW)/16;blocky++) for(int blocky=window_y/16;blocky<(window_y+vpH)/16;blocky++)
{ {
df::map_block* block=Maps::getBlock(blockx,blocky,window_z); df::map_block* block=Maps::getBlock(blockx,blocky,window_z);