diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e6f80a..46a8eaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ if(MSVC) endif() if (EMSCRIPTEN) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -g -s USE_GLFW=3 --profiling -s ASSERTIONS=1 -s WASM=1 -s INITIAL_MEMORY=268435456 -s FORCE_FILESYSTEM=1 --preload-file ${CMAKE_SOURCE_DIR}/art@art/ --shell-file ${CMAKE_SOURCE_DIR}/web/eco2d.html") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_GLFW=3 --profiling -s ASSERTIONS=1 -s WASM=1 -s INITIAL_MEMORY=268435456 -s FORCE_FILESYSTEM=1 --preload-file ${CMAKE_SOURCE_DIR}/art@art/ --shell-file ${CMAKE_SOURCE_DIR}/web/eco2d.html") set(CMAKE_EXECUTABLE_SUFFIX ".html") # This line is used to set your executable to build with the emscripten html template so that you can directly open it. set(CMAKE_COMPILE_WARNING_AS_ERROR OFF) endif () diff --git a/code/game/src/debug_ui.c b/code/game/src/debug_ui.c index a7ec9da..178d503 100644 --- a/code/game/src/debug_ui.c +++ b/code/game/src/debug_ui.c @@ -29,7 +29,7 @@ typedef struct { #define DBG_FONT_SIZE 22 #define DBG_FONT_SPACING DBG_FONT_SIZE * 1.2f #define DBG_START_XPOS 15 -#define DBG_START_YPOS 200 +#define DBG_START_YPOS 30 #define DBG_LIST_XPOS_OFFSET 10 #define DBG_SHADOW_OFFSET_XPOS 1 #define DBG_SHADOW_OFFSET_YPOS 1 diff --git a/code/game/src/renderer_v0.c b/code/game/src/renderer_v0.c index 7a2b4e1..8b0b0f5 100644 --- a/code/game/src/renderer_v0.c +++ b/code/game/src/renderer_v0.c @@ -100,7 +100,7 @@ void DEBUG_draw_entities(uint64_t key, entity_view * data) { float x = data->x; float y = data->y; const char *title = TextFormat("Bot %d", key); - int title_w = MeasureTextEco(title, font_size, font_spacing); + float title_w = MeasureTextEco(title, font_size, font_spacing); DrawRectangleEco(x-title_w/2.f-title_bg_offset/2.f, y-size-font_size-fixed_title_offset, title_w+title_bg_offset, font_size, ColorAlpha(GRAY, data->tran_time)); DrawTextEco(title, x-title_w/2.f, y-size-font_size-fixed_title_offset, font_size, ColorAlpha(BLACK, data->tran_time), font_spacing); DrawCircleEco(x, y, size, ColorAlpha(PURPLE, data->tran_time)); diff --git a/code/modules/modules/systems.c b/code/modules/modules/systems.c index 3a02f27..7af0846 100644 --- a/code/modules/modules/systems.c +++ b/code/modules/modules/systems.c @@ -25,40 +25,42 @@ void IntegratePositions(ecs_iter_t *it) { profile(PROF_INTEGRATE_POS) { Position *p = ecs_field(it, Position, 1); Velocity *v = ecs_field(it, Velocity, 2); - + for (int i = 0; i < it->count; i++) { - // NOTE(zaklaus): world bounds - { - float w = (float)world_dim(); - p[i].x = zpl_clamp(p[i].x, 0, w-1); - p[i].y = zpl_clamp(p[i].y, 0, w-1); - } - -#if PHY_BLOCK_COLLISION==1 - // NOTE(zaklaus): X axis - { - world_block_lookup lookup = world_block_from_realpos(p[i].x+PHY_LOOKAHEAD(v[i].x), p[i].y); - uint32_t flags = blocks_get_flags(lookup.bid); - float bounce = blocks_get_bounce(lookup.bid); - if (flags & BLOCK_FLAG_COLLISION) { - v[i].x = physics_correction(lookup.ox, v[i].x, bounce); + if (zpl_abs(v[i].x) >= 0.001f || zpl_abs(v[i].y) >= 0.001f) { + // NOTE(zaklaus): world bounds + { + float w = (float)world_dim(); + p[i].x = zpl_clamp(p[i].x, 0, w-1); + p[i].y = zpl_clamp(p[i].y, 0, w-1); } - } - - // NOTE(zaklaus): Y axis - { - world_block_lookup lookup = world_block_from_realpos(p[i].x, p[i].y+PHY_LOOKAHEAD(v[i].y)); - uint32_t flags = blocks_get_flags(lookup.bid); - float bounce = blocks_get_bounce(lookup.bid); - if (flags & BLOCK_FLAG_COLLISION) { - v[i].y = physics_correction(lookup.oy, v[i].y, bounce); + + #if PHY_BLOCK_COLLISION==1 + // NOTE(zaklaus): X axis + { + world_block_lookup lookup = world_block_from_realpos(p[i].x+PHY_LOOKAHEAD(v[i].x), p[i].y); + uint32_t flags = blocks_get_flags(lookup.bid); + float bounce = blocks_get_bounce(lookup.bid); + if (flags & BLOCK_FLAG_COLLISION) { + v[i].x = physics_correction(lookup.ox, v[i].x, bounce); + } } + + // NOTE(zaklaus): Y axis + { + world_block_lookup lookup = world_block_from_realpos(p[i].x, p[i].y+PHY_LOOKAHEAD(v[i].y)); + uint32_t flags = blocks_get_flags(lookup.bid); + float bounce = blocks_get_bounce(lookup.bid); + if (flags & BLOCK_FLAG_COLLISION) { + v[i].y = physics_correction(lookup.oy, v[i].y, bounce); + } + } + #endif + + p[i].x += v[i].x * safe_dt(it); + p[i].y += v[i].y * safe_dt(it); } -#endif - - p[i].x += v[i].x * safe_dt(it); - p[i].y += v[i].y * safe_dt(it); - + { debug_v2 a = {p[i].x, p[i].y}; debug_v2 b = {p[i].x+v[i].x, p[i].y+v[i].y}; @@ -70,10 +72,10 @@ void IntegratePositions(ecs_iter_t *it) { void UpdateTrackerPos(ecs_iter_t *it) { Position *p = ecs_field(it, Position, 1); - + for (int i = 0; i < it->count; i++){ librg_entity_chunk_set(world_tracker(), it->entities[i], librg_chunk_from_realpos(world_tracker(), p[i].x, p[i].y, 0)); - + { debug_v2 a = {p[i].x-2.5f, p[i].y-2.5f}; debug_v2 b = {p[i].x+2.5f, p[i].y+2.5f}; @@ -88,12 +90,12 @@ void UpdateTrackerPos(ecs_iter_t *it) { void HurtOnHazardBlock(ecs_iter_t *it) { Position *p = ecs_field(it, Position, 1); Health *h = ecs_field(it, Health, 2); - + for (int i = 0; i < it->count; i++) { - world_block_lookup l = world_block_from_realpos(p[i].x, p[i].y); - if (blocks_get_flags(l.bid) & BLOCK_FLAG_HAZARD) { - if (h->pain_time < 0.0f) { - h->pain_time = HAZARD_BLOCK_TIME; + if (h->pain_time < 0.0f) { + h->pain_time = HAZARD_BLOCK_TIME; + world_block_lookup l = world_block_from_realpos(p[i].x, p[i].y); + if (blocks_get_flags(l.bid) & BLOCK_FLAG_HAZARD) { h->hp -= HAZARD_BLOCK_DMG; h->hp = zpl_max(0.0f, h->hp); } @@ -107,7 +109,7 @@ void HurtOnHazardBlock(ecs_iter_t *it) { void RegenerateHP(ecs_iter_t *it) { Health *h = ecs_field(it, Health, 1); - + for (int i = 0; i < it->count; i++) { if (h[i].pain_time < 0.0f) { if (h[i].heal_time < 0.0f && h[i].hp < h[i].max_hp) { @@ -126,7 +128,7 @@ void RegenerateHP(ecs_iter_t *it) { void ResetActivators(ecs_iter_t *it) { Input *in = ecs_field(it, Input, 1); - + for (int i = 0; i < it->count; i++) { in[i].use = false; in[i].swap = false; @@ -139,8 +141,9 @@ void ResetActivators(ecs_iter_t *it) { void ApplyWorldDragOnVelocity(ecs_iter_t *it) { Position *p = ecs_field(it, Position, 1); Velocity *v = ecs_field(it, Velocity, 2); - + for (int i = 0; i < it->count; i++) { + if (zpl_abs(v[i].x) < 0.001f && zpl_abs(v[i].y) < 0.001f) continue; world_block_lookup lookup = world_block_from_realpos(p[i].x, p[i].y); float drag = zpl_clamp(blocks_get_drag(lookup.bid), 0.0f, 1.0f); float friction = blocks_get_friction(lookup.bid); @@ -148,7 +151,7 @@ void ApplyWorldDragOnVelocity(ecs_iter_t *it) { float vely = blocks_get_vely(lookup.bid); v[i].x = zpl_lerp(v[i].x, zpl_max(0.0f, zpl_abs(velx))*zpl_sign(velx), PHY_WALK_DRAG*drag*friction*safe_dt(it)); v[i].y = zpl_lerp(v[i].y, zpl_max(0.0f, zpl_abs(vely))*zpl_sign(vely), PHY_WALK_DRAG*drag*friction*safe_dt(it)); - + if ( zpl_abs(v[i].x) > ENTITY_ACTION_VELOCITY_THRESHOLD || zpl_abs(v[i].y) > ENTITY_ACTION_VELOCITY_THRESHOLD) { entity_wake(it->entities[i]); @@ -160,18 +163,18 @@ void ApplyWorldDragOnVelocity(ecs_iter_t *it) { void PlayerClosestInteractable(ecs_iter_t *it){ Input *in = ecs_field(it, Input, 1); - + for (int i = 0; i < it->count; ++i) { size_t ents_count; int64_t *ents = world_chunk_fetch_entities_realpos(in[i].bx, in[i].by, &ents_count); - + ecs_entity_t closest_pick = 0; float min_pick = ZPL_F32_MAX; - + for (size_t j = 0; j < ents_count; j++) { const Position *p2 = ecs_get(it->world, ents[j], Position); if (!p2) continue; - + float dx = p2->x - in[i].bx; float dy = p2->y - in[i].by; float range = zpl_sqrt(dx*dx + dy*dy); @@ -180,9 +183,9 @@ void PlayerClosestInteractable(ecs_iter_t *it){ closest_pick = ents[j]; } } - + in[i].pick_ent = closest_pick; - + if (in[i].pick) in[i].sel_ent = (in[i].sel_ent == closest_pick) ? 0 : closest_pick; } @@ -199,21 +202,21 @@ void DisableWorldEdit(ecs_iter_t *it) { void SystemsImport(ecs_world_t *ecs) { ECS_MODULE(ecs, Systems); - + ECS_SYSTEM(ecs, EnableWorldEdit, EcsOnLoad); ECS_SYSTEM(ecs, MovementImpulse, EcsOnLoad, components.Input, components.Velocity, components.Position, !components.IsInVehicle); ECS_SYSTEM(ecs, DemoNPCMoveAround, EcsOnLoad, components.Velocity, components.DemoNPC); - + ECS_SYSTEM(ecs, ApplyWorldDragOnVelocity, EcsOnUpdate, components.Position, components.Velocity); ECS_SYSTEM(ecs, HurtOnHazardBlock, EcsOnUpdate, components.Position, components.Health); ECS_SYSTEM(ecs, RegenerateHP, EcsOnUpdate, components.Health); ECS_SYSTEM(ecs, VehicleHandling, EcsOnUpdate, components.Vehicle, components.Position, components.Velocity); - + ECS_SYSTEM(ecs, IntegratePositions, EcsOnValidate, components.Position, components.Velocity); - + ECS_SYSTEM(ecs, EnterVehicle, EcsPostUpdate, components.Input, components.Position, !components.IsInVehicle); ECS_SYSTEM(ecs, LeaveVehicle, EcsPostUpdate, components.Input, components.IsInVehicle, components.Velocity); - + ECS_SYSTEM(ecs, PlayerClosestInteractable, EcsPostUpdate, components.Input); ECS_SYSTEM(ecs, PickItem, EcsPostUpdate, components.Input, components.Position, components.Inventory, !components.IsInVehicle); ECS_SYSTEM(ecs, DropItem, EcsPostUpdate, components.Input, components.Position, components.Inventory, !components.IsInVehicle); @@ -222,13 +225,13 @@ void SystemsImport(ecs_world_t *ecs) { ECS_SYSTEM(ecs, UseItem, EcsPostUpdate, components.Input, components.Position, components.Inventory, !components.IsInVehicle); ECS_SYSTEM(ecs, InspectContainers, EcsPostUpdate, components.Input, !components.IsInVehicle); ECS_SYSTEM(ecs, HarvestIntoContainers, EcsPostUpdate, components.ItemContainer, components.Position); - + ECS_SYSTEM(ecs, ResetActivators, EcsPostUpdate, components.Input); - + ECS_SYSTEM(ecs, UpdateTrackerPos, EcsPostUpdate, components.Position, components.Velocity); - + ECS_SYSTEM(ecs, ClearVehicle, EcsUnSet, components.Vehicle); - + ECS_SYSTEM(ecs, DisableWorldEdit, EcsPostUpdate); - + }