various improvements + release build fix
parent
e3f56ffa46
commit
05144764bd
|
@ -15,7 +15,7 @@ if(MSVC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (EMSCRIPTEN)
|
if (EMSCRIPTEN)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -D_DEBUG")
|
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_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_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_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)
|
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
|
||||||
|
|
|
@ -42,5 +42,6 @@ add_executable(eco2d
|
||||||
target_compile_definitions(eco2d PRIVATE CLIENT)
|
target_compile_definitions(eco2d PRIVATE CLIENT)
|
||||||
include_directories(src ../modules ../../art/gen)
|
include_directories(src ../modules ../../art/gen)
|
||||||
target_link_libraries(eco2d raylib cwpack eco2d-modules flecs-bundle vendors-bundle)
|
target_link_libraries(eco2d raylib cwpack eco2d-modules flecs-bundle vendors-bundle)
|
||||||
|
target_compile_options(eco2d PRIVATE -Werror -Wall -Wextra -Wno-unused-function -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-parameter)
|
||||||
|
|
||||||
link_system_libs(eco2d)
|
link_system_libs(eco2d)
|
||||||
|
|
|
@ -87,7 +87,7 @@ void entity_update_action_timers() {
|
||||||
while (ecs_query_next(&it)) {
|
while (ecs_query_next(&it)) {
|
||||||
StreamInfo *si = ecs_field(&it, StreamInfo, 1);
|
StreamInfo *si = ecs_field(&it, StreamInfo, 1);
|
||||||
|
|
||||||
for (size_t i = 0; i < it.count; i++) {
|
for (int32_t i = 0; i < it.count; i++) {
|
||||||
if (si[i].last_update < zpl_time_rel()) {
|
if (si[i].last_update < zpl_time_rel()) {
|
||||||
si[i].last_update = zpl_time_rel() + si[i].tick_delay;
|
si[i].last_update = zpl_time_rel() + si[i].tick_delay;
|
||||||
si[i].tick_delay += (zpl_time_rel() - last_update_time) * 0.5f;
|
si[i].tick_delay += (zpl_time_rel() - last_update_time) * 0.5f;
|
||||||
|
|
|
@ -73,7 +73,7 @@ void world_viewers_init(uint32_t num_viewers) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void world_viewers_destroy() {
|
void world_viewers_destroy() {
|
||||||
for (uint32_t i = 0; i < zpl_buffer_count(world_viewers); i++) {
|
for (zpl_isize i = 0; i < zpl_buffer_count(world_viewers); i++) {
|
||||||
world_view_destroy(&world_viewers[i]);
|
world_view_destroy(&world_viewers[i]);
|
||||||
}
|
}
|
||||||
zpl_buffer_free(world_viewers);
|
zpl_buffer_free(world_viewers);
|
||||||
|
|
|
@ -45,7 +45,7 @@ void buildmode_draw(void) {
|
||||||
|
|
||||||
ItemDrop *item = &e->items[e->selected_item];
|
ItemDrop *item = &e->items[e->selected_item];
|
||||||
|
|
||||||
if (e->has_items && !e->inside_vehicle && item->quantity > 0 && !is_outside_range || build_is_deletion_mode) {
|
if (e->has_items && !e->inside_vehicle && item->quantity > 0 && (!is_outside_range || build_is_deletion_mode)) {
|
||||||
item_usage usage = 0;
|
item_usage usage = 0;
|
||||||
uint16_t item_id = 0;
|
uint16_t item_id = 0;
|
||||||
if (!build_is_deletion_mode){
|
if (!build_is_deletion_mode){
|
||||||
|
|
|
@ -105,6 +105,7 @@ int32_t pkt_unpack_struct(cw_unpack_context *uc, pkt_desc *desc, void *raw_blob,
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t pkt_pack_struct(cw_pack_context *pc, pkt_desc *desc, void *raw_blob, uint32_t blob_size) {
|
int32_t pkt_pack_struct(cw_pack_context *pc, pkt_desc *desc, void *raw_blob, uint32_t blob_size) {
|
||||||
|
(void)blob_size;
|
||||||
uint8_t *blob = (uint8_t*)raw_blob;
|
uint8_t *blob = (uint8_t*)raw_blob;
|
||||||
for (pkt_desc *field = desc; field->type != CWP_NOT_AN_ITEM; ++field) {
|
for (pkt_desc *field = desc; field->type != CWP_NOT_AN_ITEM; ++field) {
|
||||||
if (field->skip_count != 0) {
|
if (field->skip_count != 0) {
|
||||||
|
@ -158,6 +159,7 @@ int32_t pkt_pack_struct(cw_pack_context *pc, pkt_desc *desc, void *raw_blob, uin
|
||||||
}
|
}
|
||||||
|
|
||||||
void pkt_dump_struct(pkt_desc *desc, void* raw_blob, uint32_t blob_size) {
|
void pkt_dump_struct(pkt_desc *desc, void* raw_blob, uint32_t blob_size) {
|
||||||
|
(void)blob_size;
|
||||||
uint8_t *blob = (uint8_t*)raw_blob;
|
uint8_t *blob = (uint8_t*)raw_blob;
|
||||||
zpl_printf("{\n");
|
zpl_printf("{\n");
|
||||||
for (pkt_desc *field = desc; field->type != CWP_NOT_AN_ITEM; ++field) {
|
for (pkt_desc *field = desc; field->type != CWP_NOT_AN_ITEM; ++field) {
|
||||||
|
|
|
@ -30,7 +30,7 @@ int32_t pkt_00_init_handler(pkt_header *header) {
|
||||||
|
|
||||||
Position *pos = ecs_get_mut(world_ecs(), ent_id, Position);
|
Position *pos = ecs_get_mut(world_ecs(), ent_id, Position);
|
||||||
|
|
||||||
#if 0
|
#if 1
|
||||||
pos->x = world_dim()/2.0f + rand()%15*15.0f;
|
pos->x = world_dim()/2.0f + rand()%15*15.0f;
|
||||||
pos->y = world_dim()/2.0f + rand()%15*15.0f;
|
pos->y = world_dim()/2.0f + rand()%15*15.0f;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -29,7 +29,7 @@ int32_t pkt_01_welcome_handler(pkt_header *header) {
|
||||||
|
|
||||||
world_view *view = game_world_view_get(header->view_id);
|
world_view *view = game_world_view_get(header->view_id);
|
||||||
|
|
||||||
zpl_printf("[INFO] initializing read-only world view id: %d...\n", header->view_id);
|
zpl_printf("[INFO] initializing read-only world view id: %d... (chunk_size: %d, world_size: %d)\n", header->view_id, table.chunk_size, table.world_size);
|
||||||
world_view_init(view, table.seed, table.ent_id, table.chunk_size, table.world_size);
|
world_view_init(view, table.seed, table.ent_id, table.chunk_size, table.world_size);
|
||||||
game_world_view_set_active(view);
|
game_world_view_set_active(view);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -25,6 +25,7 @@ static BOOL WINAPI _sighandler_win32_control_handler(DWORD control_type)
|
||||||
#else //POSIX complaint
|
#else //POSIX complaint
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
static void _sighandler_posix_signal_handler(int sig) {
|
static void _sighandler_posix_signal_handler(int sig) {
|
||||||
|
(void)sig;
|
||||||
game_request_close();
|
game_request_close();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "utils/options.h"
|
#include "utils/options.h"
|
||||||
|
|
||||||
void generate_minimap(int32_t seed, uint16_t block_size, uint16_t chunk_size, uint16_t world_size) {
|
void generate_minimap(int32_t seed, uint16_t block_size, uint16_t chunk_size, uint16_t world_size) {
|
||||||
|
(void)block_size;
|
||||||
world_init(seed, chunk_size, world_size);
|
world_init(seed, chunk_size, world_size);
|
||||||
|
|
||||||
block_id const *world;
|
block_id const *world;
|
||||||
|
|
|
@ -157,6 +157,12 @@ void EcoDrawCube(Vector3 position, float width, float height, float length, floa
|
||||||
// Draw codepoint at specified position in 3D space
|
// Draw codepoint at specified position in 3D space
|
||||||
void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontSize, bool backface, Color tint)
|
void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontSize, bool backface, Color tint)
|
||||||
{
|
{
|
||||||
|
(void)font;
|
||||||
|
(void)codepoint;
|
||||||
|
(void)position;
|
||||||
|
(void)fontSize;
|
||||||
|
(void)backface;
|
||||||
|
(void)tint;
|
||||||
#if 0
|
#if 0
|
||||||
// Character index position in sprite font
|
// Character index position in sprite font
|
||||||
// NOTE: In case a codepoint is not available in the font, index returned points to '?'
|
// NOTE: In case a codepoint is not available in the font, index returned points to '?'
|
||||||
|
|
|
@ -210,7 +210,7 @@ void world_configure_tracker(void) {
|
||||||
ZPL_ASSERT_MSG(world.tracker, "[ERROR] An error occurred while trying to create a server world.");
|
ZPL_ASSERT_MSG(world.tracker, "[ERROR] An error occurred while trying to create a server world.");
|
||||||
|
|
||||||
/* config our world grid */
|
/* config our world grid */
|
||||||
librg_config_chunksize_set(world.tracker, WORLD_BLOCK_SIZE * world.chunk_size, WORLD_BLOCK_SIZE * world.chunk_size, 0);
|
librg_config_chunksize_set(world.tracker, WORLD_BLOCK_SIZE * world.chunk_size, WORLD_BLOCK_SIZE * world.chunk_size, 1);
|
||||||
librg_config_chunkamount_set(world.tracker, world.chunk_amount, world.chunk_amount, 0);
|
librg_config_chunkamount_set(world.tracker, world.chunk_amount, world.chunk_amount, 0);
|
||||||
librg_config_chunkoffset_set(world.tracker, LIBRG_OFFSET_BEG, LIBRG_OFFSET_BEG, LIBRG_OFFSET_BEG);
|
librg_config_chunkoffset_set(world.tracker, LIBRG_OFFSET_BEG, LIBRG_OFFSET_BEG, LIBRG_OFFSET_BEG);
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
|
|
||||||
#define LIBRG_VERSION_MAJOR 7
|
#define LIBRG_VERSION_MAJOR 7
|
||||||
#define LIBRG_VERSION_MINOR 0
|
#define LIBRG_VERSION_MINOR 0
|
||||||
#define LIBRG_VERSION_PATCH 1
|
#define LIBRG_VERSION_PATCH 2
|
||||||
#define LIBRG_VERSION_PRE ""
|
#define LIBRG_VERSION_PRE ""
|
||||||
|
|
||||||
// file: librg_hedley.h
|
// file: librg_hedley.h
|
||||||
|
@ -21033,14 +21033,14 @@ int8_t librg_chunk_to_chunkpos(librg_world *world, librg_chunk id, int16_t *chun
|
||||||
return LIBRG_CHUNK_INVALID;
|
return LIBRG_CHUNK_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
int16_t z = (int16_t)(id / (wld->worldsize.x * wld->worldsize.y));
|
int64_t z = (int64_t)(id / (wld->worldsize.x * wld->worldsize.y));
|
||||||
int16_t r1 = (int16_t)(id % (wld->worldsize.x * wld->worldsize.y));
|
int64_t r1 = (int64_t)(id % (wld->worldsize.x * wld->worldsize.y));
|
||||||
int16_t y = r1 / wld->worldsize.x;
|
int64_t y = r1 / wld->worldsize.x;
|
||||||
int16_t x = r1 % wld->worldsize.x;
|
int64_t x = r1 % wld->worldsize.x;
|
||||||
|
|
||||||
if (chunk_x) *chunk_x = x - librg_util_chunkoffset_line(0, wld->chunkoffset.x, wld->worldsize.x);
|
if (chunk_x) *chunk_x = (int16_t)(x - librg_util_chunkoffset_line(0, wld->chunkoffset.x, wld->worldsize.x));
|
||||||
if (chunk_y) *chunk_y = y - librg_util_chunkoffset_line(0, wld->chunkoffset.y, wld->worldsize.y);
|
if (chunk_y) *chunk_y = (int16_t)(y - librg_util_chunkoffset_line(0, wld->chunkoffset.y, wld->worldsize.y));
|
||||||
if (chunk_z) *chunk_z = z - librg_util_chunkoffset_line(0, wld->chunkoffset.z, wld->worldsize.z);
|
if (chunk_z) *chunk_z = (int16_t)(z - librg_util_chunkoffset_line(0, wld->chunkoffset.z, wld->worldsize.z));
|
||||||
|
|
||||||
return LIBRG_OK;
|
return LIBRG_OK;
|
||||||
}
|
}
|
||||||
|
@ -21983,4 +21983,3 @@ LIBRG_END_C_DECLS
|
||||||
#endif // LIBRG_IMPLEMENTATION
|
#endif // LIBRG_IMPLEMENTATION
|
||||||
|
|
||||||
#endif // LIBRG_H
|
#endif // LIBRG_H
|
||||||
|
|
||||||
|
|
|
@ -17,4 +17,4 @@ emsdk activate latest
|
||||||
source ./emsdk/emsdk_env.sh
|
source ./emsdk/emsdk_env.sh
|
||||||
|
|
||||||
# Setup web build
|
# Setup web build
|
||||||
emcmake cmake -S . -B build_web -DCMAKE_BUILD_TYPE=Debug -DPLATFORM=Web
|
emcmake cmake -S . -B build_web -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Web
|
||||||
|
|
Loading…
Reference in New Issue