From e59a032fb9afac6496acf3fba51a2a329bd0f992 Mon Sep 17 00:00:00 2001 From: aura Date: Mon, 16 Mar 2026 13:35:33 +0100 Subject: more editor work --- src/game/world/map.cpp | 8 ++++---- src/game/world/map.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/game') diff --git a/src/game/world/map.cpp b/src/game/world/map.cpp index 5f1f5d7..7b8060b 100644 --- a/src/game/world/map.cpp +++ b/src/game/world/map.cpp @@ -380,24 +380,24 @@ void map_gen_skybox( WORLD_MAP* m ) { VEC3 maxs = m->maxs + VEC3( SKYBOX_OFFSET, SKYBOX_OFFSET, SKYBOX_OFFSET ); m->skybox.walls[0] = { + .propid = MAPPROP_SKYBOX, .start = { mins.x, mins.y, mins.z }, .end = { maxs.x, mins.y, maxs.z - mins.z }, - .propid = MAPPROP_SKYBOX }; m->skybox.walls[1] = { + .propid = MAPPROP_SKYBOX, .start = { maxs.x, mins.y, mins.z }, .end = { maxs.x, maxs.y, maxs.z - mins.z }, - .propid = MAPPROP_SKYBOX }; m->skybox.walls[2] = { + .propid = MAPPROP_SKYBOX, .start = { maxs.x, maxs.y, mins.z }, .end = { mins.x, maxs.y, maxs.z - mins.z }, - .propid = MAPPROP_SKYBOX }; m->skybox.walls[3] = { + .propid = MAPPROP_SKYBOX, .start = { mins.x, maxs.y, mins.z }, .end = { mins.x, mins.y, maxs.z - mins.z }, - .propid = MAPPROP_SKYBOX }; VEC2 floor[] = { diff --git a/src/game/world/map.h b/src/game/world/map.h index 89c467c..8e6444e 100644 --- a/src/game/world/map.h +++ b/src/game/world/map.h @@ -39,22 +39,22 @@ struct MAP_PROPREF { }; struct MAP_POLYGON : public EOBJECT { + EPROP( MAP_PROPREF, propid, {}, "prop id" ); EPROP( LIST, vertices, {}, "vertices" ); VEC3 mins; VEC3 maxs; U8 type; - EPROP( MAP_PROPREF, propid, {}, "prop id" ); }; struct MAP_WALL : public EOBJECT { + EPROP( MAP_PROPREF, propid, {}, "prop id" ); + EPROP( VEC3, start, {}, "start pos" ); EPROP( VEC3, end, {}, "end pos" ); EPROP( VEC2, uvstart, {}, "uv start offset" ); EPROP( VEC2, uvend, {}, "uv end offset" ); - - EPROP( MAP_PROPREF, propid, {}, "prop id" ); }; struct MAP_TEXTURE_ENTRY { @@ -64,10 +64,10 @@ struct MAP_TEXTURE_ENTRY { }; struct MAP_SPRITE : public EOBJECT { + EPROP( GL_TEX2D*, tex, {}, "texture" ); EPROP( VEC3, pos, {}, "position" ); EPROP( VEC2, size, {}, "size" ); EPROP( CLR, clr, {}, "color" ); - EPROP( GL_TEX2D*, tex, {}, "texture" ); }; struct MAP_ENTITY : public EOBJECT { -- cgit v1.2.3