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

Fixed a bug that enabled rendermax even when it was supposed to be off.

develop
Warmist 2013-07-03 18:47:51 +03:00
parent a3d3c34671
commit 830d9900fb
2 changed files with 8 additions and 7 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

@ -121,7 +121,7 @@ void lightingEngineViewscreen::reinit()
ocupancy.resize(size); ocupancy.resize(size);
lights.resize(size); lights.resize(size);
} }
void plotCircle(int xm, int ym, int r,std::function<void(int,int)> setPixel) void plotCircle(int xm, int ym, int r,const std::function<void(int,int)>& setPixel)
{ {
int x = -r, y = 0, err = 2-2*r; /* II. Quadrant */ int x = -r, y = 0, err = 2-2*r; /* II. Quadrant */
do { do {
@ -134,7 +134,7 @@ void plotCircle(int xm, int ym, int r,std::function<void(int,int)> setPixel)
if (r > x || err > y) err += ++x*2+1; /* e_xy+e_x > 0 or no 2nd y-step */ if (r > x || err > y) err += ++x*2+1; /* e_xy+e_x > 0 or no 2nd y-step */
} while (x < 0); } while (x < 0);
} }
void plotSquare(int xm, int ym, int r,std::function<void(int,int)> setPixel) void plotSquare(int xm, int ym, int r,const std::function<void(int,int)>& setPixel)
{ {
for(int x = 0; x <= r; x++) for(int x = 0; x <= r; x++)
{ {
@ -148,7 +148,7 @@ void plotSquare(int xm, int ym, int r,std::function<void(int,int)> setPixel)
setPixel(xm-x, ym+r); /* IV.2 Quadrant */ setPixel(xm-x, ym+r); /* IV.2 Quadrant */
} }
} }
void plotLine(int x0, int y0, int x1, int y1,rgbf power,std::function<rgbf(rgbf,int,int,int,int)> setPixel) void plotLine(int x0, int y0, int x1, int y1,rgbf power,const std::function<rgbf(rgbf,int,int,int,int)>& setPixel)
{ {
int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1;
int dy = -abs(y1-y0), sy = y0<y1 ? 1 : -1; int dy = -abs(y1-y0), sy = y0<y1 ? 1 : -1;
@ -170,7 +170,7 @@ void plotLine(int x0, int y0, int x1, int y1,rgbf power,std::function<rgbf(rgbf,
} }
} }
void plotLineAA(int x0, int y0, int x1, int y1,rgbf power,std::function<rgbf(rgbf,int,int,int,int)> setPixelAA) void plotLineAA(int x0, int y0, int x1, int y1,rgbf power,const std::function<rgbf(rgbf,int,int,int,int)>& setPixelAA)
{ {
int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1;
int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1; int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1;
@ -242,7 +242,7 @@ void lightingEngineViewscreen::calculate()
if(lightMap.size()!=myRenderer->lightGrid.size()) if(lightMap.size()!=myRenderer->lightGrid.size())
{ {
reinit(); reinit();
myRenderer->invalidate(); myRenderer->invalidate();//needs a lock?
} }
rect2d vp=getMapViewport(); rect2d vp=getMapViewport();
const rgbf dim(levelDim,levelDim,levelDim); const rgbf dim(levelDim,levelDim,levelDim);

5
plugins/rendermax/rendermax.cpp
Unescape Escape View File

@ -292,6 +292,8 @@ static void enable_hooks(bool enable)
DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event) DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
{ {
if(current_mode!=MODE_LIGHT)
return CR_OK;
switch(event) switch(event)
{ {
case SC_VIEWSCREEN_CHANGED: case SC_VIEWSCREEN_CHANGED:
@ -403,8 +405,7 @@ static command_result rendermax(color_ostream &out, vector <string> & parameters
{ {
if(parameters[1]=="reload") if(parameters[1]=="reload")
{ {
CoreSuspender suspend; enable_hooks(true);
engine->loadSettings();
} }
else if(parameters[1]=="sun" && parameters.size()==3) else if(parameters[1]=="sun" && parameters.size()==3)
{ {