bulmanator/ld58
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat: Basic level editing

Browse Source
This commit is contained in:
Matt Threlfall
2025-10-06 14:26:00 +01:00
parent 3e527f473b
commit 3a84947750
18 changed files with 242 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
code/first.c
View File

@@ -95,9 +95,10 @@ int main(int argc, char **argv)
camera->farp = 1000.0f;
game->draw.camera = camera;
World *world = LoadWorld(arena);
World *world = M_ArenaPush(arena, World);//LoadWorld(arena);
game->world = world;
world->arena = arena;
world->navMesh = &TestNavMesh;
world->random = Random_Seed(29237489723847);
world->npcCount = 2;
for(U32 i = 0; i < world->npcCount; i++) {
@@ -134,7 +135,85 @@ int main(int argc, char **argv)
world->player.bulletsLoaded = PLAYER_BULLET_COUNT;
world->player.reloadTimer = 0;
world->player.currentArea = 0;
for(int i =0; i< 4200; i++) {
world->map[i] = map[i];
}
world->tileTypes[0].rotation=0;
world->tileTypes[0].collision=false;
world->tileTypes[0].tile=D_ImageHandle(&game->draw, S("tile_dirt_0"));
world->tileTypes[1].rotation=0,
world->tileTypes[1].collision=false,
world->tileTypes[1].tile=D_ImageHandle(&game->draw, S("path_middle"));
world->tileTypes[2].rotation=0;
world->tileTypes[2].collision=false;
world->tileTypes[2].tile=D_ImageHandle(&game->draw, S("path_middle_edge"));
world->tileTypes[3].rotation=PI_F32/2;
world->tileTypes[3].collision=false;
world->tileTypes[3].tile=D_ImageHandle(&game->draw, S("path_middle_edge"));
world->tileTypes[4].rotation=PI_F32;
world->tileTypes[4].collision=false;
world->tileTypes[4].tile=D_ImageHandle(&game->draw, S("path_middle_edge"));
world->tileTypes[5].rotation=-PI_F32/2;
world->tileTypes[5].collision=false;
world->tileTypes[5].tile=D_ImageHandle(&game->draw, S("path_middle_edge"));
world->tileTypes[6].rotation=0;
world->tileTypes[6].collision=false;
world->tileTypes[6].tile=D_ImageHandle(&game->draw, S("path_middle"));
world->tileTypes[7].rotation=PI_F32/2;
world->tileTypes[7].collision=false;
world->tileTypes[7].tile=D_ImageHandle(&game->draw, S("path_middle"));
world->tileTypes[8].rotation=-PI_F32;
world->tileTypes[8].collision=false;
world->tileTypes[8].tile=D_ImageHandle(&game->draw, S("path_middle"));
world->tileTypes[9].rotation=-PI_F32/2;
world->tileTypes[9].collision=false;
world->tileTypes[9].tile=D_ImageHandle(&game->draw, S("path_middle"));
world->tileTypes[10].rotation=0;
world->tileTypes[10].collision=false;
world->tileTypes[10].tile=D_ImageHandle(&game->draw, S("path_corner"));
world->tileTypes[11].rotation=PI_F32/2;
world->tileTypes[11].collision=false;
world->tileTypes[11].tile=D_ImageHandle(&game->draw, S("path_corner"));
world->tileTypes[12].rotation=-PI_F32/2;
world->tileTypes[12].collision=false;
world->tileTypes[12].tile=D_ImageHandle(&game->draw, S("path_corner"));
world->tileTypes[13].rotation=PI_F32;
world->tileTypes[13].collision=false;
world->tileTypes[13].tile=D_ImageHandle(&game->draw, S("path_corner"));
world->tileTypes[14].rotation=0;
world->tileTypes[14].collision=false;
world->tileTypes[14].tile=D_ImageHandle(&game->draw, S("tile_dirt_1"));
world->propTypes[0].assetHandle=D_ImageHandle(&game->draw, S("rug0"));
world->propTypes[0].scale=1;
world->propTypes[1].assetHandle=D_ImageHandle(&game->draw, S("rug1"));
world->propTypes[1].scale=1;
world->propTypes[2].assetHandle=D_ImageHandle(&game->draw, S("skull"));
world->propTypes[2].scale=1;
world->propTypes[3].assetHandle=D_ImageHandle(&game->draw, S("table"));
world->propTypes[3].scale=1;
world->propTypes[4].assetHandle=D_ImageHandle(&game->draw, S("barrel"));
world->propTypes[4].scale=1;
world->propTypes[5].assetHandle=D_ImageHandle(&game->draw, S("can"));
world->propTypes[5].scale=1;
world->propTypes[6].assetHandle=D_ImageHandle(&game->draw, S("candle"));
world->propTypes[6].scale=1;
world->propTypes[7].assetHandle=D_ImageHandle(&game->draw, S("clock"));
world->propTypes[7].scale=1;
world->propTypes[8].assetHandle=D_ImageHandle(&game->draw, S("log_pile"));
world->propTypes[8].scale=1;
world->propTypes[9].assetHandle=D_ImageHandle(&game->draw, S("nightstand"));
world->propTypes[9].scale=1;
world->propTypes[10].assetHandle=D_ImageHandle(&game->draw, S("pool_table"));
world->propTypes[10].scale=1;
world->propTypes[11].assetHandle=D_ImageHandle(&game->draw, S("saloon_ext"));
world->propTypes[11].scale=6.875f;
world->propTypes[12].assetHandle=D_ImageHandle(&game->draw, S("saloon_int"));
world->propTypes[12].scale=6.875f;
}
game->editor.enabled = true;
game->editor.mode = G_EDITOR_MODE_TILE;
D_Animation animation;
@@ -164,13 +243,84 @@ int main(int argc, char **argv)
V2F((F32) width, (F32) height)
));
game->world->mouseProjected = V2F(projection.x, projection.y);
ProcessEvents(&e, game->world);
if(e.type==SDL_EVENT_MOUSE_MOTION) {
game->editor.cursor = V2F(projection.x, projection.y);
}
if (!game->editor.enabled) {
ProcessEvents(&e, game->world);
} else {
if(e.type==SDL_EVENT_MOUSE_BUTTON_DOWN && e.button.button == SDL_BUTTON_LEFT) {
switch(game->editor.mode){
case G_EDITOR_MODE_TILE: {
F32 tilex = (S32)(game->editor.cursor.x+TILE_SIZE/2);
F32 tiley = (S32)(game->editor.cursor.y+TILE_SIZE/2);
game->world->map[(S32)tilex + (S32)tiley * 96] = game->editor.currentAsset;
break;
}
case G_EDITOR_MODE_PROP: {
game->world->props[game->world->propCount].propType = game->editor.currentAsset;
game->world->props[game->world->propCount].area = game->editor.currentLevel;
game->world->props[game->world->propCount].pos = game->editor.cursor;
game->world->propCount++;
break;
}
}
}
}
if (e.type == SDL_EVENT_KEY_DOWN) {
switch(e.key.key) {
case SDLK_F10: {
game->editor.enabled = !game->editor.enabled;
break;
}
case SDLK_RIGHT: {
game->editor.currentAsset = Min(game->editor.currentAsset+1, 64);
break;
}
case SDLK_LEFT: {
game->editor.currentAsset = Max(game->editor.currentAsset-1, 0);
break;
}
case SDLK_A: {
game->camera.p.x -= 5;
break;
}
case SDLK_D: {
game->camera.p.x += 5;
break;
}
case SDLK_W: {
game->camera.p.y -= 5;
break;
}
case SDLK_S: {
game->camera.p.y += 5;
break;
}
case SDLK_UP: {
game->editor.currentLevel++;
game->world->player.currentArea++;
break;
}
case SDLK_DOWN: {
game->editor.currentLevel--;
game->world->player.currentArea--;
break;
}
case SDLK_SPACE: {
game->editor.mode = (game->editor.mode + 1) % 4;
break;
}
}
}
}
UpdateWorld(1.0f / 60.0f, game->world);
D_AnimationUpdate(&animation, 1.0f / 250.0f);
game->camera.p.x = game->world->player.pos.x;
game->camera.p.y = game->world->player.pos.y;
if(!game->editor.enabled) {
UpdateWorld(1.0f / 60.0f, game->world);
game->camera.p.x = game->world->player.pos.x;
game->camera.p.y = game->world->player.pos.y;
}
D_AnimationUpdate(&animation, 1.0f / 250.0f);
int w, h;
SDL_GetWindowSizeInPixels(window, &w, &h);
@@ -208,14 +358,34 @@ int main(int argc, char **argv)
D_Begin(&game->draw, frame, D_MAX_RECTS);
//RenderWorld(game->world, &game->draw);
// D_Rect(&game->draw, 0.0f, 0.0f, .texture = D_ImageHandle(&game->draw, S("saloon_ext")), .scale = 4.0f);
// D_Rect(&game->draw, -8.0f, 0.0f, .texture = 2, .scale = 2.0f);
// D_Rect(&game->draw, 6.0f, 0.0f, .texture = 3);
RenderWorld(game->world, &game->draw);
R2f aframe = D_AnimationFrame(&animation);
D_Rect(&game->draw, 0, 0, .texture = animation.id, .uv = aframe, .flags = D_RECT_UV_ASPECT);
if(game->editor.enabled) {
G_Editor editor = game->editor;
F32 tilex = floor(editor.cursor.x+TILE_SIZE/2);
F32 tiley = floor(editor.cursor.y+TILE_SIZE/2);
switch(game->editor.mode) {
case G_EDITOR_MODE_TILE: {
World_Tile asset = game->world->tileTypes[editor.currentAsset];
D_Rect(&game->draw, tilex, tiley, .texture=asset.tile, .angle=asset.rotation);
break;
}
case G_EDITOR_MODE_PROP: {
World_PropType prop = game->world->propTypes[editor.currentAsset];
D_Rect(&game->draw, editor.cursor.x, editor.cursor.y, .texture=prop.assetHandle, .scale=prop.scale);
break;
}
case G_EDITOR_MODE_HITBOX: {
break;
}
case G_EDITOR_MODE_POI: {
break;
}
}
}
D_End(&game->draw, frame);
vk.CmdEndRendering(cmd);