|
|
@ -275,7 +275,7 @@ bool lightingEngineViewscreen::lightUpCell(std::vector<lightCell> & target, ligh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(ls.radius>0 && dsq>0)
|
|
|
|
if(ls.radius>0 && dsq>0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(power<ls.power)
|
|
|
|
if(power<=ls.power)
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//float dt=sqrt(dsq);
|
|
|
|
//float dt=sqrt(dsq);
|
|
|
@ -595,17 +595,38 @@ void lightingEngineViewscreen::doSun(const lightSource& sky,MapExtras::MapCache&
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lightCell lightingEngineViewscreen::getSkyColor(float v)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if(dayColors.size()<2)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
v=abs(fmod(v+0.5,1)-0.5)*2;
|
|
|
|
|
|
|
|
return lightCell(v,v,v);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
float pos=v*(dayColors.size()-1);
|
|
|
|
|
|
|
|
int pre=floor(pos);
|
|
|
|
|
|
|
|
pos-=pre;
|
|
|
|
|
|
|
|
if(pre==dayColors.size()-1)
|
|
|
|
|
|
|
|
return dayColors[pre];
|
|
|
|
|
|
|
|
return dayColors[pre]*(1-pos)+dayColors[pre+1]*pos;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
void lightingEngineViewscreen::doOcupancyAndLights()
|
|
|
|
void lightingEngineViewscreen::doOcupancyAndLights()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// TODO better curve (+red dawn ?)
|
|
|
|
// TODO better curve (+red dawn ?)
|
|
|
|
|
|
|
|
|
|
|
|
float daycol;
|
|
|
|
float daycol;
|
|
|
|
if(dayHour<0)
|
|
|
|
if(dayHour<0)
|
|
|
|
daycol= abs((*df::global::cur_year_tick % 1200) - 600.0) / 600.0;
|
|
|
|
{
|
|
|
|
|
|
|
|
int length=1200/daySpeed;
|
|
|
|
|
|
|
|
daycol= (*df::global::cur_year_tick % length)/ (float)length;
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
daycol= abs(fmod(dayHour+12.0f,24.0f)-12.0f)/12.0f; //1->12h 0->24h
|
|
|
|
daycol= fmod(dayHour,24.0f)/24.0f; //1->12h 0->24h
|
|
|
|
|
|
|
|
|
|
|
|
lightCell sky_col(daycol, daycol, daycol);
|
|
|
|
lightCell sky_col=getSkyColor(daycol);
|
|
|
|
lightSource sky(sky_col, 15);
|
|
|
|
lightSource sky(sky_col, 15);//auto calculate best size
|
|
|
|
|
|
|
|
|
|
|
|
lightSource candle(lightCell(0.96f,0.84f,0.03f),5);
|
|
|
|
lightSource candle(lightCell(0.96f,0.84f,0.03f),5);
|
|
|
|
lightSource torch(lightCell(0.9f,0.75f,0.3f),8);
|
|
|
|
lightSource torch(lightCell(0.9f,0.75f,0.3f),8);
|
|
|
@ -968,7 +989,18 @@ int lightingEngineViewscreen::parseSpecial(lua_State* L)
|
|
|
|
LOAD_SPECIAL(CITIZEN,matCitizen);
|
|
|
|
LOAD_SPECIAL(CITIZEN,matCitizen);
|
|
|
|
GETLUANUMBER(engine->levelDim,levelDim);
|
|
|
|
GETLUANUMBER(engine->levelDim,levelDim);
|
|
|
|
GETLUANUMBER(engine->dayHour,dayHour);
|
|
|
|
GETLUANUMBER(engine->dayHour,dayHour);
|
|
|
|
|
|
|
|
GETLUANUMBER(engine->daySpeed,daySpeed);
|
|
|
|
|
|
|
|
lua_getfield(L,-1,"dayColors");
|
|
|
|
|
|
|
|
if(lua_istable(L,-1))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
engine->dayColors.clear();
|
|
|
|
|
|
|
|
lua_pushnil(L);
|
|
|
|
|
|
|
|
while (lua_next(L, -2) != 0) {
|
|
|
|
|
|
|
|
engine->dayColors.push_back(lua_parseLightCell(L));
|
|
|
|
|
|
|
|
lua_pop(L,1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
lua_pop(L,1);
|
|
|
|
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#undef LOAD_SPECIAL
|
|
|
|
#undef LOAD_SPECIAL
|
|
|
@ -1035,6 +1067,10 @@ void lightingEngineViewscreen::defaultSettings()
|
|
|
|
matCitizen=matLightDef(lightCell(0.8f,0.8f,0.9f),6);
|
|
|
|
matCitizen=matLightDef(lightCell(0.8f,0.8f,0.9f),6);
|
|
|
|
levelDim=0.2f;
|
|
|
|
levelDim=0.2f;
|
|
|
|
dayHour=-1;
|
|
|
|
dayHour=-1;
|
|
|
|
|
|
|
|
daySpeed=1;
|
|
|
|
|
|
|
|
dayColors.push_back(lightCell(0,0,0));
|
|
|
|
|
|
|
|
dayColors.push_back(lightCell(1,1,1));
|
|
|
|
|
|
|
|
dayColors.push_back(lightCell(0,0,0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
void lightingEngineViewscreen::loadSettings()
|
|
|
|
void lightingEngineViewscreen::loadSettings()
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1073,6 +1109,7 @@ void lightingEngineViewscreen::loadSettings()
|
|
|
|
lua_pushlightuserdata(s, this);
|
|
|
|
lua_pushlightuserdata(s, this);
|
|
|
|
lua_pushvalue(s,env);
|
|
|
|
lua_pushvalue(s,env);
|
|
|
|
Lua::SafeCall(out,s,2,0);
|
|
|
|
Lua::SafeCall(out,s,2,0);
|
|
|
|
|
|
|
|
out.print("%d day light colors loaded\n",dayColors.size());
|
|
|
|
|
|
|
|
|
|
|
|
lua_pushcfunction(s, parseBuildings);
|
|
|
|
lua_pushcfunction(s, parseBuildings);
|
|
|
|
lua_pushlightuserdata(s, this);
|
|
|
|
lua_pushlightuserdata(s, this);
|
|
|
|