From f87943a6de91abb8b1f322c0f3c00e841bd69873 Mon Sep 17 00:00:00 2001 From: randy Date: Mon, 8 Jul 2024 18:20:46 +0700 Subject: [PATCH] moved randygame stuff into fork I'm no longer using this repo, so it can be less cluttered. I'm working in my own fork now. --- asset_workbench/artmockup.aseprite | Bin 3107 -> 0 bytes entry_randygame.c | 179 ----------------------------- player.png | Bin 119 -> 0 bytes rock0.png | Bin 110 -> 0 bytes tree0.png | Bin 124 -> 0 bytes tree1.png | Bin 125 -> 0 bytes 6 files changed, 179 deletions(-) delete mode 100644 asset_workbench/artmockup.aseprite delete mode 100644 entry_randygame.c delete mode 100644 player.png delete mode 100644 rock0.png delete mode 100644 tree0.png delete mode 100644 tree1.png diff --git a/asset_workbench/artmockup.aseprite b/asset_workbench/artmockup.aseprite deleted file mode 100644 index c2d05b12fec5316a1b551eead6230b064006ff72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3107 zcmd5;c~BE)6n~o~L`XtF9gG|yfK+4#AweJr;V72F+Ezgg5nX2AT1(S z_Dz%R^|OB(6DclnmivzP=pxyun3M zW{xZ{S2mctX4dxGzNEI-$cA$kpyyb~rZ<;O&oz+^=gEe1jAg@3Wrr;mU^kb-=Qc3~ z9K%8)LfM3}NhgQ_;IFa~Qaf+lWC3~81>(F}dnEi_$AsSusXapFr1C@96sbM#0`|Ga zY;3k1ThcgEJaKtkZUq)0OD17MOqx9dzWqd<9I3Taz_jE_ttqOd2TRHix6sqO9o+uU zA=28Ndi$sq=97%Q#35iuFfEUzCF-P)Kp>b(l4qXwra6Vt+}l;q(g7bKXc&zgw4WiYJ4S8xI7kjmL4^R42L=uj;=<%)of$2K zR!^QX#>v z7T1fj01E7dC;~w44FF3NgG_S@3=|@Y$=y)gwX)k5S5UyFYZCxc1%aSa-SiI|u0Tji z=Fw^)o}L<0mQvr=p@U}f;JBY_t__Y?grjd|myj8ij1xC9F`Gw7nHn^9vo;zYQFrSG z0PR|k!de_o1;>Bzi_0%UvuNToQ0JJRQontt9RSZlUo?xPfnZKajaR^1Oq1D%N*CF!!_U%maH(Rm>bpPnW6EnsIdUaD?}ixBs$g!hbh4+ z;1FO`pwIRZS)2kWYfOuJy1+AVu=IRGfszNGGgyc;j-#s%oQZoC??wTI^{M-2jWggl zxDa?0uusyPnz{qJxaPg23&)uIpL#zHe1CGIIzabNwR~sXfeKbB9s#KYN;tAcF43Pg z%bjoV2X@mCu)aOYtx|zgNG_{Oj{cO^K0V69}kHG1~<=(PFHr%m_q_vA-A+ z3pI=xdj#=~n&>078^xbE z(zhh2xP)X!;4Rmj7AgDLx-6z_oo4B7~4m&1&%Diy`RVhn6|7H)2c!@AX$+5rS3d`nKxP#DvO{+0}oo(%LjOs~0 zbtq!$1f>q`L&k+swpMJGG9&)oyG2{bi_~wV1!JEUGMkCzicQF!8(2zm*A-L}!=}YO zm=@cNcymqcg>bXOn>Maxq)x&qdu zp4afi=T^t?Q8cZ(`MZd}z^-^oT`^4w5b#}H5V|l)x zpCW`bumYNgx~p6aUBfOlsIhcksK;GEAU&_#!6$-lIoK4tr!jl0&*6O^MkE$ndglMI zS7cRtZm26V=b071>HGHL^vKcZmOVLn{?|KKXQY_<-!+)L<0>*M2~TurY}ffTXj|{I btL-^mJ)XnW86ViNcI*nt$~NM2Iz#^i85IR( diff --git a/entry_randygame.c b/entry_randygame.c deleted file mode 100644 index 4255135..0000000 --- a/entry_randygame.c +++ /dev/null @@ -1,179 +0,0 @@ - -typedef struct Sprite { - Gfx_Image* image; - Vector2 size; -} Sprite; -typedef enum SpriteID { - SPRITE_nil, - SPRITE_player, - SPRITE_tree0, - SPRITE_tree1, - SPRITE_rock0, - SPRITE_MAX, -} SpriteID; -// randy: maybe we make this an X macro?? https://chatgpt.com/share/260222eb-2738-4d1e-8b1d-4973a097814d -Sprite sprites[SPRITE_MAX]; -Sprite* get_sprite(SpriteID id) { - if (id >= 0 && id < SPRITE_MAX) { - return &sprites[id]; - } - return &sprites[0]; -} - -typedef enum EntityArchetype { - arch_nil = 0, - arch_rock = 1, - arch_tree = 2, - arch_player = 3, -} EntityArchetype; - -typedef struct Entity { - bool is_valid; - EntityArchetype arch; - Vector2 pos; - bool render_sprite; - SpriteID sprite_id; -} Entity; -#define MAX_ENTITY_COUNT 1024 - -typedef struct World { - Entity entities[MAX_ENTITY_COUNT]; -} World; -World* world = 0; - -Entity* entity_create() { - Entity* entity_found = 0; - for (int i = 0; i < MAX_ENTITY_COUNT; i++) { - Entity* existing_entity = &world->entities[i]; - if (!existing_entity->is_valid) { - entity_found = existing_entity; - break; - } - } - assert(entity_found, "No more free entities!"); - entity_found->is_valid = true; - return entity_found; -} - -void entity_destroy(Entity* entity) { - memset(entity, 0, sizeof(Entity)); -} - -void setup_player(Entity* en) { - en->arch = arch_player; - en->sprite_id = SPRITE_player; -} - -void setup_rock(Entity* en) { - en->arch = arch_rock; - en->sprite_id = SPRITE_rock0; -} - -void setup_tree(Entity* en) { - en->arch = arch_tree; - en->sprite_id = SPRITE_tree0; - // en->sprite_id = SPRITE_tree1; -} - - -int entry(int argc, char **argv) { - window.title = STR("Randy's Game"); - window.width = 1280; - window.height = 720; - window.x = 200; - window.y = 200; - window.clear_color = hex_to_rgba(0x2a2d3aff); - - world = alloc(get_heap_allocator(), sizeof(World)); - memset(world, 0, sizeof(World)); - - sprites[SPRITE_player] = (Sprite){ .image=load_image_from_disk(STR("player.png"), get_heap_allocator()), .size=v2(6.0, 8.0) }; - sprites[SPRITE_tree0] = (Sprite){ .image=load_image_from_disk(STR("tree0.png"), get_heap_allocator()), .size=v2(7, 12) }; - sprites[SPRITE_tree1] = (Sprite){ .image=load_image_from_disk(STR("tree1.png"), get_heap_allocator()), .size=v2(7, 12) }; - sprites[SPRITE_rock0] = (Sprite){ .image=load_image_from_disk(STR("rock0.png"), get_heap_allocator()), .size=v2(7, 4) }; - - Entity* player_en = entity_create(); - setup_player(player_en); - - for (int i = 0; i < 10; i++) { - Entity* en = entity_create(); - setup_rock(en); - en->pos = v2(get_random_float32_in_range(-200, 200), get_random_float32_in_range(-200, 200)); - } - for (int i = 0; i < 10; i++) { - Entity* en = entity_create(); - setup_tree(en); - en->pos = v2(get_random_float32_in_range(-200, 200), get_random_float32_in_range(-200, 200)); - } - - float64 seconds_counter = 0.0; - s32 frame_count = 0; - - float64 last_time = os_get_current_time_in_seconds(); - while (!window.should_close) { - reset_temporary_storage(); - - draw_frame.projection = m4_make_orthographic_projection(window.width * -0.5, window.width * 0.5, window.height * -0.5, window.height * 0.5, -1, 10); - float zoom = 5.3; - draw_frame.view = m4_make_scale(v3(1.0/zoom, 1.0/zoom, 1.0)); - - float64 now = os_get_current_time_in_seconds(); - float64 delta_t = now - last_time; - last_time = now; - - os_update(); - - // :render - for (int i = 0; i < MAX_ENTITY_COUNT; i++) { - Entity* en = &world->entities[i]; - if (en->is_valid) { - - switch (en->arch) { - - default: - { - Sprite* sprite = get_sprite(en->sprite_id); - Matrix4 xform = m4_scalar(1.0); - xform = m4_translate(xform, v3(en->pos.x, en->pos.y, 0)); - xform = m4_translate(xform, v3(sprite->size.x * -0.5, 0.0, 0)); - draw_image_xform(sprite->image, xform, sprite->size, COLOR_WHITE); - break; - } - } - - } - } - - if (is_key_just_pressed(KEY_ESCAPE)) { - window.should_close = true; - } - - Vector2 input_axis = v2(0, 0); - if (is_key_down('A')) { - input_axis.x -= 1.0; - } - if (is_key_down('D')) { - input_axis.x += 1.0; - } - if (is_key_down('S')) { - input_axis.y -= 1.0; - } - if (is_key_down('W')) { - input_axis.y += 1.0; - } - input_axis = v2_normalize(input_axis); - - player_en->pos = v2_add(player_en->pos, v2_mulf(input_axis, 100.0 * delta_t)); - - gfx_update(); - seconds_counter += delta_t; - frame_count += 1; - if (seconds_counter > 1.0) { - log("fps: %i", frame_count); - seconds_counter = 0.0; - frame_count = 0; - } - } - - return 0; -} \ No newline at end of file diff --git a/player.png b/player.png deleted file mode 100644 index 983158cb828ef930392f342eb95cc2aa4e1d3db0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx0U~c5>$3n-jKx9jP7LeL$-D$|3_V>OLpWxZ z_BwJgDDWH>`v3oVRiV=1ry*X>tR6ygA^9_%Q-AM@*e`V8WwOZ&x2G3xh*~JWo5A>L QDNr+mr>mdKI;Vst04)C{$N&HU diff --git a/rock0.png b/rock0.png deleted file mode 100644 index 21776ada14c82160217b1a17a6634b0a6cb5f9c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)I!3HFqj;YoHDaPU;cPEB*=VV?2IU1fWjv*W~ zOHUo-WH8`iHmv-=@UB0%s=$7}Cp)rlU-x91`9VIcC5M4sL5lzHlr?-CfqED`UHx3v IIVCg!0BiOhR{#J2 diff --git a/tree0.png b/tree0.png deleted file mode 100644 index e9d1dd9efc3eb6562df2a055ade5383c81bec7ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)J!3HGPOk44ofy`glX(f`n0vZ7hDc0J zPH1TQ4+QBBOg=mo41Sz$CCL(!l9DHlyDB(m)b1!gTe~DWM4f0>mY4