zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- tileDelete / tileSetDummy

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-15 23:29:47 +02:00
parent 9a52e8039c
commit bb78db71bc
5 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/include/build.h
View file

@ -1034,7 +1034,6 @@ int32_t saveboard(const char *filename, const vec3_t *dapos, int16_t daang, in
void tileSetupDummy(int32_t tile);
void tileSetData(int32_t tile, int32_t tsiz, char const *buffer);
void tileDelete(int32_t tile);
void tileSetSize(int32_t picnum, int16_t dasizx, int16_t dasizy);
int32_t artReadHeader(buildvfs_kfd fil, char const *fn, artheader_t *local);
int32_t artReadHeaderFromBuffer(uint8_t const *buf, artheader_t *local);

28
source/build/src/defs.cpp
View file

@ -1027,18 +1027,7 @@ static int32_t defsparser(scriptfile *script)
if (check_tile("dummytile", tile, script, cmdtokptr))
break;
if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0)
{
tileDelete(tile);
break;
}
if (xsiz > 0 && ysiz > 0)
{
tileSetSize(tile, xsiz, ysiz);
picanm[tile] = {};
tileSetupDummy(tile);
}
tileSetDummy(tile, xsiz, ysiz);
break;
}
@ -1057,18 +1046,9 @@ static int32_t defsparser(scriptfile *script)
if (xsiz < 0 || ysiz < 0)
break; // TODO: message
if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0)
{
for (i=tile1; i<=tile2; i++)
tileDelete(i);
break;
}
for (i=tile1; i<=tile2; i++)
{
tileSetSize(i, xsiz, ysiz);
picanm[i] = {};
tileSetupDummy(i);
tileSetDummy(i, xsiz, ysiz);
}
break;
@ -2281,9 +2261,7 @@ static int32_t defsparser(scriptfile *script)
if (xsiz > 0 && ysiz > 0)
{
tileSetSize(tile, xsiz, ysiz);
picanm[tile] = {};
tileSetupDummy(tile);
tileSetDummy(tile, xsiz, ysiz);
}
#ifdef USE_OPENGL
xscale = 1.0f / xscale;

16
source/build/src/tiles.cpp
View file

@ -264,22 +264,6 @@ static void tileSoftDelete(int32_t const tile)
picanm[tile] = {};
}
void tileDelete(int32_t const tile)
{
tileSoftDelete(tile);
DO_FREE_AND_NULL(faketiledata[tile]);
vox_undefine(tile);
#ifdef USE_OPENGL
for (ssize_t i=MAXPALOOKUPS-1; i>=0; --i)
hicclearsubst(tile, i);
md_undefinetile(tile);
#endif
}
void tileUpdatePicSiz(int32_t picnum)
{
int j = 15;

35
source/common/textures/buildtiles.cpp
View file

@ -401,3 +401,38 @@ void BuildFiles::tileSetExternal(int tilenum, int width, int height, uint8_t* da
if (buffer) memcpy(buffer, data, width * height);
}
//==========================================================================
//
//
//
//==========================================================================
void tileDelete(int tile)
{
TileFiles.tiles[tile] = TileFiles.tilesbak[tile] = TileFiles.Placeholder;
vox_undefine(tile);
md_undefinetile(tile);
for (ssize_t i = MAXPALOOKUPS - 1; i >= 0; --i)
hicclearsubst(tile, i);
}
//==========================================================================
//
//
//
//==========================================================================
void tileSetDummy(int tile, int width, int height)
{
if (width == 0 || height == 0)
{
tileDelete(tile);
}
else if (width > 0 && height > 0)
{
auto dtile = new FDummyTile(width, height);
TileFiles.AddTile(tile, dtile);
}
}

2
source/common/textures/textures.h
View file

@ -517,6 +517,8 @@ struct BuildFiles
};
void tileSetDummy(int tile, int width, int height);
void tileDelete(int tile);
extern BuildFiles TileFiles;
inline bool tileCheck(int num)
{