marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change AutoScanSideOpen to be like Top/BottomOpen=2 (#1652)

install-platforms
Lukas Werling 2017-12-22 20:40:03 +01:00
parent 1f2e34c42d
commit fa8f868ffb
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sdk/scenario/scenario.xml
View File

@ -248,7 +248,7 @@
<row>
<literal_col>AutoScanSideOpen</literal_col>
<col>Integer</col>
<col>0 or 1. If 1, LeftOpen and RightOpen will be set automatically depending on the landscape at game start.</col>
<col>0 or 1. If 1, the left and right borders are closed if the corresponding map pixel in the left or right row has tunnel background and open otherwise.</col>
</row>
<row>
<literal_col>MapWidth</literal_col>

73
src/landscape/C4Landscape.cpp
View File

@ -56,7 +56,8 @@ struct C4Landscape::P
std::unique_ptr<CSurface8> Map;
std::unique_ptr<CSurface8> MapBkg;
std::unique_ptr<C4LandscapeRender> pLandscapeRender;
std::vector<uint8_t> TopRowPix, BottomRowPix; // array size of landscape width: Filled with 0s for border pixels that are open and MCVehic for pixels that are closed
// array size of landscape width/height: Filled with 0s for border pixels that are open and MCVehic for pixels that are closed
std::vector<uint8_t> TopRowPix, BottomRowPix, LeftColPix, RightColPix;
int32_t Pix2Mat[C4M_MaxTexIndex], Pix2Dens[C4M_MaxTexIndex], Pix2Place[C4M_MaxTexIndex];
bool Pix2Light[C4M_MaxTexIndex];
int32_t PixCntPitch = 0;
@ -72,7 +73,6 @@ struct C4Landscape::P
bool NoScan = false; // ExecuteScan() disabled
int32_t ScanX = 0, ScanSpeed = 2; // SyncClearance-NoSave //
int32_t LeftOpen = 0, RightOpen = 0, TopOpen = 0, BottomOpen = 0;
C4Real Gravity = DefaultGravAccel;
uint32_t Modulation = 0; // landscape blit modulation; 0 means normal
int32_t MapSeed = 0; // random seed for MapToLandscape
@ -94,7 +94,7 @@ struct C4Landscape::P
bool TexOZoom(C4Landscape *, const CSurface8 &sfcMap, const CSurface8 &sfcMapBkg, int32_t iMapX, int32_t iMapY, int32_t iMapWdt, int32_t iMapHgt, DWORD *dwpTextureUsage, int32_t iToX = 0, int32_t iToY = 0);
bool MapToSurface(C4Landscape *, const CSurface8 &sfcMap, const CSurface8 &sfcMapBkg, int32_t iMapX, int32_t iMapY, int32_t iMapWdt, int32_t iMapHgt, int32_t iToX, int32_t iToY, int32_t iToWdt, int32_t iToHgt, int32_t iOffX, int32_t iOffY);
bool MapToLandscape(C4Landscape *d, const CSurface8 &sfcMap, const CSurface8 &sfcMapBkg, int32_t iMapX, int32_t iMapY, int32_t iMapWdt, int32_t iMapHgt, int32_t iOffsX = 0, int32_t iOffsY = 0, bool noClear = false); // zoom map segment to surface (or sector surfaces)
bool InitTopAndBottomRowPix(); // init out-of-landscape pixels for bottom side
bool InitBorderPix(); // init out-of-landscape pixels for ALL sides
bool GetMapColorIndex(const char *szMaterial, const char *szTexture, BYTE &rbyCol) const;
//bool SkyToLandscape(int32_t iToX, int32_t iToY, int32_t iToWdt, int32_t iToHgt, int32_t iOffX, int32_t iOffY);
bool CreateMap(CSurface8*& sfcMap, CSurface8*& sfcMapBkg); // create map by landscape attributes
@ -362,17 +362,6 @@ int32_t C4Landscape::P::DoScan(C4Landscape *d, int32_t cx, int32_t cy, int32_t m
return Abs(cy2 - cy);
}
void C4Landscape::ScanSideOpen()
{
int32_t cy;
for (cy = 0; (cy < p->Height) && !GetPix(0, cy); cy++) {}
p->LeftOpen = cy;
for (cy = 0; (cy < p->Height) && !GetPix(p->Width - 1, cy); cy++) {}
p->RightOpen = cy;
}
void C4Landscape::Draw(C4TargetFacet &cgo, C4FoWRegion *pLight)
{
uint32_t clrMod = 0xffffffff;
@ -1359,13 +1348,6 @@ void C4Landscape::ScenarioInit()
{
// Gravity
p->Gravity = C4REAL100(Game.C4S.Landscape.Gravity.Evaluate()) * DefaultGravAccel;
// Opens
p->LeftOpen = Game.C4S.Landscape.LeftOpen;
p->RightOpen = Game.C4S.Landscape.RightOpen;
p->TopOpen = Game.C4S.Landscape.TopOpen;
p->BottomOpen = Game.C4S.Landscape.BottomOpen;
// Side open scan
if (Game.C4S.Landscape.AutoScanSideOpen) ScanSideOpen();
}
void C4Landscape::Clear(bool fClearMapCreator, bool fClearSky, bool fClearRenderer)
@ -1377,6 +1359,8 @@ void C4Landscape::Clear(bool fClearMapCreator, bool fClearSky, bool fClearRender
if (fClearRenderer) { p->pLandscapeRender.reset(); }
p->TopRowPix.clear();
p->BottomRowPix.clear();
p->LeftColPix.clear();
p->RightColPix.clear();
p->Surface8.reset();
p->Surface8Bkg.reset();
p->Map.reset();
@ -1402,10 +1386,6 @@ void C4Landscape::Clear(bool fClearMapCreator, bool fClearSky, bool fClearRender
void C4Landscape::CompileFunc(StdCompiler *pComp)
{
pComp->Value(mkNamingAdapt(p->MapSeed, "MapSeed", 0));
pComp->Value(mkNamingAdapt(p->LeftOpen, "LeftOpen", 0));
pComp->Value(mkNamingAdapt(p->RightOpen, "RightOpen", 0));
pComp->Value(mkNamingAdapt(p->TopOpen, "TopOpen", 0));
pComp->Value(mkNamingAdapt(p->BottomOpen, "BottomOpen", 0));
pComp->Value(mkNamingAdapt(mkCastIntAdapt(p->Gravity), "Gravity", DefaultGravAccel));
pComp->Value(mkNamingAdapt(p->Modulation, "MatModulation", 0U));
pComp->Value(mkNamingAdapt(mkCastIntAdapt(p->mode), "Mode", LandscapeMode::Undefined));
@ -1633,7 +1613,7 @@ bool C4Landscape::Init(C4Group &hGroup, bool fOverloadCurrent, bool fLoadSky, bo
}
// Init out-of-landscape pixels for bottom
p->InitTopAndBottomRowPix();
p->InitBorderPix();
Game.SetInitProgress(80);
@ -2037,7 +2017,7 @@ bool C4Landscape::SaveTextures(C4Group &hGroup) const
return true;
}
bool C4Landscape::P::InitTopAndBottomRowPix()
bool C4Landscape::P::InitBorderPix()
{
assert(Width > 0);
// Init Top-/BottomRowPix array, which determines if out-of-landscape pixels on top/bottom side of the map are solid or not
@ -2045,6 +2025,8 @@ bool C4Landscape::P::InitTopAndBottomRowPix()
if (!Width) return true;
TopRowPix.clear();
BottomRowPix.clear();
LeftColPix.clear();
RightColPix.clear();
// must access Game.C4S here because Landscape.TopOpen / Landscape.BottomOpen may not be initialized yet
// why is there a local copy of that static variable anyway?
int32_t top_open_flag = Game.C4S.Landscape.TopOpen;
@ -2087,6 +2069,31 @@ bool C4Landscape::P::InitTopAndBottomRowPix()
// BottomOpen=1: Bottom is open
default: BottomRowPix.assign(Width, 0); break;
}
if (Game.C4S.Landscape.AutoScanSideOpen)
{
LeftColPix.resize(Height);
RightColPix.resize(Height);
uint8_t map_pix;
for (int32_t y = 0; y < Height; ++y)
{
map_pix = MapBkg->GetPix(0, y / MapZoom);
LeftColPix[y] = ((map_pix != 0) ? MCVehic : 0);
map_pix = MapBkg->GetPix(Map->Wdt - 1, y / MapZoom);
RightColPix[y] = ((map_pix != 0) ? MCVehic : 0);
}
}
else
{
int32_t LeftOpen = std::min(Height, Game.C4S.Landscape.LeftOpen);
int32_t RightOpen = std::min(Height, Game.C4S.Landscape.RightOpen);
LeftColPix.assign(Height, MCVehic);
for (int32_t cy = 0; cy < LeftOpen; cy++)
LeftColPix[cy] = 0;
for (int32_t cy = 0; cy < RightOpen; cy++)
RightColPix[cy] = 0;
}
return true;
}
@ -3674,13 +3681,11 @@ BYTE C4Landscape::GetPix(int32_t x, int32_t y) const // get landscape pixel (bou
// Border checks
if (x < 0)
{
if (y < p->LeftOpen) return 0;
else return MCVehic;
return p->LeftColPix[y];
}
if (static_cast<uint32_t>(x) >= static_cast<uint32_t>(p->Width))
{
if (y < p->RightOpen) return 0;
else return MCVehic;
return p->RightColPix[y];
}
if (y < 0)
{
@ -3736,13 +3741,11 @@ BYTE C4Landscape::GetBackPix(int32_t x, int32_t y) const // get landscape pixel
// Border checks
if (x < 0)
{
if (y < p->LeftOpen) return 0;
else return Mat2PixColDefault(MTunnel);
return p->DefaultBkgMat(p->LeftColPix[x]);
}
if (static_cast<uint32_t>(x) >= static_cast<uint32_t>(GetWidth()))
{
if (y < p->RightOpen) return 0;
else return Mat2PixColDefault(MTunnel);
return p->DefaultBkgMat(p->RightColPix[x]);
}
if (y < 0)
{

2
src/landscape/C4Landscape.h
View File

@ -56,8 +56,6 @@ public:
void Draw(C4TargetFacet &cgo, class C4FoWRegion *pLight = nullptr);
void ScenarioInit();
void ScanSideOpen();
void DrawMaterialRect(int32_t mat, int32_t tx, int32_t ty, int32_t wdt, int32_t hgt);
void RaiseTerrain(int32_t tx, int32_t ty, int32_t wdt);