team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added an extra column/row of height info to each section, to get alignment correct in respect to holes. 

Also, first texture painted is considered the base texture

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4092 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-22 02:56:22 +00:00
parent a7e1ddf04b
commit 95aa0b5eeb
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engine/gl/gl_heightmap.c
View File

@ -23,7 +23,7 @@ int Surf_NewLightmaps(int count, int width, int height);
#define MAXSECTIONS 64 //this many sections max in each direction
#define SECTTEXSIZE 64 //this many texture samples per section
#define SECTHEIGHTSIZE 16 //this many height samples per section
#define SECTHEIGHTSIZE 17 //this many height samples per section
//each section is this many sections higher in world space, to keep the middle centered at '0 0'
#define CHUNKBIAS (MAXSECTIONS*MAXSECTIONS/2)
@ -34,7 +34,11 @@ int Surf_NewLightmaps(int count, int width, int height);
#define HMLMSTRIDE (LMCHUNKS*SECTTEXSIZE)
#define SECTION_MAGIC (*(int*)"HMMS")
#define SECTION_VER 0
#define SECTION_VER 1
/*simple version history:
ver=0
SECTHEIGHTSIZE=16
*/
enum
{
@ -253,7 +257,10 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
if (ds->magic != SECTION_MAGIC)
return NULL;
if (ds->ver != SECTION_VER)
return NULL;
{
FS_FreeFile(ds);
ds = NULL;
}
}
if (!s)
@ -1889,6 +1896,22 @@ static void ted_mixpaint(void *ctx, hmsection_t *s, int idx, float wx, float wy,
return;
}
}
/*special handling to make a section accept the first texture painted on it as a base texture. no more chessboard*/
if (!*s->texname[0] && !*s->texname[1] && !*s->texname[2] && !*s->texname[3])
{
Q_strncpyz(s->texname[3], texname, sizeof(s->texname[3]));
Terr_LoadSectionTextures(s);
for (idx = 0; idx < SECTTEXSIZE*SECTTEXSIZE; idx++)
{
lm = ted_getlightmap(s, idx);
lm[2] = 0;
lm[1] = 0;
lm[0] = 0;
}
return;
}
for (t = 0; t < 4; t++)
{
if (!*s->texname[t])