From 22afdb20a4df97a4c5abda6ee1988699b61097d0 Mon Sep 17 00:00:00 2001 From: Masashi Date: Sat, 20 Dec 2025 01:56:02 +0530 Subject: [PATCH] const kw --- game/client.c | 1482 +++++------------------ game/client.c.bak | 1174 ++++++++++++++++++ src/ast.rs | 18 + src/c_ir.rs | 5 + src/c_lowerer/declaration_transpiler.rs | 7 + src/c_lowerer/statements_transpiler.rs | 11 +- src/codegen/transpiler.rs | 74 +- src/import_resolver.rs | 24 +- src/lexer/mod.rs | 9 + src/main.rs | 6 + src/monomorphize.rs | 6 + src/parser.rs | 67 +- src/typechecker.rs | 360 +++++- 13 files changed, 2055 insertions(+), 1188 deletions(-) create mode 100644 game/client.c.bak diff --git a/game/client.c b/game/client.c index eb6df46..a5a5599 100644 --- a/game/client.c +++ b/game/client.c @@ -1,1174 +1,344 @@ -#include "raylib.h" -#include -#include +#include "libsuicmez/libsuicmez.h" #include +#include +#include #include -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#include -#pragma comment(lib, "ws2_32.lib") -typedef int socklen_t; -#define CLOSESOCK closesocket -#else -#include -#include -#include -#include -#include -#define CLOSESOCK close -#endif +void* gc_alloc(const TypeInfo* type, size_t size); +void gc_init(void); +void gc_shutdown(void); -#define PROTOCOL_VERSION 67 -#define SERVER_PORT 27015 -#define MAX_PLAYERS 16 -#define USERNAME_MAX 16 - -#define WEAPON_PISTOL 0 -#define WEAPON_RIFLE 1 - -#define ITEM_NONE 0 -#define ITEM_MEDKIT 1 -#define ITEM_AMMO_PISTOL 2 -#define ITEM_AMMO_RIFLE 3 - -#define MAX_ITEMS 64 - -#define BTN_RELOAD (1u << 0) -#define BTN_SWITCH_PISTOL (1u << 1) -#define BTN_SWITCH_RIFLE (1u << 2) -#define BTN_PICK (1u << 3) -#define BTN_USE_MEDKIT (1u << 4) -#define BTN_JUMP (1u << 5) - -typedef struct { - Vector3 direction; // Normalized light direction - Vector3 color; // RGB color (0-1 range) - float intensity; // Light intensity multiplier - float ambientIntensity; // Ambient light strength - float shadowBias; // Shadow bias to prevent z-fighting - float shadowIntensity; // How dark shadows are (0-1) -} DirectionalLight; - -typedef struct { - Shader shader; - int locViewPos; - int locLightDir; - int locLightColor; - int locLightIntensity; - int locAmbientIntensity; - int locTerrainColor; -} TerrainShader; - -static TerrainShader load_terrain_shader(void) { - TerrainShader ts = {0}; - ts.shader = LoadShader("terrain.vs", "terrain.fs"); - - // Get uniform locations - ts.locViewPos = GetShaderLocation(ts.shader, "viewPos"); - ts.locLightDir = GetShaderLocation(ts.shader, "lightDir"); - ts.locLightColor = GetShaderLocation(ts.shader, "lightColor"); - ts.locLightIntensity = GetShaderLocation(ts.shader, "lightIntensity"); - ts.locAmbientIntensity = GetShaderLocation(ts.shader, "ambientIntensity"); - ts.locTerrainColor = GetShaderLocation(ts.shader, "terrainColor"); - - return ts; +// Helper for allocating arrays +static void* suic_alloc_array(const TypeInfo* type, size_t elem_size, size_t len, void* init_data) { + void* ptr = gc_alloc(type, elem_size * len); + if (init_data) memcpy(ptr, init_data, elem_size * len); + return ptr; } -static void unload_terrain_shader(TerrainShader *ts) { - if (ts && ts->shader.id != 0) { - UnloadShader(ts->shader); - ts->shader.id = 0; - } +// Helper for allocating structs +static void* suic_alloc_struct(const TypeInfo* type, size_t size, void* init_data) { + void* ptr = gc_alloc(type, size); + if (init_data) memcpy(ptr, init_data, size); + return ptr; } -static const uint8_t perm[512] = { - 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, - 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, - 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, - 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, - 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, - 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, - 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, - 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, - 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, - 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, - 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, - 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, - 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, - 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, - 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, - 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, - 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, - 180, 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, - 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, - 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, - 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, - 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, - 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, - 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, - 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, - 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, - 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, - 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, - 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, - 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, - 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, - 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, - 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, - 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, - 156, 180}; -static float grad2(int hash, float x, float y) { - int h = hash & 7; - float u = h < 4 ? x : y; - float v = h < 4 ? y : x; - return ((h & 1) ? -u : u) + ((h & 2) ? -2.0f * v : 2.0f * v); +struct DirectionalLight { + struct Vector3* direction; + struct Vector3* color; + float intensity; + float ambientIntensity; + float shadowBias; + float shadowIntensity; +}; +struct TerrainShader { + int shader; + int locViewPos; + int locLightDir; + int locLightColor; + int locLightIntensity; + int locAmbientIntensity; + int locTerrainColor; +}; +struct MsgType_MSG_HELLO { +}; +struct MsgType_MSG_WELCOME { +}; +struct MsgType_MSG_INPUT { +}; +struct MsgType_MSG_SNAPSHOT { +}; +struct MsgType_MSG_SHOOT { +}; +struct MsgType_MSG_ITEMS { +}; +struct MsgType_MSG_ROOM_STATE { +}; +struct MsgType_union { + struct MsgType_MSG_HELLO msg_hello; + struct MsgType_MSG_WELCOME msg_welcome; + struct MsgType_MSG_INPUT msg_input; + struct MsgType_MSG_SNAPSHOT msg_snapshot; + struct MsgType_MSG_SHOOT msg_shoot; + struct MsgType_MSG_ITEMS msg_items; + struct MsgType_MSG_ROOM_STATE msg_room_state; +}; +struct MsgType { + int discriminant; + struct MsgType_union data; +}; +struct MsgHello { + uint8_t type; + struct u32* protocol; + char* username; +}; +struct MsgWelcome { + uint8_t type; + uint8_t playerId; + struct u32* serverTick; +}; +struct MsgInput { + uint8_t type; + uint8_t playerId; + struct u32* clientTick; + float moveX; + float moveZ; + float yaw; + float pitch; + uint8_t buttons; +}; +struct MsgShoot { + uint8_t type; + uint8_t playerId; + struct u32* clientTick; +}; +struct PlayerStateNet { + uint8_t id; + uint8_t alive; + struct i16* hp; + float x; + float y; + float z; + float yaw; + float pitch; + uint8_t weapon; + struct i16* pistolMag; + struct i16* rifleMag; + struct i16* pistolAmmo; + struct i16* rifleAmmo; + struct i16* medkits; + struct i16* reloadTimeLeft; + char* username; +}; +struct MsgSnapshot { + uint8_t type; + struct u32* serverTick; + uint8_t count; + struct PlayerStateNet** p; +}; +struct ItemNet { + struct u16* id; + uint8_t type; + struct i16* qty; + float x; + float y; + float z; +}; +struct MsgItems { + uint8_t type; + struct u32* serverTick; + uint8_t count; + struct ItemNet** items; +}; +struct MsgRoomState { + uint8_t type; + uint8_t state; + float countdownRemaining; + uint8_t winnerId; + char* winnerName; +}; +struct RemotePlayer { + int present; + int alive; + int hp; + struct Vector3* pos; + struct Vector3* prevPos; + float yaw; + float pitch; + uint8_t weapon; + struct i16* pistolMag; + struct i16* rifleMag; + struct i16* pistolAmmo; + struct i16* rifleAmmo; + struct i16* medkits; + struct i16* reloadTimeLeft; + char* username; +}; +struct WorldItem { + int present; + struct u16* id; + uint8_t type; + struct i16* qty; + struct Vector3* pos; +}; + +static const uint8_t sui_bitmap_DirectionalLight[] = { 1, 1, 0, 0, 0, 0 }; +static const TypeInfo sui_typeinfo_DirectionalLight = { + .field_count = 6, + .pointer_count = 2, + .pointer_bitmap = sui_bitmap_DirectionalLight +}; +static const uint8_t sui_bitmap_TerrainShader[] = { 0, 0, 0, 0, 0, 0, 0 }; +static const TypeInfo sui_typeinfo_TerrainShader = { + .field_count = 7, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_TerrainShader +}; +static const uint8_t sui_bitmap_MsgType_MSG_HELLO[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_HELLO = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_HELLO +}; +static const uint8_t sui_bitmap_MsgType_MSG_WELCOME[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_WELCOME = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_WELCOME +}; +static const uint8_t sui_bitmap_MsgType_MSG_INPUT[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_INPUT = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_INPUT +}; +static const uint8_t sui_bitmap_MsgType_MSG_SNAPSHOT[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_SNAPSHOT = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_SNAPSHOT +}; +static const uint8_t sui_bitmap_MsgType_MSG_SHOOT[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_SHOOT = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_SHOOT +}; +static const uint8_t sui_bitmap_MsgType_MSG_ITEMS[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_ITEMS = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_ITEMS +}; +static const uint8_t sui_bitmap_MsgType_MSG_ROOM_STATE[] = { }; +static const TypeInfo sui_typeinfo_MsgType_MSG_ROOM_STATE = { + .field_count = 0, + .pointer_count = 0, + .pointer_bitmap = sui_bitmap_MsgType_MSG_ROOM_STATE +}; +static const uint8_t sui_bitmap_MsgType_union[] = { 1, 1, 1, 1, 1, 1, 1 }; +static const TypeInfo sui_typeinfo_MsgType_union = { + .field_count = 7, + .pointer_count = 7, + .pointer_bitmap = sui_bitmap_MsgType_union +}; +static const uint8_t sui_bitmap_MsgType[] = { 0, 1 }; +static const TypeInfo sui_typeinfo_MsgType = { + .field_count = 2, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgType +}; +static const uint8_t sui_bitmap_MsgHello[] = { 0, 1, 1 }; +static const TypeInfo sui_typeinfo_MsgHello = { + .field_count = 3, + .pointer_count = 2, + .pointer_bitmap = sui_bitmap_MsgHello +}; +static const uint8_t sui_bitmap_MsgWelcome[] = { 0, 0, 1 }; +static const TypeInfo sui_typeinfo_MsgWelcome = { + .field_count = 3, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgWelcome +}; +static const uint8_t sui_bitmap_MsgInput[] = { 0, 0, 1, 0, 0, 0, 0, 0 }; +static const TypeInfo sui_typeinfo_MsgInput = { + .field_count = 8, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgInput +}; +static const uint8_t sui_bitmap_MsgShoot[] = { 0, 0, 1 }; +static const TypeInfo sui_typeinfo_MsgShoot = { + .field_count = 3, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgShoot +}; +static const uint8_t sui_bitmap_PlayerStateNet[] = { 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 }; +static const TypeInfo sui_typeinfo_PlayerStateNet = { + .field_count = 16, + .pointer_count = 8, + .pointer_bitmap = sui_bitmap_PlayerStateNet +}; +static const uint8_t sui_bitmap_MsgSnapshot[] = { 0, 1, 0, 0 }; +static const TypeInfo sui_typeinfo_MsgSnapshot = { + .field_count = 4, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgSnapshot +}; +static const uint8_t sui_bitmap_ItemNet[] = { 1, 0, 1, 0, 0, 0 }; +static const TypeInfo sui_typeinfo_ItemNet = { + .field_count = 6, + .pointer_count = 2, + .pointer_bitmap = sui_bitmap_ItemNet +}; +static const uint8_t sui_bitmap_MsgItems[] = { 0, 1, 0, 0 }; +static const TypeInfo sui_typeinfo_MsgItems = { + .field_count = 4, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgItems +}; +static const uint8_t sui_bitmap_MsgRoomState[] = { 0, 0, 0, 0, 1 }; +static const TypeInfo sui_typeinfo_MsgRoomState = { + .field_count = 5, + .pointer_count = 1, + .pointer_bitmap = sui_bitmap_MsgRoomState +}; +static const uint8_t sui_bitmap_RemotePlayer[] = { 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1 }; +static const TypeInfo sui_typeinfo_RemotePlayer = { + .field_count = 15, + .pointer_count = 9, + .pointer_bitmap = sui_bitmap_RemotePlayer +}; +static const uint8_t sui_bitmap_WorldItem[] = { 0, 1, 0, 1, 1 }; +static const TypeInfo sui_typeinfo_WorldItem = { + .field_count = 5, + .pointer_count = 3, + .pointer_bitmap = sui_bitmap_WorldItem +}; + +char* item_name(uint8_t t); +struct Color* apply_directional_lighting(struct Color* baseColor, struct Vector3* normal, struct DirectionalLight* light); +int suic_main(void); + + +char* item_name(uint8_t t) { + return ((t == 1) ? suic_alloc_array(NULL, sizeof(char), 7, "Medkit") : ((t == 2) ? suic_alloc_array(NULL, sizeof(char), 12, "Pistol ammo") : ((t == 3) ? suic_alloc_array(NULL, sizeof(char), 11, "Rifle ammo") : suic_alloc_array(NULL, sizeof(char), 2, "-")))); } -static float simplex_noise_2d(float x, float y) { - const float F2 = 0.366025403f; - const float G2 = 0.211324865f; - float s = (x + y) * F2; - int i = (int)floorf(x + s); - int j = (int)floorf(y + s); - float t = (i + j) * G2; - float X0 = i - t, Y0 = j - t; - float x0 = x - X0, y0 = y - Y0; - int i1 = (x0 > y0) ? 1 : 0; - int j1 = (x0 > y0) ? 0 : 1; - float x1 = x0 - i1 + G2, y1 = y0 - j1 + G2; - float x2 = x0 - 1.0f + 2.0f * G2, y2 = y0 - 1.0f + 2.0f * G2; - int ii = i & 255, jj = j & 255; - float n0 = 0.0f, n1 = 0.0f, n2 = 0.0f; - float t0 = 0.5f - x0 * x0 - y0 * y0; - if (t0 >= 0.0f) { - t0 *= t0; - n0 = t0 * t0 * grad2(perm[ii + perm[jj]], x0, y0); - } - float t1 = 0.5f - x1 * x1 - y1 * y1; - if (t1 >= 0.0f) { - t1 *= t1; - n1 = t1 * t1 * grad2(perm[ii + i1 + perm[jj + j1]], x1, y1); - } - float t2 = 0.5f - x2 * x2 - y2 * y2; - if (t2 >= 0.0f) { - t2 *= t2; - n2 = t2 * t2 * grad2(perm[ii + 1 + perm[jj + 1]], x2, y2); - } - return 45.0f * (n0 + n1 + n2); +struct Color* apply_directional_lighting(struct Color* baseColor, struct Vector3* normal, struct DirectionalLight* light) { + struct Vector3* lightDir = (*light).direction; + float diff = fmaxf(0.000000, -((((*lightDir).x * (*normal).x) + ((*lightDir).y * (*normal).y)) + ((*lightDir).z * (*normal).z))); + float brightness = ((*light).ambientIntensity + ((diff * (*light).intensity) * (1.000000 - (*light).ambientIntensity))); + uint8_t r = (uint8_t) ((float) (*baseColor).r * brightness); + uint8_t g = (uint8_t) ((float) (*baseColor).g * brightness); + uint8_t b = (uint8_t) ((float) (*baseColor).b * brightness); + return suic_alloc_struct(&sui_typeinfo_Color, sizeof(struct Color), &(struct Color){ .r = r, .g = g, .b = b, .a = (*baseColor).a }); } -static float fbm_noise(float x, float y, int octaves) { - float value = 0.0f, amplitude = 1.0f, frequency = 1.0f, max_value = 0.0f; - for (int i = 0; i < octaves; i++) { - value += simplex_noise_2d(x * frequency, y * frequency) * amplitude; - max_value += amplitude; - amplitude *= 0.5f; - frequency *= 2.0f; - } - return value / max_value; -} - -float get_terrain_height(float x, float z) { - float height = fbm_noise(x * 0.05f, z * 0.05f, 2); - height += fbm_noise(x * 0.01f, z * 0.01f, 2) * 1.5f; - return height * 4.0f + 2.0f; -} - -#define TERRAIN_SIZE 256 -#define TERRAIN_SCALE 1.0f -#define TERRAIN_MIN (-TERRAIN_SIZE * TERRAIN_SCALE / 2.0f) -#define TERRAIN_MAX (TERRAIN_SIZE * TERRAIN_SCALE / 2.0f) - -static Mesh generate_terrain_mesh(void) { - int size = TERRAIN_SIZE; - Mesh mesh = {0}; - - int vertexCount = size * size; - int triangleCount = (size - 1) * (size - 1) * 2; - - mesh.vertexCount = vertexCount; - mesh.triangleCount = triangleCount; - - mesh.vertices = (float *)MemAlloc(vertexCount * 3 * sizeof(float)); - mesh.texcoords = (float *)MemAlloc(vertexCount * 2 * sizeof(float)); - mesh.normals = (float *)MemAlloc(vertexCount * 3 * sizeof(float)); - mesh.indices = - (unsigned short *)MemAlloc(triangleCount * 3 * sizeof(unsigned short)); - - // Generate vertices - for (int z = 0; z < size; z++) { - for (int x = 0; x < size; x++) { - int idx = z * size + x; - float wx = ((float)x - size / 2.0f) * TERRAIN_SCALE; - float wz = ((float)z - size / 2.0f) * TERRAIN_SCALE; - float wy = get_terrain_height(wx, wz); - - mesh.vertices[idx * 3 + 0] = wx; - mesh.vertices[idx * 3 + 1] = wy; - mesh.vertices[idx * 3 + 2] = wz; - - mesh.texcoords[idx * 2 + 0] = (float)x / (float)(size - 1); - mesh.texcoords[idx * 2 + 1] = (float)z / (float)(size - 1); +int suic_main(void) { + int sw = 1280; + int sh = 720; + suic_init_window(sw, sh, suic_alloc_array(NULL, sizeof(char), 23, "Voxel Shooter - Client")); + suic_set_target_fps(120); + suic_disable_cursor(); + while ((suic_window_should_close() == false)) { + suic_begin_drawing(); + suic_clear_background(135, 206, 235, 255); + suic_draw_text(suic_alloc_array(NULL, sizeof(char), 14, "Hello Suicmez"), 10, 10, 20, 255, 255, 255, 255); + draw_fps(10, 40); + suic_end_drawing(); } - } - - // Generate indices - int triIdx = 0; - for (int z = 0; z < size - 1; z++) { - for (int x = 0; x < size - 1; x++) { - int i0 = z * size + x; - int i1 = z * size + (x + 1); - int i2 = (z + 1) * size + x; - int i3 = (z + 1) * size + (x + 1); - - mesh.indices[triIdx * 3 + 0] = i0; - mesh.indices[triIdx * 3 + 1] = i2; - mesh.indices[triIdx * 3 + 2] = i1; - triIdx++; - - mesh.indices[triIdx * 3 + 0] = i1; - mesh.indices[triIdx * 3 + 1] = i2; - mesh.indices[triIdx * 3 + 2] = i3; - triIdx++; - } - } - - // Calculate normals using tangent plane approximation from terrain gradients - // This preserves terrain curvature better than simple triangle averaging - for (int z = 0; z < size; z++) { - for (int x = 0; x < size; x++) { - int idx = z * size + x; - float wx = ((float)x - size / 2.0f) * TERRAIN_SCALE; - float wz = ((float)z - size / 2.0f) * TERRAIN_SCALE; - - // Sample height gradients to compute terrain normal - // Use neighboring vertices for finite difference approximation - float h_right = (x + 1 < size) - ? mesh.vertices[(z * size + (x + 1)) * 3 + 1] - : mesh.vertices[idx * 3 + 1]; - float h_left = (x - 1 >= 0) ? mesh.vertices[(z * size + (x - 1)) * 3 + 1] - : mesh.vertices[idx * 3 + 1]; - float h_down = (z + 1 < size) - ? mesh.vertices[((z + 1) * size + x) * 3 + 1] - : mesh.vertices[idx * 3 + 1]; - float h_up = (z - 1 >= 0) ? mesh.vertices[((z - 1) * size + x) * 3 + 1] - : mesh.vertices[idx * 3 + 1]; - - // Compute finite differences - float dh_dx = (h_right - h_left) / (2.0f * TERRAIN_SCALE); - float dh_dz = (h_down - h_up) / (2.0f * TERRAIN_SCALE); - - // Normal from height field: (-dh/dx, 1, -dh/dz) then normalized - float nx = -dh_dx; - float ny = 1.0f; - float nz = -dh_dz; - - float len = sqrtf(nx * nx + ny * ny + nz * nz); - if (len > 0.0001f) { - mesh.normals[idx * 3 + 0] = nx / len; - mesh.normals[idx * 3 + 1] = ny / len; - mesh.normals[idx * 3 + 2] = nz / len; - } else { - mesh.normals[idx * 3 + 0] = 0; - mesh.normals[idx * 3 + 1] = 1; - mesh.normals[idx * 3 + 2] = 0; - } - } - } - - UploadMesh(&mesh, false); - return mesh; + suic_close_window(); + return 0; } -// apply_directional_lighting: Basic Lambertian diffuse lighting -// Applies directional light with diffuse component based on surface normal -static Color apply_directional_lighting(Color baseColor, Vector3 normal, - DirectionalLight light) { - // Normalize light direction (it's already normalized, but for safety) - Vector3 lightDir = light.direction; - - // Calculate diffuse component: dot product of negative light direction and - // surface normal We use negative because light travels opposite to its - // direction vector - float diff = fmaxf(0.0f, -(lightDir.x * normal.x + lightDir.y * normal.y + - lightDir.z * normal.z)); - - // Combine diffuse with ambient light - // Ambient provides minimum brightness even in shadow - float brightness = light.ambientIntensity + - (diff * light.intensity * (1.0f - light.ambientIntensity)); - - // Apply brightness multiplier to base color - int r = (int)(baseColor.r * brightness); - int g = (int)(baseColor.g * brightness); - int b = (int)(baseColor.b * brightness); - - // Clamp RGB to valid range [0, 255] - if (r > 255) - r = 255; - if (g > 255) - g = 255; - if (b > 255) - b = 255; - - return (Color){r, g, b, baseColor.a}; +int main(int argc, char* argv[]) { + // Initialize GC + gc_init(); + // init globals + // init event loop + int result = suic_main(); + // Shutdown GC + gc_shutdown(); + return result; } -// calculate_shadow_factor: Distance-based shadow softening -// Objects at higher elevations or farther from ground get softer, less -// pronounced shadows This simulates how shadows fade with distance and -// atmospheric scattering -static float calculate_shadow_factor(Vector3 worldPos, Vector3 lightDir, - float maxShadowDistance) { - // Calculate height above ground (approximate) - float distFromLight = fmaxf(0.0f, worldPos.y - 2.0f); - - // Fade out shadow strength with distance (max 15% darkening) - float shadowIntensity = - fmaxf(0.0f, 1.0f - (distFromLight / maxShadowDistance)); - return 1.0f - (shadowIntensity * 0.15f); -} - -// calculate_temporal_shadow: Time-based shadow variance for anti-aliasing -// Simulates subtle shadow movement to avoid banding artifacts -static float calculate_temporal_shadow(Vector3 worldPos, float timePhase) { - // Add subtle time-based variation to shadow boundaries - float noiseVal = - sinf(worldPos.x * 0.5f + timePhase) * cosf(worldPos.z * 0.5f + timePhase); - return 1.0f + (noiseVal * 0.02f); // Very subtle variation -} - -// apply_lighting_with_shadows: Full lighting calculation with shadows -// Combines directional light, ambient light, shadows, and temporal variation -static Color apply_lighting_with_shadows(Color baseColor, Vector3 normal, - Vector3 worldPos, - DirectionalLight light) { - // Calculate base shadow factor (distance-based) - float shadowFactor = - calculate_shadow_factor(worldPos, light.direction, 10.0f); - - // Apply shadow to intensity - float adjustedIntensity = light.intensity * shadowFactor; - - // Calculate diffuse component with adjusted intensity - Vector3 lightDir = light.direction; - float diff = fmaxf(0.0f, -(lightDir.x * normal.x + lightDir.y * normal.y + - lightDir.z * normal.z)); - - // Combine with ambient using adjusted intensity - float brightness = light.ambientIntensity + (diff * adjustedIntensity * - (1.0f - light.ambientIntensity)); - - // Apply brightness to base color - int r = (int)(baseColor.r * brightness); - int g = (int)(baseColor.g * brightness); - int b = (int)(baseColor.b * brightness); - - // Clamp values to valid RGB range - if (r > 255) - r = 255; - if (g > 255) - g = 255; - if (b > 255) - b = 255; - - return (Color){r, g, b, baseColor.a}; -} - -static Vector3 v3_normalize(Vector3 v) { - float len = sqrtf(v.x * v.x + v.y * v.y + v.z * v.z); - if (len < 0.0001f) - return (Vector3){0, 1, 0}; - return (Vector3){v.x / len, v.y / len, v.z / len}; -} - -static Vector3 v3(float x, float y, float z) { - Vector3 v = {x, y, z}; - return v; -} -static Vector3 v3_add(Vector3 a, Vector3 b) { - return v3(a.x + b.x, a.y + b.y, a.z + b.z); -} -static Vector3 v3_sub(Vector3 a, Vector3 b) { - return v3(a.x - b.x, a.y - b.y, a.z - b.z); -} -static Vector3 v3_mul(Vector3 a, float s) { - return v3(a.x * s, a.y * s, a.z * s); -} -static float v3_dot(Vector3 a, Vector3 b) { - return a.x * b.x + a.y * b.y + a.z * b.z; -} -static float v3_len(Vector3 a) { - return sqrtf(a.x * a.x + a.y * a.y + a.z * a.z); -} -static Vector3 v3_norm(Vector3 a) { - float l = v3_len(a); - if (l <= 1e-6f) - return v3(0, 0, 1); - return v3(a.x / l, a.y / l, a.z / l); -} - -// calculate_ambient_occlusion: Estimates how occluded a point is based on -// terrain curvature Samples heights in cardinal directions and computes horizon -// angle to terrain Returns occlusion factor from 0 (fully occluded) to 1 (fully -// lit) -static float calculate_ambient_occlusion(Vector3 worldPos, Vector3 normal) { - // AO based on terrain curvature: check if terrain rises around the point - float sampleRadius = 3.0f; - float aoAccum = 0.0f; - int numSamples = 8; - - float centerHeight = worldPos.y; - - // Sample 8 directions around the point - for (int i = 0; i < numSamples; i++) { - float angle = (2.0f * 3.14159265f * (float)i) / (float)numSamples; - float sx = worldPos.x + cosf(angle) * sampleRadius; - float sz = worldPos.z + sinf(angle) * sampleRadius; - float sh = get_terrain_height(sx, sz); - - // Check if terrain is higher relative to surface normal - // Higher terrain in shadow-casting areas reduces occlusion - float heightDiff = sh - centerHeight; - if (heightDiff > 0.1f) { - // Terrain is higher, contributes to shadow - float aoAmount = fminf(1.0f, heightDiff / 2.0f); - aoAccum += aoAmount; - } - } - - float aoFactor = - 1.0f - (aoAccum / (float)numSamples) * 0.6f; // 60% max occlusion - return fmaxf(0.2f, aoFactor); // Min 20% brightness -} - -// apply_phong_lighting_per_pixel: Advanced Phong lighting with per-pixel -// normals Includes diffuse, specular highlight, and ambient occlusion for -// geometry detail -static Color apply_phong_lighting_per_pixel(Color baseColor, Vector3 normal, - Vector3 worldPos, Vector3 camPos, - DirectionalLight light) { - // Normalize inputs - Vector3 lightDir = v3_normalize(light.direction); - Vector3 normal_norm = v3_normalize(normal); - - // Compute view direction (from surface to camera) - Vector3 viewDir = v3_normalize(v3_sub(camPos, worldPos)); - - // Diffuse component: Lambertian shading - float diffuse = fmaxf(0.0f, -v3_dot(lightDir, normal_norm)); - - // Specular component: Blinn-Phong specular highlight - Vector3 halfVec = v3_normalize(v3_add( - v3_norm((Vector3){-lightDir.x, -lightDir.y, -lightDir.z}), viewDir)); - float specular = - powf(fmaxf(0.0f, v3_dot(halfVec, normal_norm)), 32.0f) * 0.5f; - - // Ambient occlusion from terrain geometry - float ao = calculate_ambient_occlusion(worldPos, normal_norm); - - // Shadow based on height (distant higher terrain casts softer shadows) - float shadowFactor = - calculate_shadow_factor(worldPos, light.direction, 10.0f); - - // Combine lighting components - float brightness = light.ambientIntensity * ao; - brightness += diffuse * light.intensity * shadowFactor * - (1.0f - light.ambientIntensity) * ao; - brightness += specular * light.intensity * shadowFactor * - 0.6f; // Specular less affected by AO - - brightness = fminf(1.0f, brightness); - - // Apply brightness to base color - int r = (int)(baseColor.r * brightness); - int g = (int)(baseColor.g * brightness); - int b = (int)(baseColor.b * brightness); - - // Clamp to valid RGB range - if (r > 255) - r = 255; - if (g > 255) - g = 255; - if (b > 255) - b = 255; - - return (Color){r, g, b, baseColor.a}; -} - -static void set_nonblocking(int sock) { -#ifdef _WIN32 - u_long mode = 1; - ioctlsocket(sock, FIONBIO, &mode); -#else - int flags = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, flags | O_NONBLOCK); -#endif -} - -#pragma pack(push, 1) -typedef enum MsgType : uint8_t { - MSG_HELLO = 1, - MSG_WELCOME = 2, - MSG_INPUT = 3, - MSG_SNAPSHOT = 4, - MSG_SHOOT = 5, - MSG_ITEMS = 6, - MSG_ROOM_STATE = 7 -} MsgType; - -typedef struct MsgHello { - uint8_t type; - uint32_t protocol; - char username[USERNAME_MAX]; -} MsgHello; - -typedef struct MsgWelcome { - uint8_t type; - uint8_t playerId; - uint32_t serverTick; -} MsgWelcome; - -typedef struct MsgInput { - uint8_t type; - uint8_t playerId; - uint32_t clientTick; - float moveX, moveZ, yaw, pitch; - uint8_t buttons; -} MsgInput; - -typedef struct MsgShoot { - uint8_t type; - uint8_t playerId; - uint32_t clientTick; -} MsgShoot; - -typedef struct PlayerStateNet { - uint8_t id, alive; - int16_t hp; - float x, y, z, yaw, pitch; - uint8_t weapon; - int16_t pistolMag, rifleMag, pistolAmmo, rifleAmmo, medkits; - int16_t reloadTimeLeft; - char username[USERNAME_MAX]; -} PlayerStateNet; - -typedef struct MsgSnapshot { - uint8_t type; - uint32_t serverTick; - uint8_t count; - PlayerStateNet p[MAX_PLAYERS]; -} MsgSnapshot; - -typedef struct ItemNet { - uint16_t id; - uint8_t type; - int16_t qty; - float x, y, z; -} ItemNet; - -typedef struct MsgItems { - uint8_t type; - uint32_t serverTick; - uint8_t count; - ItemNet items[MAX_ITEMS]; -} MsgItems; - -typedef struct MsgRoomState { - uint8_t type; - uint8_t state; - float countdownRemaining; - uint8_t winnerId; - char winnerName[USERNAME_MAX]; -} MsgRoomState; -#pragma pack(pop) - -typedef struct RemotePlayer { - int present, alive, hp; - Vector3 pos; - Vector3 prevPos; - float yaw, pitch; - uint8_t weapon; - int16_t pistolMag, rifleMag, pistolAmmo, rifleAmmo, medkits; - int16_t reloadTimeLeft; - char username[USERNAME_MAX]; -} RemotePlayer; - -typedef struct WorldItem { - int present; - uint16_t id; - uint8_t type; - int16_t qty; - Vector3 pos; -} WorldItem; - -static const char *ItemName(uint8_t t) { - switch (t) { - case ITEM_MEDKIT: - return "Medkit"; - case ITEM_AMMO_PISTOL: - return "Pistol ammo"; - case ITEM_AMMO_RIFLE: - return "Rifle ammo"; - default: - return "-"; - } -} - -static void ui_username_prompt(char outName[USERNAME_MAX]) { - memset(outName, 0, USERNAME_MAX); - while (!WindowShouldClose()) { - int ch = GetCharPressed(); - while (ch > 0) { - int len = (int)strlen(outName); - if (ch >= 32 && ch <= 126) { - if (len < USERNAME_MAX - 1) { - outName[len] = (char)ch; - outName[len + 1] = '\0'; - } - } - ch = GetCharPressed(); - } - if (IsKeyPressed(KEY_BACKSPACE)) { - int len = (int)strlen(outName); - if (len > 0) - outName[len - 1] = '\0'; - } - if (IsKeyPressed(KEY_ENTER) && strlen(outName) > 0) - return; - - BeginDrawing(); - ClearBackground((Color){20, 24, 32, 255}); - DrawText("Enter username (press ENTER):", 60, 80, 28, RAYWHITE); - DrawRectangle(60, 130, 420, 48, (Color){40, 48, 64, 255}); - DrawRectangleLines(60, 130, 420, 48, (Color){120, 140, 170, 255}); - DrawText(outName[0] ? outName : "_", 72, 142, 24, - (Color){230, 230, 240, 255}); - EndDrawing(); - } -} - -int main(void) { -#ifdef _WIN32 - WSADATA wsa; - WSAStartup(MAKEWORD(2, 2), &wsa); -#endif - - const int sw = 1280, sh = 720; - InitWindow(sw, sh, "Voxel Shooter - Client (SMOOTH TERRAIN WITH SHADOWS)"); - SetTargetFPS(120); - - char myName[USERNAME_MAX]; - ui_username_prompt(myName); - - DisableCursor(); - - // Generate terrain mesh - Mesh terrainMesh = generate_terrain_mesh(); - Model terrainModel = LoadModelFromMesh(terrainMesh); - terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = - (Color){80, 140, 70, 255}; - - // Setup directional light - DirectionalLight dirLight = {0}; - dirLight.direction = - v3_normalize(v3(-0.8f, -1.0f, -0.6f)); // Coming from upper-left-back - dirLight.color = v3(1.0f, 1.0f, 1.0f); - dirLight.intensity = 1.2f; - dirLight.ambientIntensity = 0.3f; - dirLight.shadowBias = 0.005f; - dirLight.shadowIntensity = 0.4f; - - // Load terrain shader - TerrainShader terrainShader = load_terrain_shader(); - if (terrainShader.shader.id == 0) { - fprintf( - stderr, - "Warning: Failed to load terrain shader, using default rendering\n"); - // Fallback: Make terrain very bright red to show shader failed - terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = - (Color){255, 100, 100, 255}; - } else { - terrainModel.materials[0].shader = terrainShader.shader; - fprintf(stderr, "Shader loaded successfully!\n"); - } - - int sock = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (sock < 0) { - perror("socket"); - return 1; - } - set_nonblocking(sock); - - struct sockaddr_in srv = {0}; - srv.sin_family = AF_INET; - srv.sin_port = htons(SERVER_PORT); - inet_pton(AF_INET, "127.0.0.1", &srv.sin_addr); - - uint8_t myId = 255; - uint32_t clientTick = 0; - - RemotePlayer rp[MAX_PLAYERS] = {0}; - WorldItem wi[MAX_ITEMS] = {0}; - - // Room state - int roomState = 0; - float countdownRemaining = 0.0f; - char winnerName[USERNAME_MAX] = {0}; - - Vector3 camPos = v3(0, 5.0f, 6); - float yaw = 0.0f, pitch = 0.0f; - - Vector3 prevBodyPos = v3(0, 5.0f, 6); - Vector3 currentTargetBody = v3(0, 5.0f, 6); - float interpTimer = 0.0f; - - float recoilYaw = 0.0f, recoilPitch = 0.0f, crossSpread = 0.0f; - int scoped = 0; - float fireCooldown = 0.0f; - int shotsInBurst = 0; - float burstResetTimer = 0.0f; - - const float pistolFireRate = 4.0f, rifleFireRate = 12.0f; - const float recoilReturn = 18.0f, crossReturn = 14.0f; - const float pistolKickPitch = 0.010f, pistolKickYaw = 0.004f; - const float rifleKickPitch = 0.018f, rifleKickYaw = 0.010f; - const float pistolCrossKick = 2.0f, rifleCrossKick = 4.0f; - const float pistolSprayGrow = 0.4f, rifleSprayGrow = 1.2f; - const float burstResetTime = 0.18f; - - MsgHello hello = {0}; - hello.type = MSG_HELLO; - hello.protocol = PROTOCOL_VERSION; - strncpy(hello.username, myName, USERNAME_MAX - 1); - sendto(sock, (const char *)&hello, (int)sizeof(hello), 0, - (const struct sockaddr *)&srv, sizeof(srv)); - - while (!WindowShouldClose()) { - clientTick++; - float dt = GetFrameTime(); - - fireCooldown -= dt; - if (fireCooldown < 0.0f) - fireCooldown = 0.0f; - burstResetTimer -= dt; - if (burstResetTimer <= 0.0f) - shotsInBurst = 0; - - { - float k = 1.0f - expf(-recoilReturn * dt); - recoilYaw += (0.0f - recoilYaw) * k; - recoilPitch += (0.0f - recoilPitch) * k; - } - { - float k = 1.0f - expf(-crossReturn * dt); - crossSpread += (0.0f - crossSpread) * k; - if (crossSpread < 0.01f) - crossSpread = 0.0f; - } - - for (;;) { - uint8_t buf[1400]; - struct sockaddr_in from = {0}; - socklen_t fromLen = sizeof(from); - int n = (int)recvfrom(sock, (char *)buf, (int)sizeof(buf), 0, - (struct sockaddr *)&from, &fromLen); - if (n <= 0) { -#ifdef _WIN32 - if (WSAGetLastError() == WSAEWOULDBLOCK) - break; -#else - if (errno == EWOULDBLOCK || errno == EAGAIN) - break; -#endif - break; - } - - uint8_t type = buf[0]; - if (type == MSG_WELCOME && n >= (int)sizeof(MsgWelcome)) { - MsgWelcome *w = (MsgWelcome *)buf; - myId = w->playerId; - } else if (type == MSG_SNAPSHOT && n >= (int)sizeof(MsgSnapshot)) { - MsgSnapshot *s = (MsgSnapshot *)buf; - for (int i = 0; i < MAX_PLAYERS; i++) - rp[i].present = 0; - - for (int i = 0; i < (int)s->count && i < MAX_PLAYERS; i++) { - PlayerStateNet *ps = &s->p[i]; - if (ps->id >= MAX_PLAYERS) - continue; - - RemotePlayer *p = &rp[ps->id]; - p->prevPos = p->pos; - p->present = 1; - p->alive = ps->alive; - p->hp = ps->hp; - p->pos = v3(ps->x, ps->y, ps->z); - p->yaw = ps->yaw; - p->pitch = ps->pitch; - p->weapon = ps->weapon; - p->pistolMag = ps->pistolMag; - p->rifleMag = ps->rifleMag; - p->pistolAmmo = ps->pistolAmmo; - p->rifleAmmo = ps->rifleAmmo; - p->medkits = ps->medkits; - p->reloadTimeLeft = ps->reloadTimeLeft; - memset(p->username, 0, USERNAME_MAX); - strncpy(p->username, ps->username, USERNAME_MAX - 1); - } - - if (myId != 255 && rp[myId].present) { - prevBodyPos = currentTargetBody; - currentTargetBody = rp[myId].pos; - interpTimer = 0.0f; - } - } else if (type == MSG_ITEMS && n >= (int)sizeof(MsgItems)) { - MsgItems *m = (MsgItems *)buf; - for (int i = 0; i < MAX_ITEMS; i++) - wi[i].present = 0; - - for (int i = 0; i < (int)m->count && i < MAX_ITEMS; i++) { - wi[i].present = 1; - wi[i].id = m->items[i].id; - wi[i].type = m->items[i].type; - wi[i].qty = m->items[i].qty; - wi[i].pos = v3(m->items[i].x, m->items[i].y, m->items[i].z); - } - } else if (type == MSG_ROOM_STATE && n >= (int)sizeof(MsgRoomState)) { - const MsgRoomState *rs = (const MsgRoomState *)buf; - roomState = rs->state; - countdownRemaining = rs->countdownRemaining; - memset(winnerName, 0, USERNAME_MAX); - if (rs->winnerId < 255) { - strncpy(winnerName, rs->winnerName, USERNAME_MAX - 1); - } - } - } - - // Interpolate camera position - if (myId != 255 && rp[myId].present) { - float interpFactor = interpTimer / (1.0f / 20.0f); - if (interpFactor > 1.0f) - interpFactor = 1.0f; - Vector3 interpBody = v3_add(v3_mul(prevBodyPos, 1.0f - interpFactor), - v3_mul(currentTargetBody, interpFactor)); - camPos.x = interpBody.x; - camPos.y = interpBody.y + 1.0f; - camPos.z = interpBody.z + 0.0001f; - - // Prevent camera from clipping into terrain - float terrain_h = get_terrain_height(camPos.x, camPos.z); - camPos.y = fmaxf(camPos.y, terrain_h + 1.5f); - } - interpTimer += dt; - - Vector2 md = GetMouseDelta(); - const float sens = 0.0025f; - yaw -= md.x * sens; - pitch -= md.y * sens; - if (pitch < -1.5f) - pitch = -1.5f; - if (pitch > 1.5f) - pitch = 1.5f; - - float viewYaw = yaw + recoilYaw; - float viewPitch = pitch + recoilPitch; - if (viewPitch < -1.5f) - viewPitch = -1.5f; - if (viewPitch > 1.5f) - viewPitch = 1.5f; - - float moveX = 0.0f, moveZ = 0.0f; - if (IsKeyDown(KEY_A)) - moveX += 1.0f; - if (IsKeyDown(KEY_D)) - moveX -= 1.0f; - if (IsKeyDown(KEY_W)) - moveZ += 1.0f; - if (IsKeyDown(KEY_S)) - moveZ -= 1.0f; - - uint8_t buttons = 0; - if (IsKeyPressed(KEY_ONE)) - buttons |= BTN_SWITCH_PISTOL; - if (IsKeyPressed(KEY_TWO)) - buttons |= BTN_SWITCH_RIFLE; - if (IsKeyPressed(KEY_R)) - buttons |= BTN_RELOAD; - if (IsKeyPressed(KEY_F)) - buttons |= BTN_PICK; - if (IsKeyPressed(KEY_H)) - buttons |= BTN_USE_MEDKIT; - if (IsKeyPressed(KEY_SPACE)) - buttons |= BTN_JUMP; - if (IsKeyPressed(KEY_Z)) - scoped = !scoped; - - if (myId != 255) { - MsgInput in = {0}; - in.type = MSG_INPUT; - in.playerId = myId; - in.clientTick = clientTick; - in.moveX = moveX; - in.moveZ = moveZ; - in.yaw = viewYaw; - in.pitch = viewPitch; - in.buttons = buttons; - sendto(sock, (const char *)&in, (int)sizeof(in), 0, - (const struct sockaddr *)&srv, sizeof(srv)); - } - - if (myId != 255 && IsMouseButtonDown(MOUSE_BUTTON_LEFT) && - fireCooldown <= 0.0f && rp[myId].present) { - int wpn = rp[myId].weapon; - float rate = (wpn == WEAPON_PISTOL) ? pistolFireRate : rifleFireRate; - fireCooldown = 1.0f / rate; - - shotsInBurst++; - burstResetTimer = burstResetTime; - - if (wpn == WEAPON_PISTOL) { - recoilPitch += pistolKickPitch; - recoilYaw += - (((float)GetRandomValue(-1000, 1000)) / 1000.0f) * pistolKickYaw; - crossSpread += pistolCrossKick + shotsInBurst * pistolSprayGrow; - } else { - recoilPitch += rifleKickPitch; - recoilYaw += - (((float)GetRandomValue(-1000, 1000)) / 1000.0f) * rifleKickYaw; - crossSpread += rifleCrossKick + shotsInBurst * rifleSprayGrow; - } - - MsgShoot shmsg = {0}; - shmsg.type = MSG_SHOOT; - shmsg.playerId = myId; - shmsg.clientTick = clientTick; - sendto(sock, (const char *)&shmsg, (int)sizeof(shmsg), 0, - (const struct sockaddr *)&srv, sizeof(srv)); - } - - Vector3 forward = v3(sinf(viewYaw) * cosf(viewPitch), sinf(viewPitch), - cosf(viewYaw) * cosf(viewPitch)); - - // Offset camera position: 0.3m in front, 0.2m below - camPos = v3_add(camPos, v3_mul(forward, 0.3f)); - camPos.y -= 0.2f; - - // Ensure camera doesn't clip into terrain after offset - float terrain_h = get_terrain_height(camPos.x, camPos.z); - camPos.y = fmaxf(camPos.y, terrain_h + 1.5f); - - Camera3D cam = {0}; - cam.position = camPos; - cam.target = v3_add(camPos, forward); - cam.up = v3(0, 1, 0); - cam.fovy = scoped ? 30.0f : 75.0f; - cam.projection = CAMERA_PERSPECTIVE; - - BeginDrawing(); - ClearBackground((Color){135, 206, 235, 255}); - - BeginMode3D(cam); - - // Set up shader uniforms for terrain rendering - if (terrainShader.shader.id != 0) { - // Convert light direction to shader format (should be pointing TO the - // light) - float lightDirArray[3] = {-dirLight.direction.x, -dirLight.direction.y, - -dirLight.direction.z}; - float lightColorArray[3] = {dirLight.color.x, dirLight.color.y, - dirLight.color.z}; - float viewPosArray[3] = {camPos.x, camPos.y, camPos.z}; - // Terrain color in 0-1 range (80, 140, 70) / 255 - float terrainColorArray[3] = {80.0f / 255.0f, 140.0f / 255.0f, - 70.0f / 255.0f}; - - // Debug mode: 0=normal lighting, 1=show normals as colors, 2=show AO only - - SetShaderValue(terrainShader.shader, terrainShader.locViewPos, - viewPosArray, SHADER_UNIFORM_VEC3); - SetShaderValue(terrainShader.shader, terrainShader.locLightDir, - lightDirArray, SHADER_UNIFORM_VEC3); - SetShaderValue(terrainShader.shader, terrainShader.locLightColor, - lightColorArray, SHADER_UNIFORM_VEC3); - SetShaderValue(terrainShader.shader, terrainShader.locLightIntensity, - &dirLight.intensity, SHADER_UNIFORM_FLOAT); - SetShaderValue(terrainShader.shader, terrainShader.locAmbientIntensity, - &dirLight.ambientIntensity, SHADER_UNIFORM_FLOAT); - SetShaderValue(terrainShader.shader, terrainShader.locTerrainColor, - terrainColorArray, SHADER_UNIFORM_VEC3); - } - - // Draw terrain with shader - terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = - (Color){80, 140, 70, 255}; - DrawModel(terrainModel, (Vector3){0, 0, 0}, 1.0f, WHITE); - - // Draw border - float borderSize = TERRAIN_MAX - TERRAIN_MIN; - DrawCube((Vector3){0, 0, 0}, borderSize, 1000, borderSize, (Color){255, 0, 0, 100}); - - // Items with basic lighting (no shader for now to keep it simple) - for (int i = 0; i < MAX_ITEMS; i++) { - if (!wi[i].present) - continue; - Color ic = (Color){220, 220, 220, 255}; - if (wi[i].type == ITEM_MEDKIT) - ic = (Color){120, 255, 120, 255}; - if (wi[i].type == ITEM_AMMO_PISTOL) - ic = (Color){255, 220, 120, 255}; - if (wi[i].type == ITEM_AMMO_RIFLE) - ic = (Color){255, 180, 120, 255}; - - // Apply basic lighting to items - Vector3 itemNormal = v3(0, 1, 0); - Color litColor = - apply_lighting_with_shadows(ic, itemNormal, wi[i].pos, dirLight); - DrawSphere(wi[i].pos, 0.3f, litColor); - } - - // Players with basic lighting - for (int i = 0; i < MAX_PLAYERS; i++) { - if (!rp[i].present) - continue; - float interpFactor = interpTimer / (1.0f / 20.0f); - if (interpFactor > 1.0f) - interpFactor = 1.0f; - Vector3 p = v3_add(v3_mul(rp[i].prevPos, 1.0f - interpFactor), - v3_mul(rp[i].pos, interpFactor)); - Color c = - (i == myId) ? (Color){80, 180, 255, 255} : (Color){255, 80, 80, 255}; - if (!rp[i].alive) - c = (Color){120, 120, 120, 255}; - - // Apply basic lighting to players - Vector3 playerNormal = v3(0, 1, 0); - Color litPlayerColor = - apply_lighting_with_shadows(c, playerNormal, p, dirLight); - DrawCapsule(v3(p.x, p.y - 0.5f, p.z), v3(p.x, p.y + 0.5f, p.z), 0.35f, 8, - 8, litPlayerColor); - } - - EndMode3D(); - - // Nameplates - for (int i = 0; i < MAX_PLAYERS; i++) { - if (!rp[i].present || !rp[i].username[0]) - continue; - float interpFactor = interpTimer / (1.0f / 20.0f); - if (interpFactor > 1.0f) - interpFactor = 1.0f; - Vector3 p = v3_add(v3_mul(rp[i].prevPos, 1.0f - interpFactor), - v3_mul(rp[i].pos, interpFactor)); - Vector3 head = v3(p.x, p.y + 1.2f, p.z); - Vector3 camForward = v3_norm(v3_sub(cam.target, cam.position)); - Vector3 toHead = v3_sub(head, cam.position); - if (v3_dot(camForward, toHead) <= 0.0f) - continue; - Vector2 s = GetWorldToScreen(head, cam); - if (s.x < -200 || s.x > sw + 200 || s.y < -200 || s.y > sh + 200) - continue; - int fontSize = 18; - int w = MeasureText(rp[i].username, fontSize); - Color tc = (i == myId) ? (Color){180, 230, 255, 255} : RAYWHITE; - DrawText(rp[i].username, (int)(s.x - w / 2), (int)(s.y - fontSize), - fontSize, tc); - } - - // HUD - if (myId == 255 || !rp[myId].present) { - DrawText("Connecting...", 10, 10, 20, RAYWHITE); - } else { - DrawRectangle(10, 10, 280, 110, (Color){0, 0, 0, 120}); - DrawText("HP", 20, 20, 20, RAYWHITE); - int healthBarWidth = (rp[myId].hp * 220) / 100; - Color healthColor = (rp[myId].hp > 60) ? (Color){80, 255, 80, 120} - : (rp[myId].hp > 30) ? (Color){255, 200, 80, 120} - : (Color){255, 80, 80, 120}; - DrawRectangle(20, 45, 220, 20, (Color){40, 40, 40, 255}); - DrawRectangle(20, 45, healthBarWidth, 20, healthColor); - DrawText(TextFormat("%d", rp[myId].hp), 250, 47, 18, RAYWHITE); - DrawText(TextFormat("Medkits: %d (H to use)", rp[myId].medkits), 20, 75, - 18, - (rp[myId].medkits > 0) ? (Color){120, 255, 120, 120} - : (Color){120, 120, 120, 120}); - DrawText("1=Pistol 2=Rifle R=Reload F=Pick SPACE=Jump", 20, 95, 12, - (Color){150, 150, 150, 150}); - - const char *weaponName = - (rp[myId].weapon == WEAPON_PISTOL) ? "PISTOL" : "RIFLE"; - Color weaponColor = (rp[myId].weapon == WEAPON_PISTOL) - ? (Color){100, 200, 255, 255} - : (Color){255, 150, 100, 255}; - int currentMag = (rp[myId].weapon == WEAPON_PISTOL) ? rp[myId].pistolMag - : rp[myId].rifleMag; - int reserveAmmo = (rp[myId].weapon == WEAPON_PISTOL) ? rp[myId].pistolAmmo - : rp[myId].rifleAmmo; - - DrawRectangle(sw - 260, sh - 120, 250, 110, (Color){0, 0, 0, 180}); - DrawText(weaponName, sw - 250, sh - 110, 28, weaponColor); - DrawText(TextFormat("%d", currentMag), sw - 250, sh - 75, 40, RAYWHITE); - DrawText(TextFormat("/ %d", reserveAmmo), sw - 140, sh - 65, 24, - (Color){180, 180, 180, 255}); - if (rp[myId].reloadTimeLeft > 0) - DrawText("RELOADING...", sw - 250, sh - 30, 20, - (Color){255, 200, 80, 255}); - else if (currentMag == 0) - DrawText("RELOAD!", sw - 250, sh - 30, 20, (Color){255, 80, 80, 255}); - } - - DrawFPS(sw - 90, 10); - - // Room state overlay - if (roomState == 0) { // Waiting - DrawRectangle(sw / 2 - 150, sh / 2 - 50, 350, 100, (Color){0, 0, 0, 200}); - DrawText("WAITING FOR PLAYERS", sw / 2 - 120, sh / 2 - 30, 24, RAYWHITE); - DrawText("Need at least 2 players", sw / 2 - 100, sh / 2 - 5, 18, - (Color){200, 200, 200, 255}); - } else if (roomState == 1) { // Counting down - DrawRectangle(sw / 2 - 150, sh / 2 - 50, 350, 100, (Color){0, 0, 0, 200}); - DrawText("GAME STARTING SOON", sw / 2 - 120, sh / 2 - 30, 24, - (Color){255, 255, 80, 255}); - DrawText(TextFormat("%.1f seconds", countdownRemaining), sw / 2 - 60, - sh / 2 - 5, 20, RAYWHITE); - } else if (roomState == 3) { // Finished - DrawRectangle(sw / 2 - 200, sh / 2 - 50, 450, 100, (Color){0, 0, 0, 200}); - DrawText("GAME FINISHED", sw / 2 - 80, sh / 2 - 30, 28, - (Color){255, 80, 80, 255}); - if (winnerName[0]) { - DrawText(TextFormat("Winner: %s", winnerName), sw / 2 - 100, sh / 2 - 5, - 24, (Color){255, 255, 80, 255}); - } else { - DrawText("No winner", sw / 2 - 50, sh / 2 - 5, 24, RAYWHITE); - } - } - - // Crosshair - { - int cx = sw / 2, cy = sh / 2; - int gap = scoped ? 2 : 6 + (int)crossSpread; - int len = scoped ? 5 : 10, thick = 2; - Color col = (Color){240, 240, 245, 220}; - DrawRectangle(cx - gap - len, cy - thick / 2, len, thick, col); - DrawRectangle(cx + gap, cy - thick / 2, len, thick, col); - DrawRectangle(cx - thick / 2, cy - gap - len, thick, len, col); - DrawRectangle(cx - thick / 2, cy + gap, thick, len, col); - DrawCircleLines(cx, cy, scoped ? 1.5f : 3.0f, - (Color){240, 240, 245, 160}); - } - - EndDrawing(); - } - - UnloadModel(terrainModel); - unload_terrain_shader(&terrainShader); - CloseWindow(); - CLOSESOCK(sock); -#ifdef _WIN32 - WSACleanup(); -#endif - return 0; -} diff --git a/game/client.c.bak b/game/client.c.bak new file mode 100644 index 0000000..eb6df46 --- /dev/null +++ b/game/client.c.bak @@ -0,0 +1,1174 @@ +#include "raylib.h" +#include +#include +#include +#include + +#ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#include +#pragma comment(lib, "ws2_32.lib") +typedef int socklen_t; +#define CLOSESOCK closesocket +#else +#include +#include +#include +#include +#include +#define CLOSESOCK close +#endif + +#define PROTOCOL_VERSION 67 +#define SERVER_PORT 27015 +#define MAX_PLAYERS 16 +#define USERNAME_MAX 16 + +#define WEAPON_PISTOL 0 +#define WEAPON_RIFLE 1 + +#define ITEM_NONE 0 +#define ITEM_MEDKIT 1 +#define ITEM_AMMO_PISTOL 2 +#define ITEM_AMMO_RIFLE 3 + +#define MAX_ITEMS 64 + +#define BTN_RELOAD (1u << 0) +#define BTN_SWITCH_PISTOL (1u << 1) +#define BTN_SWITCH_RIFLE (1u << 2) +#define BTN_PICK (1u << 3) +#define BTN_USE_MEDKIT (1u << 4) +#define BTN_JUMP (1u << 5) + +typedef struct { + Vector3 direction; // Normalized light direction + Vector3 color; // RGB color (0-1 range) + float intensity; // Light intensity multiplier + float ambientIntensity; // Ambient light strength + float shadowBias; // Shadow bias to prevent z-fighting + float shadowIntensity; // How dark shadows are (0-1) +} DirectionalLight; + +typedef struct { + Shader shader; + int locViewPos; + int locLightDir; + int locLightColor; + int locLightIntensity; + int locAmbientIntensity; + int locTerrainColor; +} TerrainShader; + +static TerrainShader load_terrain_shader(void) { + TerrainShader ts = {0}; + ts.shader = LoadShader("terrain.vs", "terrain.fs"); + + // Get uniform locations + ts.locViewPos = GetShaderLocation(ts.shader, "viewPos"); + ts.locLightDir = GetShaderLocation(ts.shader, "lightDir"); + ts.locLightColor = GetShaderLocation(ts.shader, "lightColor"); + ts.locLightIntensity = GetShaderLocation(ts.shader, "lightIntensity"); + ts.locAmbientIntensity = GetShaderLocation(ts.shader, "ambientIntensity"); + ts.locTerrainColor = GetShaderLocation(ts.shader, "terrainColor"); + + return ts; +} + +static void unload_terrain_shader(TerrainShader *ts) { + if (ts && ts->shader.id != 0) { + UnloadShader(ts->shader); + ts->shader.id = 0; + } +} + +static const uint8_t perm[512] = { + 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, + 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, + 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, + 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, + 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, + 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, + 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, + 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, + 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, + 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, + 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, + 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, + 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, + 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, + 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, + 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, + 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, + 180, 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, + 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, + 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, + 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, + 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, + 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, + 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, + 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, + 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, + 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, + 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, + 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, + 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, + 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, + 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, + 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, + 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, + 156, 180}; + +static float grad2(int hash, float x, float y) { + int h = hash & 7; + float u = h < 4 ? x : y; + float v = h < 4 ? y : x; + return ((h & 1) ? -u : u) + ((h & 2) ? -2.0f * v : 2.0f * v); +} + +static float simplex_noise_2d(float x, float y) { + const float F2 = 0.366025403f; + const float G2 = 0.211324865f; + float s = (x + y) * F2; + int i = (int)floorf(x + s); + int j = (int)floorf(y + s); + float t = (i + j) * G2; + float X0 = i - t, Y0 = j - t; + float x0 = x - X0, y0 = y - Y0; + int i1 = (x0 > y0) ? 1 : 0; + int j1 = (x0 > y0) ? 0 : 1; + float x1 = x0 - i1 + G2, y1 = y0 - j1 + G2; + float x2 = x0 - 1.0f + 2.0f * G2, y2 = y0 - 1.0f + 2.0f * G2; + int ii = i & 255, jj = j & 255; + float n0 = 0.0f, n1 = 0.0f, n2 = 0.0f; + float t0 = 0.5f - x0 * x0 - y0 * y0; + if (t0 >= 0.0f) { + t0 *= t0; + n0 = t0 * t0 * grad2(perm[ii + perm[jj]], x0, y0); + } + float t1 = 0.5f - x1 * x1 - y1 * y1; + if (t1 >= 0.0f) { + t1 *= t1; + n1 = t1 * t1 * grad2(perm[ii + i1 + perm[jj + j1]], x1, y1); + } + float t2 = 0.5f - x2 * x2 - y2 * y2; + if (t2 >= 0.0f) { + t2 *= t2; + n2 = t2 * t2 * grad2(perm[ii + 1 + perm[jj + 1]], x2, y2); + } + return 45.0f * (n0 + n1 + n2); +} + +static float fbm_noise(float x, float y, int octaves) { + float value = 0.0f, amplitude = 1.0f, frequency = 1.0f, max_value = 0.0f; + for (int i = 0; i < octaves; i++) { + value += simplex_noise_2d(x * frequency, y * frequency) * amplitude; + max_value += amplitude; + amplitude *= 0.5f; + frequency *= 2.0f; + } + return value / max_value; +} + +float get_terrain_height(float x, float z) { + float height = fbm_noise(x * 0.05f, z * 0.05f, 2); + height += fbm_noise(x * 0.01f, z * 0.01f, 2) * 1.5f; + return height * 4.0f + 2.0f; +} + +#define TERRAIN_SIZE 256 +#define TERRAIN_SCALE 1.0f +#define TERRAIN_MIN (-TERRAIN_SIZE * TERRAIN_SCALE / 2.0f) +#define TERRAIN_MAX (TERRAIN_SIZE * TERRAIN_SCALE / 2.0f) + +static Mesh generate_terrain_mesh(void) { + int size = TERRAIN_SIZE; + Mesh mesh = {0}; + + int vertexCount = size * size; + int triangleCount = (size - 1) * (size - 1) * 2; + + mesh.vertexCount = vertexCount; + mesh.triangleCount = triangleCount; + + mesh.vertices = (float *)MemAlloc(vertexCount * 3 * sizeof(float)); + mesh.texcoords = (float *)MemAlloc(vertexCount * 2 * sizeof(float)); + mesh.normals = (float *)MemAlloc(vertexCount * 3 * sizeof(float)); + mesh.indices = + (unsigned short *)MemAlloc(triangleCount * 3 * sizeof(unsigned short)); + + // Generate vertices + for (int z = 0; z < size; z++) { + for (int x = 0; x < size; x++) { + int idx = z * size + x; + float wx = ((float)x - size / 2.0f) * TERRAIN_SCALE; + float wz = ((float)z - size / 2.0f) * TERRAIN_SCALE; + float wy = get_terrain_height(wx, wz); + + mesh.vertices[idx * 3 + 0] = wx; + mesh.vertices[idx * 3 + 1] = wy; + mesh.vertices[idx * 3 + 2] = wz; + + mesh.texcoords[idx * 2 + 0] = (float)x / (float)(size - 1); + mesh.texcoords[idx * 2 + 1] = (float)z / (float)(size - 1); + } + } + + // Generate indices + int triIdx = 0; + for (int z = 0; z < size - 1; z++) { + for (int x = 0; x < size - 1; x++) { + int i0 = z * size + x; + int i1 = z * size + (x + 1); + int i2 = (z + 1) * size + x; + int i3 = (z + 1) * size + (x + 1); + + mesh.indices[triIdx * 3 + 0] = i0; + mesh.indices[triIdx * 3 + 1] = i2; + mesh.indices[triIdx * 3 + 2] = i1; + triIdx++; + + mesh.indices[triIdx * 3 + 0] = i1; + mesh.indices[triIdx * 3 + 1] = i2; + mesh.indices[triIdx * 3 + 2] = i3; + triIdx++; + } + } + + // Calculate normals using tangent plane approximation from terrain gradients + // This preserves terrain curvature better than simple triangle averaging + for (int z = 0; z < size; z++) { + for (int x = 0; x < size; x++) { + int idx = z * size + x; + float wx = ((float)x - size / 2.0f) * TERRAIN_SCALE; + float wz = ((float)z - size / 2.0f) * TERRAIN_SCALE; + + // Sample height gradients to compute terrain normal + // Use neighboring vertices for finite difference approximation + float h_right = (x + 1 < size) + ? mesh.vertices[(z * size + (x + 1)) * 3 + 1] + : mesh.vertices[idx * 3 + 1]; + float h_left = (x - 1 >= 0) ? mesh.vertices[(z * size + (x - 1)) * 3 + 1] + : mesh.vertices[idx * 3 + 1]; + float h_down = (z + 1 < size) + ? mesh.vertices[((z + 1) * size + x) * 3 + 1] + : mesh.vertices[idx * 3 + 1]; + float h_up = (z - 1 >= 0) ? mesh.vertices[((z - 1) * size + x) * 3 + 1] + : mesh.vertices[idx * 3 + 1]; + + // Compute finite differences + float dh_dx = (h_right - h_left) / (2.0f * TERRAIN_SCALE); + float dh_dz = (h_down - h_up) / (2.0f * TERRAIN_SCALE); + + // Normal from height field: (-dh/dx, 1, -dh/dz) then normalized + float nx = -dh_dx; + float ny = 1.0f; + float nz = -dh_dz; + + float len = sqrtf(nx * nx + ny * ny + nz * nz); + if (len > 0.0001f) { + mesh.normals[idx * 3 + 0] = nx / len; + mesh.normals[idx * 3 + 1] = ny / len; + mesh.normals[idx * 3 + 2] = nz / len; + } else { + mesh.normals[idx * 3 + 0] = 0; + mesh.normals[idx * 3 + 1] = 1; + mesh.normals[idx * 3 + 2] = 0; + } + } + } + + UploadMesh(&mesh, false); + return mesh; +} + +// apply_directional_lighting: Basic Lambertian diffuse lighting +// Applies directional light with diffuse component based on surface normal +static Color apply_directional_lighting(Color baseColor, Vector3 normal, + DirectionalLight light) { + // Normalize light direction (it's already normalized, but for safety) + Vector3 lightDir = light.direction; + + // Calculate diffuse component: dot product of negative light direction and + // surface normal We use negative because light travels opposite to its + // direction vector + float diff = fmaxf(0.0f, -(lightDir.x * normal.x + lightDir.y * normal.y + + lightDir.z * normal.z)); + + // Combine diffuse with ambient light + // Ambient provides minimum brightness even in shadow + float brightness = light.ambientIntensity + + (diff * light.intensity * (1.0f - light.ambientIntensity)); + + // Apply brightness multiplier to base color + int r = (int)(baseColor.r * brightness); + int g = (int)(baseColor.g * brightness); + int b = (int)(baseColor.b * brightness); + + // Clamp RGB to valid range [0, 255] + if (r > 255) + r = 255; + if (g > 255) + g = 255; + if (b > 255) + b = 255; + + return (Color){r, g, b, baseColor.a}; +} + +// calculate_shadow_factor: Distance-based shadow softening +// Objects at higher elevations or farther from ground get softer, less +// pronounced shadows This simulates how shadows fade with distance and +// atmospheric scattering +static float calculate_shadow_factor(Vector3 worldPos, Vector3 lightDir, + float maxShadowDistance) { + // Calculate height above ground (approximate) + float distFromLight = fmaxf(0.0f, worldPos.y - 2.0f); + + // Fade out shadow strength with distance (max 15% darkening) + float shadowIntensity = + fmaxf(0.0f, 1.0f - (distFromLight / maxShadowDistance)); + return 1.0f - (shadowIntensity * 0.15f); +} + +// calculate_temporal_shadow: Time-based shadow variance for anti-aliasing +// Simulates subtle shadow movement to avoid banding artifacts +static float calculate_temporal_shadow(Vector3 worldPos, float timePhase) { + // Add subtle time-based variation to shadow boundaries + float noiseVal = + sinf(worldPos.x * 0.5f + timePhase) * cosf(worldPos.z * 0.5f + timePhase); + return 1.0f + (noiseVal * 0.02f); // Very subtle variation +} + +// apply_lighting_with_shadows: Full lighting calculation with shadows +// Combines directional light, ambient light, shadows, and temporal variation +static Color apply_lighting_with_shadows(Color baseColor, Vector3 normal, + Vector3 worldPos, + DirectionalLight light) { + // Calculate base shadow factor (distance-based) + float shadowFactor = + calculate_shadow_factor(worldPos, light.direction, 10.0f); + + // Apply shadow to intensity + float adjustedIntensity = light.intensity * shadowFactor; + + // Calculate diffuse component with adjusted intensity + Vector3 lightDir = light.direction; + float diff = fmaxf(0.0f, -(lightDir.x * normal.x + lightDir.y * normal.y + + lightDir.z * normal.z)); + + // Combine with ambient using adjusted intensity + float brightness = light.ambientIntensity + (diff * adjustedIntensity * + (1.0f - light.ambientIntensity)); + + // Apply brightness to base color + int r = (int)(baseColor.r * brightness); + int g = (int)(baseColor.g * brightness); + int b = (int)(baseColor.b * brightness); + + // Clamp values to valid RGB range + if (r > 255) + r = 255; + if (g > 255) + g = 255; + if (b > 255) + b = 255; + + return (Color){r, g, b, baseColor.a}; +} + +static Vector3 v3_normalize(Vector3 v) { + float len = sqrtf(v.x * v.x + v.y * v.y + v.z * v.z); + if (len < 0.0001f) + return (Vector3){0, 1, 0}; + return (Vector3){v.x / len, v.y / len, v.z / len}; +} + +static Vector3 v3(float x, float y, float z) { + Vector3 v = {x, y, z}; + return v; +} +static Vector3 v3_add(Vector3 a, Vector3 b) { + return v3(a.x + b.x, a.y + b.y, a.z + b.z); +} +static Vector3 v3_sub(Vector3 a, Vector3 b) { + return v3(a.x - b.x, a.y - b.y, a.z - b.z); +} +static Vector3 v3_mul(Vector3 a, float s) { + return v3(a.x * s, a.y * s, a.z * s); +} +static float v3_dot(Vector3 a, Vector3 b) { + return a.x * b.x + a.y * b.y + a.z * b.z; +} +static float v3_len(Vector3 a) { + return sqrtf(a.x * a.x + a.y * a.y + a.z * a.z); +} +static Vector3 v3_norm(Vector3 a) { + float l = v3_len(a); + if (l <= 1e-6f) + return v3(0, 0, 1); + return v3(a.x / l, a.y / l, a.z / l); +} + +// calculate_ambient_occlusion: Estimates how occluded a point is based on +// terrain curvature Samples heights in cardinal directions and computes horizon +// angle to terrain Returns occlusion factor from 0 (fully occluded) to 1 (fully +// lit) +static float calculate_ambient_occlusion(Vector3 worldPos, Vector3 normal) { + // AO based on terrain curvature: check if terrain rises around the point + float sampleRadius = 3.0f; + float aoAccum = 0.0f; + int numSamples = 8; + + float centerHeight = worldPos.y; + + // Sample 8 directions around the point + for (int i = 0; i < numSamples; i++) { + float angle = (2.0f * 3.14159265f * (float)i) / (float)numSamples; + float sx = worldPos.x + cosf(angle) * sampleRadius; + float sz = worldPos.z + sinf(angle) * sampleRadius; + float sh = get_terrain_height(sx, sz); + + // Check if terrain is higher relative to surface normal + // Higher terrain in shadow-casting areas reduces occlusion + float heightDiff = sh - centerHeight; + if (heightDiff > 0.1f) { + // Terrain is higher, contributes to shadow + float aoAmount = fminf(1.0f, heightDiff / 2.0f); + aoAccum += aoAmount; + } + } + + float aoFactor = + 1.0f - (aoAccum / (float)numSamples) * 0.6f; // 60% max occlusion + return fmaxf(0.2f, aoFactor); // Min 20% brightness +} + +// apply_phong_lighting_per_pixel: Advanced Phong lighting with per-pixel +// normals Includes diffuse, specular highlight, and ambient occlusion for +// geometry detail +static Color apply_phong_lighting_per_pixel(Color baseColor, Vector3 normal, + Vector3 worldPos, Vector3 camPos, + DirectionalLight light) { + // Normalize inputs + Vector3 lightDir = v3_normalize(light.direction); + Vector3 normal_norm = v3_normalize(normal); + + // Compute view direction (from surface to camera) + Vector3 viewDir = v3_normalize(v3_sub(camPos, worldPos)); + + // Diffuse component: Lambertian shading + float diffuse = fmaxf(0.0f, -v3_dot(lightDir, normal_norm)); + + // Specular component: Blinn-Phong specular highlight + Vector3 halfVec = v3_normalize(v3_add( + v3_norm((Vector3){-lightDir.x, -lightDir.y, -lightDir.z}), viewDir)); + float specular = + powf(fmaxf(0.0f, v3_dot(halfVec, normal_norm)), 32.0f) * 0.5f; + + // Ambient occlusion from terrain geometry + float ao = calculate_ambient_occlusion(worldPos, normal_norm); + + // Shadow based on height (distant higher terrain casts softer shadows) + float shadowFactor = + calculate_shadow_factor(worldPos, light.direction, 10.0f); + + // Combine lighting components + float brightness = light.ambientIntensity * ao; + brightness += diffuse * light.intensity * shadowFactor * + (1.0f - light.ambientIntensity) * ao; + brightness += specular * light.intensity * shadowFactor * + 0.6f; // Specular less affected by AO + + brightness = fminf(1.0f, brightness); + + // Apply brightness to base color + int r = (int)(baseColor.r * brightness); + int g = (int)(baseColor.g * brightness); + int b = (int)(baseColor.b * brightness); + + // Clamp to valid RGB range + if (r > 255) + r = 255; + if (g > 255) + g = 255; + if (b > 255) + b = 255; + + return (Color){r, g, b, baseColor.a}; +} + +static void set_nonblocking(int sock) { +#ifdef _WIN32 + u_long mode = 1; + ioctlsocket(sock, FIONBIO, &mode); +#else + int flags = fcntl(sock, F_GETFL, 0); + fcntl(sock, F_SETFL, flags | O_NONBLOCK); +#endif +} + +#pragma pack(push, 1) +typedef enum MsgType : uint8_t { + MSG_HELLO = 1, + MSG_WELCOME = 2, + MSG_INPUT = 3, + MSG_SNAPSHOT = 4, + MSG_SHOOT = 5, + MSG_ITEMS = 6, + MSG_ROOM_STATE = 7 +} MsgType; + +typedef struct MsgHello { + uint8_t type; + uint32_t protocol; + char username[USERNAME_MAX]; +} MsgHello; + +typedef struct MsgWelcome { + uint8_t type; + uint8_t playerId; + uint32_t serverTick; +} MsgWelcome; + +typedef struct MsgInput { + uint8_t type; + uint8_t playerId; + uint32_t clientTick; + float moveX, moveZ, yaw, pitch; + uint8_t buttons; +} MsgInput; + +typedef struct MsgShoot { + uint8_t type; + uint8_t playerId; + uint32_t clientTick; +} MsgShoot; + +typedef struct PlayerStateNet { + uint8_t id, alive; + int16_t hp; + float x, y, z, yaw, pitch; + uint8_t weapon; + int16_t pistolMag, rifleMag, pistolAmmo, rifleAmmo, medkits; + int16_t reloadTimeLeft; + char username[USERNAME_MAX]; +} PlayerStateNet; + +typedef struct MsgSnapshot { + uint8_t type; + uint32_t serverTick; + uint8_t count; + PlayerStateNet p[MAX_PLAYERS]; +} MsgSnapshot; + +typedef struct ItemNet { + uint16_t id; + uint8_t type; + int16_t qty; + float x, y, z; +} ItemNet; + +typedef struct MsgItems { + uint8_t type; + uint32_t serverTick; + uint8_t count; + ItemNet items[MAX_ITEMS]; +} MsgItems; + +typedef struct MsgRoomState { + uint8_t type; + uint8_t state; + float countdownRemaining; + uint8_t winnerId; + char winnerName[USERNAME_MAX]; +} MsgRoomState; +#pragma pack(pop) + +typedef struct RemotePlayer { + int present, alive, hp; + Vector3 pos; + Vector3 prevPos; + float yaw, pitch; + uint8_t weapon; + int16_t pistolMag, rifleMag, pistolAmmo, rifleAmmo, medkits; + int16_t reloadTimeLeft; + char username[USERNAME_MAX]; +} RemotePlayer; + +typedef struct WorldItem { + int present; + uint16_t id; + uint8_t type; + int16_t qty; + Vector3 pos; +} WorldItem; + +static const char *ItemName(uint8_t t) { + switch (t) { + case ITEM_MEDKIT: + return "Medkit"; + case ITEM_AMMO_PISTOL: + return "Pistol ammo"; + case ITEM_AMMO_RIFLE: + return "Rifle ammo"; + default: + return "-"; + } +} + +static void ui_username_prompt(char outName[USERNAME_MAX]) { + memset(outName, 0, USERNAME_MAX); + while (!WindowShouldClose()) { + int ch = GetCharPressed(); + while (ch > 0) { + int len = (int)strlen(outName); + if (ch >= 32 && ch <= 126) { + if (len < USERNAME_MAX - 1) { + outName[len] = (char)ch; + outName[len + 1] = '\0'; + } + } + ch = GetCharPressed(); + } + if (IsKeyPressed(KEY_BACKSPACE)) { + int len = (int)strlen(outName); + if (len > 0) + outName[len - 1] = '\0'; + } + if (IsKeyPressed(KEY_ENTER) && strlen(outName) > 0) + return; + + BeginDrawing(); + ClearBackground((Color){20, 24, 32, 255}); + DrawText("Enter username (press ENTER):", 60, 80, 28, RAYWHITE); + DrawRectangle(60, 130, 420, 48, (Color){40, 48, 64, 255}); + DrawRectangleLines(60, 130, 420, 48, (Color){120, 140, 170, 255}); + DrawText(outName[0] ? outName : "_", 72, 142, 24, + (Color){230, 230, 240, 255}); + EndDrawing(); + } +} + +int main(void) { +#ifdef _WIN32 + WSADATA wsa; + WSAStartup(MAKEWORD(2, 2), &wsa); +#endif + + const int sw = 1280, sh = 720; + InitWindow(sw, sh, "Voxel Shooter - Client (SMOOTH TERRAIN WITH SHADOWS)"); + SetTargetFPS(120); + + char myName[USERNAME_MAX]; + ui_username_prompt(myName); + + DisableCursor(); + + // Generate terrain mesh + Mesh terrainMesh = generate_terrain_mesh(); + Model terrainModel = LoadModelFromMesh(terrainMesh); + terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = + (Color){80, 140, 70, 255}; + + // Setup directional light + DirectionalLight dirLight = {0}; + dirLight.direction = + v3_normalize(v3(-0.8f, -1.0f, -0.6f)); // Coming from upper-left-back + dirLight.color = v3(1.0f, 1.0f, 1.0f); + dirLight.intensity = 1.2f; + dirLight.ambientIntensity = 0.3f; + dirLight.shadowBias = 0.005f; + dirLight.shadowIntensity = 0.4f; + + // Load terrain shader + TerrainShader terrainShader = load_terrain_shader(); + if (terrainShader.shader.id == 0) { + fprintf( + stderr, + "Warning: Failed to load terrain shader, using default rendering\n"); + // Fallback: Make terrain very bright red to show shader failed + terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = + (Color){255, 100, 100, 255}; + } else { + terrainModel.materials[0].shader = terrainShader.shader; + fprintf(stderr, "Shader loaded successfully!\n"); + } + + int sock = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock < 0) { + perror("socket"); + return 1; + } + set_nonblocking(sock); + + struct sockaddr_in srv = {0}; + srv.sin_family = AF_INET; + srv.sin_port = htons(SERVER_PORT); + inet_pton(AF_INET, "127.0.0.1", &srv.sin_addr); + + uint8_t myId = 255; + uint32_t clientTick = 0; + + RemotePlayer rp[MAX_PLAYERS] = {0}; + WorldItem wi[MAX_ITEMS] = {0}; + + // Room state + int roomState = 0; + float countdownRemaining = 0.0f; + char winnerName[USERNAME_MAX] = {0}; + + Vector3 camPos = v3(0, 5.0f, 6); + float yaw = 0.0f, pitch = 0.0f; + + Vector3 prevBodyPos = v3(0, 5.0f, 6); + Vector3 currentTargetBody = v3(0, 5.0f, 6); + float interpTimer = 0.0f; + + float recoilYaw = 0.0f, recoilPitch = 0.0f, crossSpread = 0.0f; + int scoped = 0; + float fireCooldown = 0.0f; + int shotsInBurst = 0; + float burstResetTimer = 0.0f; + + const float pistolFireRate = 4.0f, rifleFireRate = 12.0f; + const float recoilReturn = 18.0f, crossReturn = 14.0f; + const float pistolKickPitch = 0.010f, pistolKickYaw = 0.004f; + const float rifleKickPitch = 0.018f, rifleKickYaw = 0.010f; + const float pistolCrossKick = 2.0f, rifleCrossKick = 4.0f; + const float pistolSprayGrow = 0.4f, rifleSprayGrow = 1.2f; + const float burstResetTime = 0.18f; + + MsgHello hello = {0}; + hello.type = MSG_HELLO; + hello.protocol = PROTOCOL_VERSION; + strncpy(hello.username, myName, USERNAME_MAX - 1); + sendto(sock, (const char *)&hello, (int)sizeof(hello), 0, + (const struct sockaddr *)&srv, sizeof(srv)); + + while (!WindowShouldClose()) { + clientTick++; + float dt = GetFrameTime(); + + fireCooldown -= dt; + if (fireCooldown < 0.0f) + fireCooldown = 0.0f; + burstResetTimer -= dt; + if (burstResetTimer <= 0.0f) + shotsInBurst = 0; + + { + float k = 1.0f - expf(-recoilReturn * dt); + recoilYaw += (0.0f - recoilYaw) * k; + recoilPitch += (0.0f - recoilPitch) * k; + } + { + float k = 1.0f - expf(-crossReturn * dt); + crossSpread += (0.0f - crossSpread) * k; + if (crossSpread < 0.01f) + crossSpread = 0.0f; + } + + for (;;) { + uint8_t buf[1400]; + struct sockaddr_in from = {0}; + socklen_t fromLen = sizeof(from); + int n = (int)recvfrom(sock, (char *)buf, (int)sizeof(buf), 0, + (struct sockaddr *)&from, &fromLen); + if (n <= 0) { +#ifdef _WIN32 + if (WSAGetLastError() == WSAEWOULDBLOCK) + break; +#else + if (errno == EWOULDBLOCK || errno == EAGAIN) + break; +#endif + break; + } + + uint8_t type = buf[0]; + if (type == MSG_WELCOME && n >= (int)sizeof(MsgWelcome)) { + MsgWelcome *w = (MsgWelcome *)buf; + myId = w->playerId; + } else if (type == MSG_SNAPSHOT && n >= (int)sizeof(MsgSnapshot)) { + MsgSnapshot *s = (MsgSnapshot *)buf; + for (int i = 0; i < MAX_PLAYERS; i++) + rp[i].present = 0; + + for (int i = 0; i < (int)s->count && i < MAX_PLAYERS; i++) { + PlayerStateNet *ps = &s->p[i]; + if (ps->id >= MAX_PLAYERS) + continue; + + RemotePlayer *p = &rp[ps->id]; + p->prevPos = p->pos; + p->present = 1; + p->alive = ps->alive; + p->hp = ps->hp; + p->pos = v3(ps->x, ps->y, ps->z); + p->yaw = ps->yaw; + p->pitch = ps->pitch; + p->weapon = ps->weapon; + p->pistolMag = ps->pistolMag; + p->rifleMag = ps->rifleMag; + p->pistolAmmo = ps->pistolAmmo; + p->rifleAmmo = ps->rifleAmmo; + p->medkits = ps->medkits; + p->reloadTimeLeft = ps->reloadTimeLeft; + memset(p->username, 0, USERNAME_MAX); + strncpy(p->username, ps->username, USERNAME_MAX - 1); + } + + if (myId != 255 && rp[myId].present) { + prevBodyPos = currentTargetBody; + currentTargetBody = rp[myId].pos; + interpTimer = 0.0f; + } + } else if (type == MSG_ITEMS && n >= (int)sizeof(MsgItems)) { + MsgItems *m = (MsgItems *)buf; + for (int i = 0; i < MAX_ITEMS; i++) + wi[i].present = 0; + + for (int i = 0; i < (int)m->count && i < MAX_ITEMS; i++) { + wi[i].present = 1; + wi[i].id = m->items[i].id; + wi[i].type = m->items[i].type; + wi[i].qty = m->items[i].qty; + wi[i].pos = v3(m->items[i].x, m->items[i].y, m->items[i].z); + } + } else if (type == MSG_ROOM_STATE && n >= (int)sizeof(MsgRoomState)) { + const MsgRoomState *rs = (const MsgRoomState *)buf; + roomState = rs->state; + countdownRemaining = rs->countdownRemaining; + memset(winnerName, 0, USERNAME_MAX); + if (rs->winnerId < 255) { + strncpy(winnerName, rs->winnerName, USERNAME_MAX - 1); + } + } + } + + // Interpolate camera position + if (myId != 255 && rp[myId].present) { + float interpFactor = interpTimer / (1.0f / 20.0f); + if (interpFactor > 1.0f) + interpFactor = 1.0f; + Vector3 interpBody = v3_add(v3_mul(prevBodyPos, 1.0f - interpFactor), + v3_mul(currentTargetBody, interpFactor)); + camPos.x = interpBody.x; + camPos.y = interpBody.y + 1.0f; + camPos.z = interpBody.z + 0.0001f; + + // Prevent camera from clipping into terrain + float terrain_h = get_terrain_height(camPos.x, camPos.z); + camPos.y = fmaxf(camPos.y, terrain_h + 1.5f); + } + interpTimer += dt; + + Vector2 md = GetMouseDelta(); + const float sens = 0.0025f; + yaw -= md.x * sens; + pitch -= md.y * sens; + if (pitch < -1.5f) + pitch = -1.5f; + if (pitch > 1.5f) + pitch = 1.5f; + + float viewYaw = yaw + recoilYaw; + float viewPitch = pitch + recoilPitch; + if (viewPitch < -1.5f) + viewPitch = -1.5f; + if (viewPitch > 1.5f) + viewPitch = 1.5f; + + float moveX = 0.0f, moveZ = 0.0f; + if (IsKeyDown(KEY_A)) + moveX += 1.0f; + if (IsKeyDown(KEY_D)) + moveX -= 1.0f; + if (IsKeyDown(KEY_W)) + moveZ += 1.0f; + if (IsKeyDown(KEY_S)) + moveZ -= 1.0f; + + uint8_t buttons = 0; + if (IsKeyPressed(KEY_ONE)) + buttons |= BTN_SWITCH_PISTOL; + if (IsKeyPressed(KEY_TWO)) + buttons |= BTN_SWITCH_RIFLE; + if (IsKeyPressed(KEY_R)) + buttons |= BTN_RELOAD; + if (IsKeyPressed(KEY_F)) + buttons |= BTN_PICK; + if (IsKeyPressed(KEY_H)) + buttons |= BTN_USE_MEDKIT; + if (IsKeyPressed(KEY_SPACE)) + buttons |= BTN_JUMP; + if (IsKeyPressed(KEY_Z)) + scoped = !scoped; + + if (myId != 255) { + MsgInput in = {0}; + in.type = MSG_INPUT; + in.playerId = myId; + in.clientTick = clientTick; + in.moveX = moveX; + in.moveZ = moveZ; + in.yaw = viewYaw; + in.pitch = viewPitch; + in.buttons = buttons; + sendto(sock, (const char *)&in, (int)sizeof(in), 0, + (const struct sockaddr *)&srv, sizeof(srv)); + } + + if (myId != 255 && IsMouseButtonDown(MOUSE_BUTTON_LEFT) && + fireCooldown <= 0.0f && rp[myId].present) { + int wpn = rp[myId].weapon; + float rate = (wpn == WEAPON_PISTOL) ? pistolFireRate : rifleFireRate; + fireCooldown = 1.0f / rate; + + shotsInBurst++; + burstResetTimer = burstResetTime; + + if (wpn == WEAPON_PISTOL) { + recoilPitch += pistolKickPitch; + recoilYaw += + (((float)GetRandomValue(-1000, 1000)) / 1000.0f) * pistolKickYaw; + crossSpread += pistolCrossKick + shotsInBurst * pistolSprayGrow; + } else { + recoilPitch += rifleKickPitch; + recoilYaw += + (((float)GetRandomValue(-1000, 1000)) / 1000.0f) * rifleKickYaw; + crossSpread += rifleCrossKick + shotsInBurst * rifleSprayGrow; + } + + MsgShoot shmsg = {0}; + shmsg.type = MSG_SHOOT; + shmsg.playerId = myId; + shmsg.clientTick = clientTick; + sendto(sock, (const char *)&shmsg, (int)sizeof(shmsg), 0, + (const struct sockaddr *)&srv, sizeof(srv)); + } + + Vector3 forward = v3(sinf(viewYaw) * cosf(viewPitch), sinf(viewPitch), + cosf(viewYaw) * cosf(viewPitch)); + + // Offset camera position: 0.3m in front, 0.2m below + camPos = v3_add(camPos, v3_mul(forward, 0.3f)); + camPos.y -= 0.2f; + + // Ensure camera doesn't clip into terrain after offset + float terrain_h = get_terrain_height(camPos.x, camPos.z); + camPos.y = fmaxf(camPos.y, terrain_h + 1.5f); + + Camera3D cam = {0}; + cam.position = camPos; + cam.target = v3_add(camPos, forward); + cam.up = v3(0, 1, 0); + cam.fovy = scoped ? 30.0f : 75.0f; + cam.projection = CAMERA_PERSPECTIVE; + + BeginDrawing(); + ClearBackground((Color){135, 206, 235, 255}); + + BeginMode3D(cam); + + // Set up shader uniforms for terrain rendering + if (terrainShader.shader.id != 0) { + // Convert light direction to shader format (should be pointing TO the + // light) + float lightDirArray[3] = {-dirLight.direction.x, -dirLight.direction.y, + -dirLight.direction.z}; + float lightColorArray[3] = {dirLight.color.x, dirLight.color.y, + dirLight.color.z}; + float viewPosArray[3] = {camPos.x, camPos.y, camPos.z}; + // Terrain color in 0-1 range (80, 140, 70) / 255 + float terrainColorArray[3] = {80.0f / 255.0f, 140.0f / 255.0f, + 70.0f / 255.0f}; + + // Debug mode: 0=normal lighting, 1=show normals as colors, 2=show AO only + + SetShaderValue(terrainShader.shader, terrainShader.locViewPos, + viewPosArray, SHADER_UNIFORM_VEC3); + SetShaderValue(terrainShader.shader, terrainShader.locLightDir, + lightDirArray, SHADER_UNIFORM_VEC3); + SetShaderValue(terrainShader.shader, terrainShader.locLightColor, + lightColorArray, SHADER_UNIFORM_VEC3); + SetShaderValue(terrainShader.shader, terrainShader.locLightIntensity, + &dirLight.intensity, SHADER_UNIFORM_FLOAT); + SetShaderValue(terrainShader.shader, terrainShader.locAmbientIntensity, + &dirLight.ambientIntensity, SHADER_UNIFORM_FLOAT); + SetShaderValue(terrainShader.shader, terrainShader.locTerrainColor, + terrainColorArray, SHADER_UNIFORM_VEC3); + } + + // Draw terrain with shader + terrainModel.materials[0].maps[MATERIAL_MAP_DIFFUSE].color = + (Color){80, 140, 70, 255}; + DrawModel(terrainModel, (Vector3){0, 0, 0}, 1.0f, WHITE); + + // Draw border + float borderSize = TERRAIN_MAX - TERRAIN_MIN; + DrawCube((Vector3){0, 0, 0}, borderSize, 1000, borderSize, (Color){255, 0, 0, 100}); + + // Items with basic lighting (no shader for now to keep it simple) + for (int i = 0; i < MAX_ITEMS; i++) { + if (!wi[i].present) + continue; + Color ic = (Color){220, 220, 220, 255}; + if (wi[i].type == ITEM_MEDKIT) + ic = (Color){120, 255, 120, 255}; + if (wi[i].type == ITEM_AMMO_PISTOL) + ic = (Color){255, 220, 120, 255}; + if (wi[i].type == ITEM_AMMO_RIFLE) + ic = (Color){255, 180, 120, 255}; + + // Apply basic lighting to items + Vector3 itemNormal = v3(0, 1, 0); + Color litColor = + apply_lighting_with_shadows(ic, itemNormal, wi[i].pos, dirLight); + DrawSphere(wi[i].pos, 0.3f, litColor); + } + + // Players with basic lighting + for (int i = 0; i < MAX_PLAYERS; i++) { + if (!rp[i].present) + continue; + float interpFactor = interpTimer / (1.0f / 20.0f); + if (interpFactor > 1.0f) + interpFactor = 1.0f; + Vector3 p = v3_add(v3_mul(rp[i].prevPos, 1.0f - interpFactor), + v3_mul(rp[i].pos, interpFactor)); + Color c = + (i == myId) ? (Color){80, 180, 255, 255} : (Color){255, 80, 80, 255}; + if (!rp[i].alive) + c = (Color){120, 120, 120, 255}; + + // Apply basic lighting to players + Vector3 playerNormal = v3(0, 1, 0); + Color litPlayerColor = + apply_lighting_with_shadows(c, playerNormal, p, dirLight); + DrawCapsule(v3(p.x, p.y - 0.5f, p.z), v3(p.x, p.y + 0.5f, p.z), 0.35f, 8, + 8, litPlayerColor); + } + + EndMode3D(); + + // Nameplates + for (int i = 0; i < MAX_PLAYERS; i++) { + if (!rp[i].present || !rp[i].username[0]) + continue; + float interpFactor = interpTimer / (1.0f / 20.0f); + if (interpFactor > 1.0f) + interpFactor = 1.0f; + Vector3 p = v3_add(v3_mul(rp[i].prevPos, 1.0f - interpFactor), + v3_mul(rp[i].pos, interpFactor)); + Vector3 head = v3(p.x, p.y + 1.2f, p.z); + Vector3 camForward = v3_norm(v3_sub(cam.target, cam.position)); + Vector3 toHead = v3_sub(head, cam.position); + if (v3_dot(camForward, toHead) <= 0.0f) + continue; + Vector2 s = GetWorldToScreen(head, cam); + if (s.x < -200 || s.x > sw + 200 || s.y < -200 || s.y > sh + 200) + continue; + int fontSize = 18; + int w = MeasureText(rp[i].username, fontSize); + Color tc = (i == myId) ? (Color){180, 230, 255, 255} : RAYWHITE; + DrawText(rp[i].username, (int)(s.x - w / 2), (int)(s.y - fontSize), + fontSize, tc); + } + + // HUD + if (myId == 255 || !rp[myId].present) { + DrawText("Connecting...", 10, 10, 20, RAYWHITE); + } else { + DrawRectangle(10, 10, 280, 110, (Color){0, 0, 0, 120}); + DrawText("HP", 20, 20, 20, RAYWHITE); + int healthBarWidth = (rp[myId].hp * 220) / 100; + Color healthColor = (rp[myId].hp > 60) ? (Color){80, 255, 80, 120} + : (rp[myId].hp > 30) ? (Color){255, 200, 80, 120} + : (Color){255, 80, 80, 120}; + DrawRectangle(20, 45, 220, 20, (Color){40, 40, 40, 255}); + DrawRectangle(20, 45, healthBarWidth, 20, healthColor); + DrawText(TextFormat("%d", rp[myId].hp), 250, 47, 18, RAYWHITE); + DrawText(TextFormat("Medkits: %d (H to use)", rp[myId].medkits), 20, 75, + 18, + (rp[myId].medkits > 0) ? (Color){120, 255, 120, 120} + : (Color){120, 120, 120, 120}); + DrawText("1=Pistol 2=Rifle R=Reload F=Pick SPACE=Jump", 20, 95, 12, + (Color){150, 150, 150, 150}); + + const char *weaponName = + (rp[myId].weapon == WEAPON_PISTOL) ? "PISTOL" : "RIFLE"; + Color weaponColor = (rp[myId].weapon == WEAPON_PISTOL) + ? (Color){100, 200, 255, 255} + : (Color){255, 150, 100, 255}; + int currentMag = (rp[myId].weapon == WEAPON_PISTOL) ? rp[myId].pistolMag + : rp[myId].rifleMag; + int reserveAmmo = (rp[myId].weapon == WEAPON_PISTOL) ? rp[myId].pistolAmmo + : rp[myId].rifleAmmo; + + DrawRectangle(sw - 260, sh - 120, 250, 110, (Color){0, 0, 0, 180}); + DrawText(weaponName, sw - 250, sh - 110, 28, weaponColor); + DrawText(TextFormat("%d", currentMag), sw - 250, sh - 75, 40, RAYWHITE); + DrawText(TextFormat("/ %d", reserveAmmo), sw - 140, sh - 65, 24, + (Color){180, 180, 180, 255}); + if (rp[myId].reloadTimeLeft > 0) + DrawText("RELOADING...", sw - 250, sh - 30, 20, + (Color){255, 200, 80, 255}); + else if (currentMag == 0) + DrawText("RELOAD!", sw - 250, sh - 30, 20, (Color){255, 80, 80, 255}); + } + + DrawFPS(sw - 90, 10); + + // Room state overlay + if (roomState == 0) { // Waiting + DrawRectangle(sw / 2 - 150, sh / 2 - 50, 350, 100, (Color){0, 0, 0, 200}); + DrawText("WAITING FOR PLAYERS", sw / 2 - 120, sh / 2 - 30, 24, RAYWHITE); + DrawText("Need at least 2 players", sw / 2 - 100, sh / 2 - 5, 18, + (Color){200, 200, 200, 255}); + } else if (roomState == 1) { // Counting down + DrawRectangle(sw / 2 - 150, sh / 2 - 50, 350, 100, (Color){0, 0, 0, 200}); + DrawText("GAME STARTING SOON", sw / 2 - 120, sh / 2 - 30, 24, + (Color){255, 255, 80, 255}); + DrawText(TextFormat("%.1f seconds", countdownRemaining), sw / 2 - 60, + sh / 2 - 5, 20, RAYWHITE); + } else if (roomState == 3) { // Finished + DrawRectangle(sw / 2 - 200, sh / 2 - 50, 450, 100, (Color){0, 0, 0, 200}); + DrawText("GAME FINISHED", sw / 2 - 80, sh / 2 - 30, 28, + (Color){255, 80, 80, 255}); + if (winnerName[0]) { + DrawText(TextFormat("Winner: %s", winnerName), sw / 2 - 100, sh / 2 - 5, + 24, (Color){255, 255, 80, 255}); + } else { + DrawText("No winner", sw / 2 - 50, sh / 2 - 5, 24, RAYWHITE); + } + } + + // Crosshair + { + int cx = sw / 2, cy = sh / 2; + int gap = scoped ? 2 : 6 + (int)crossSpread; + int len = scoped ? 5 : 10, thick = 2; + Color col = (Color){240, 240, 245, 220}; + DrawRectangle(cx - gap - len, cy - thick / 2, len, thick, col); + DrawRectangle(cx + gap, cy - thick / 2, len, thick, col); + DrawRectangle(cx - thick / 2, cy - gap - len, thick, len, col); + DrawRectangle(cx - thick / 2, cy + gap, thick, len, col); + DrawCircleLines(cx, cy, scoped ? 1.5f : 3.0f, + (Color){240, 240, 245, 160}); + } + + EndDrawing(); + } + + UnloadModel(terrainModel); + unload_terrain_shader(&terrainShader); + CloseWindow(); + CLOSESOCK(sock); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; +} diff --git a/src/ast.rs b/src/ast.rs index 5d413c2..c0c9bdf 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -67,6 +67,7 @@ pub enum ASTNodeKind { Function(Function), Extern(Extern), Load(Load), + Const(Const), Struct(Struct), Enum(Enum), Impl(Impl), @@ -80,6 +81,13 @@ pub struct Use { pub span: Span, } +#[derive(Debug, Clone)] +pub struct Const { + pub name: String, + pub typ: Option, + pub value: Expr, +} + // ? implies OPTIONAL here // \( implies the presence of (. same for /) @@ -265,6 +273,8 @@ pub enum BinOp { Or, BitwiseAnd, BitwiseOr, + LShift, + RShift, Eq, Neq, Lt, @@ -314,6 +324,7 @@ pub enum TypedASTNodeKind { Function(TypedFunction), Extern(TypedExtern), Load(TypedLoad), + Const(TypedConst), Struct(TypedStruct), Enum(TypedEnum), Impl(TypedImpl), @@ -347,6 +358,13 @@ pub struct TypedLoad { pub span: Span, } +#[derive(Debug, Clone)] +pub struct TypedConst { + pub name: String, + pub typ: Option, + pub value: TypedExpr, +} + #[derive(Debug, Clone)] pub struct TypedStruct { pub name: String, diff --git a/src/c_ir.rs b/src/c_ir.rs index ccbe882..f622f05 100644 --- a/src/c_ir.rs +++ b/src/c_ir.rs @@ -65,6 +65,7 @@ pub struct CVarDecl { pub name: String, pub ty: CType, pub initializer: Option, + pub is_const: bool, } #[derive(Debug, Clone, PartialEq)] @@ -120,6 +121,8 @@ pub enum CBinaryOp { Or, BitwiseAnd, BitwiseOr, + LShift, + RShift, } impl CBinaryOp { @@ -140,6 +143,8 @@ impl CBinaryOp { CBinaryOp::Or => "||", CBinaryOp::BitwiseAnd => "&", CBinaryOp::BitwiseOr => "|", + CBinaryOp::LShift => "<<", + CBinaryOp::RShift => ">>", } } } diff --git a/src/c_lowerer/declaration_transpiler.rs b/src/c_lowerer/declaration_transpiler.rs index 27b6d67..0a987de 100644 --- a/src/c_lowerer/declaration_transpiler.rs +++ b/src/c_lowerer/declaration_transpiler.rs @@ -23,6 +23,7 @@ impl DeclarationTranspiler { name: field.name.clone(), ty: field_type, initializer: None, + is_const: false, }); } @@ -53,6 +54,7 @@ impl DeclarationTranspiler { name: name.clone(), ty: param_type, initializer: None, + is_const: false, }); } @@ -81,6 +83,7 @@ impl DeclarationTranspiler { name: field_name, ty: c_type, initializer: None, + is_const: false, }); } @@ -100,6 +103,7 @@ impl DeclarationTranspiler { name: field_name, ty: CType::Struct(struct_name), initializer: None, + is_const: false, }); } @@ -115,11 +119,13 @@ impl DeclarationTranspiler { name: "discriminant".to_string(), ty: CType::Int, initializer: None, + is_const: false, }, CVarDecl { name: "data".to_string(), ty: CType::Struct(union_name_clone), initializer: None, + is_const: false, }, ]; @@ -160,6 +166,7 @@ impl DeclarationTranspiler { name: format!("field{}", i), ty: field_type, initializer: None, + is_const: false, }); } Ok(CType::UnnamedStruct(c_fields)) diff --git a/src/c_lowerer/statements_transpiler.rs b/src/c_lowerer/statements_transpiler.rs index 41bdf2f..be26df7 100644 --- a/src/c_lowerer/statements_transpiler.rs +++ b/src/c_lowerer/statements_transpiler.rs @@ -30,6 +30,7 @@ impl StatementsTranspiler { name: name.clone(), ty, initializer, + is_const: false, }; (name, decl) @@ -182,6 +183,7 @@ impl StatementsTranspiler { name: name.clone(), ty: c_type, initializer, + is_const: false, }; Ok(CStmt::VarDecl(var_decl)) } @@ -233,6 +235,7 @@ impl StatementsTranspiler { name: var_name.clone(), ty: CType::Int, initializer: Some(start_expr), + is_const: false, }; let cond = CExpr::BinOp( @@ -284,6 +287,7 @@ impl StatementsTranspiler { )), Box::new(CExpr::Var(idx_name.clone())), )), + is_const: false, }); let mut body_stmts = vec![bind]; @@ -333,6 +337,7 @@ impl StatementsTranspiler { Box::new(CExpr::Var(arr_name.clone())), Box::new(CExpr::Var(idx_name.clone())), )), + is_const: false, }); let mut body_stmts = vec![bind]; @@ -468,6 +473,8 @@ impl StatementsTranspiler { BinOp::Or => Ok(CBinaryOp::Or), BinOp::BitwiseAnd => Ok(CBinaryOp::BitwiseAnd), BinOp::BitwiseOr => Ok(CBinaryOp::BitwiseOr), + BinOp::LShift => Ok(CBinaryOp::LShift), + BinOp::RShift => Ok(CBinaryOp::RShift), } } @@ -481,7 +488,7 @@ impl StatementsTranspiler { } } - fn type_to_ctype(&self, ty: &Type) -> Result { + pub fn type_to_ctype(&self, ty: &Type) -> Result { match ty { Type::Int => Ok(CType::Int), Type::U8 => Ok(CType::U8), @@ -509,6 +516,7 @@ impl StatementsTranspiler { name: format!("field{}", i), ty: c_type, initializer: None, + is_const: false, }); } Ok(CType::UnnamedStruct(fields)) @@ -565,6 +573,7 @@ impl StatementsTranspiler { name: format!("field{}", i), ty: field_type, initializer: None, + is_const: false, }); } Ok(CType::UnnamedStruct(c_fields)) diff --git a/src/codegen/transpiler.rs b/src/codegen/transpiler.rs index e830f36..79772fe 100644 --- a/src/codegen/transpiler.rs +++ b/src/codegen/transpiler.rs @@ -90,6 +90,39 @@ impl Transpiler { self.lower_declarations_to_c_ir(node)?; } + // Add builtin structs + if !self.structs.iter().any(|s| s.name == "Color") { + self.structs.push(CStructDecl { + name: "Color".to_string(), + fields: vec![ + CVarDecl { name: "r".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "g".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "b".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "a".to_string(), ty: CType::U8, initializer: None, is_const: false }, + ], + }); + // Generate TypeInfo + let bitmap = Self::generate_pointer_bitmap(&vec![ + CVarDecl { name: "r".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "g".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "b".to_string(), ty: CType::U8, initializer: None, is_const: false }, + CVarDecl { name: "a".to_string(), ty: CType::U8, initializer: None, is_const: false }, + ]); + self.typeinfo_map.insert("Color".to_string(), bitmap); + } + if !self.structs.iter().any(|s| s.name == "Shader") { + self.structs.push(CStructDecl { + name: "Shader".to_string(), + fields: vec![ + CVarDecl { name: "id".to_string(), ty: CType::Int, initializer: None, is_const: false }, + ], + }); + let bitmap = Self::generate_pointer_bitmap(&vec![ + CVarDecl { name: "id".to_string(), ty: CType::Int, initializer: None, is_const: false }, + ]); + self.typeinfo_map.insert("Shader".to_string(), bitmap); + } + self.lower_function_bodies_to_c_ir(nodes)?; // Rename main to suic_main and track that we have a main @@ -238,6 +271,16 @@ impl Transpiler { self.functions.push(func_decl); } } + TypedASTNodeKind::Const(c) => { + let value_code = self.stmt_transpiler.transpile_expr(&c.value)?; + let var_decl = CVarDecl { + name: c.name.clone(), + ty: self.stmt_transpiler.type_to_ctype(&c.value.ty)?, + initializer: Some(value_code), + is_const: true, + }; + self.globals.push(var_decl); + } TypedASTNodeKind::Extern(e) => { // For externs, we might need to add function prototypes // But for now, skip as they're handled differently @@ -408,6 +451,9 @@ impl Transpiler { CType::FixedArray(elem_ty, size) => format!("{} {}[{}]", elem_ty.to_string(), var.name, size), _ => format!("{} {}", var.ty.to_string(), var.name), }; + if var.is_const { + output = format!("const {}", output); + } if let Some(init) = &var.initializer { match (&var.ty, init) { (CType::FixedArray(_, _), CExpr::ArrayLit(elements)) => { @@ -652,13 +698,14 @@ impl Transpiler { "rl_pop_matrix" => "suic_rl_pop_matrix", "rl_translate_f" => "suic_rl_translate_f", "rl_rotate_f" => "suic_rl_rotate_f", - // UI Framework Utils - "draw_text" => "suic_draw_text", - "draw_rectangle" => "suic_draw_rectangle", - "draw_rectangle_lines" => "suic_draw_rectangle_lines", - "measure_text" => "suic_measure_text", - "draw_circle" => "suic_draw_circle", - "draw_line" => "suic_draw_line", + // UI Framework Utils + "draw_text" => "DrawText", + "draw_rectangle" => "DrawRectangle", + "draw_rectangle_lines" => "DrawRectangleLines", + "measure_text" => "MeasureText", + "draw_circle" => "DrawCircle", + "draw_line" => "DrawLine", + "draw_fps" => "DrawFPS", // Player controller functions "player_controller_create" => "suic_player_controller_create", "player_controller_destroy" => "suic_player_controller_destroy", @@ -749,18 +796,7 @@ impl Transpiler { "Vec3" => "suic_vec3".to_string(), _ => format!("struct {}", struct_name), }; - // For built-in simple structs, generate compound literal directly - // For user-defined structs, use heap allocation - match struct_name.as_str() { - "Vec2" | "Vec3" => format!("({}){{ {} }}", c_type_name, field_inits.join(", ")), - _ => format!( - "suic_alloc_struct(&sui_typeinfo_{}, sizeof({}), &({}){{ {} }})", - struct_name, - c_type_name, - c_type_name, - field_inits.join(", ") - ), - } + format!("({}){{ {} }}", c_type_name, field_inits.join(", ")) } CExpr::EnumLit(enum_name, variant_name, args) => { // Find the variant index - for simplicity, assume variants are in order diff --git a/src/import_resolver.rs b/src/import_resolver.rs index 47a63ba..4c3a360 100644 --- a/src/import_resolver.rs +++ b/src/import_resolver.rs @@ -370,14 +370,22 @@ impl ImportResolver { ASTNodeKind::Load(_) => { result.push(node); } - ASTNodeKind::Trait(t) => { - self.symbol_registry.register( - t.name.clone(), - filename.to_string(), - node.span.clone(), - )?; - result.push(node); - } + ASTNodeKind::Trait(t) => { + self.symbol_registry.register( + t.name.clone(), + filename.to_string(), + node.span.clone(), + )?; + result.push(node); + } + ASTNodeKind::Const(c) => { + self.symbol_registry.register( + c.name.clone(), + filename.to_string(), + node.span.clone(), + )?; + result.push(node); + } } } diff --git a/src/lexer/mod.rs b/src/lexer/mod.rs index ddb1916..f9327bc 100644 --- a/src/lexer/mod.rs +++ b/src/lexer/mod.rs @@ -146,6 +146,9 @@ pub enum Token { #[token("trait")] KeywordTrait, + #[token("const")] + KeywordConst, + // #[token("type")] // KeywordType, // @@ -182,6 +185,12 @@ pub enum Token { #[token("**", priority = 3)] Power, + #[token("<<")] + LShift, + + #[token(">>")] + RShift, + #[token("$")] Dollar, diff --git a/src/main.rs b/src/main.rs index fe23aa1..83cd7c1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -244,6 +244,9 @@ fn run_file(filename: &str, debug: bool) -> Result<(), String> { suicmez::ast::TypedASTNodeKind::Function(f) => { format!("Function({})", f.name) } + suicmez::ast::TypedASTNodeKind::Const(c) => { + format!("Const({})", c.name) + } suicmez::ast::TypedASTNodeKind::Struct(s) => { format!("Struct({}) with {} params", s.name, s.parameters.len()) } @@ -297,6 +300,9 @@ fn run_file(filename: &str, debug: bool) -> Result<(), String> { suicmez::ast::TypedASTNodeKind::Function(f) => { format!("Function({})", f.name) } + suicmez::ast::TypedASTNodeKind::Const(c) => { + format!("Const({})", c.name) + } suicmez::ast::TypedASTNodeKind::Struct(s) => { format!("Struct({}) with {} params", s.name, s.parameters.len()) } diff --git a/src/monomorphize.rs b/src/monomorphize.rs index ce0d47c..a360ea1 100644 --- a/src/monomorphize.rs +++ b/src/monomorphize.rs @@ -104,6 +104,9 @@ impl Monomorphizer { for (_idx, node) in nodes.iter().enumerate() { match &node.kind { + TypedASTNodeKind::Const(c) => { + result_nodes.push(node.clone()); + } TypedASTNodeKind::Function(f) => { // Skip generic functions - they'll be added as specialized versions when needed if !f.parameters.is_empty() { @@ -988,6 +991,9 @@ fn check_node_for_typevars(node: &TypedASTNode) -> Result<(), MonomorphizationEr TypedASTNodeKind::Function(f) => { check_function_for_typevars(f)?; } + TypedASTNodeKind::Const(c) => { + // Consts should not have typevars + } TypedASTNodeKind::Struct(s) => { check_struct_for_typevars(s)?; } diff --git a/src/parser.rs b/src/parser.rs index 9d6fc75..79eb17a 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -149,6 +149,16 @@ impl Parser { attributes, }) } + Some(Token::KeywordConst) => { + self.next(); + let const_def = self.parse_const()?; + let end = self.peek_span().unwrap_or(start..start).end; + Ok(ASTNode { + kind: ASTNodeKind::Const(const_def), + span: Span::new(&(start..end), self.file.clone()), + attributes, + }) + } Some(Token::KeywordStruct) => { self.next(); let struct_def = self.parse_struct()?; @@ -211,12 +221,33 @@ impl Parser { } Some(token) => { let span = self.peek_span().unwrap_or(start..start); - self.error(format!("Unexpected token at top level: {:?}. Expected declarations like 'fn', 'struct', 'enum', 'impl', 'trait', 'use', 'load', or 'extern'", token), span) + self.error(format!("Unexpected token at top level: {:?}. Expected declarations like 'fn', 'struct', 'enum', 'impl', 'trait', 'const', 'use', 'load', or 'extern'", token), span) } None => self.error("Unexpected end of file at top level. Expected declarations like 'fn', 'struct', 'enum', etc.".to_string(), start..start), } } + fn parse_const(&mut self) -> Result { + let start = self.peek_span().unwrap_or(0..0).start; + let name = match self.next() { + Some((Token::Variable(n), _)) => n, + Some((_, span)) => return self.error("Expected constant name after 'const' keyword. Example: const PI = 3.14".to_string(), span), + None => return self.error("Expected constant name after 'const' keyword. Example: const PI = 3.14".to_string(), start..start), + }; + + let typ = if matches!(self.peek(), Some(Token::Colon)) { + self.next(); + Some(self.parse_type_annot()?) + } else { + None + }; + + self.expect(Token::Assign)?; + let value = self.parse_expr()?; + + Ok(Const { name, typ, value }) + } + fn parse_attribute(&mut self) -> Result { self.expect(Token::At)?; let start = self.peek_span().unwrap_or(0..0).start; @@ -1173,14 +1204,44 @@ impl Parser { Ok(left) } - fn parse_bitwise_and_expr(&mut self) -> Result { + fn parse_shift_expr(&mut self) -> Result { let mut left = self.parse_eq_expr()?; + loop { + let op = if matches!(self.peek(), Some(Token::LShift)) { + Some(BinOp::LShift) + } else if matches!(self.peek(), Some(Token::RShift)) { + Some(BinOp::RShift) + } else { + None + }; + + if let Some(op) = op { + let start = left.span.start; + self.next(); + let right = self.parse_eq_expr()?; + let end = right.span.end; + left = Expr { + kind: ExprKind::BinOp(Box::new(left), op, Box::new(right)), + span: Span::new(&(start..end), self.file.clone()), + attributes: Vec::new(), + }; + } else { + break; + } + } + + Ok(left) + } + + fn parse_bitwise_and_expr(&mut self) -> Result { + let mut left = self.parse_shift_expr()?; + loop { if matches!(self.peek(), Some(Token::BitAnd)) { let start = left.span.start; self.next(); - let right = self.parse_eq_expr()?; + let right = self.parse_shift_expr()?; let end = right.span.end; left = Expr { kind: ExprKind::BinOp(Box::new(left), BinOp::BitwiseAnd, Box::new(right)), diff --git a/src/typechecker.rs b/src/typechecker.rs index 123d0fd..3c22207 100644 --- a/src/typechecker.rs +++ b/src/typechecker.rs @@ -370,6 +370,351 @@ impl TypeChecker { } fn add_builtin_functions(&mut self) { + // Builtin types + self.env.types.insert( + "Vector3".to_string(), + TypeInfo { + kind: TypeInfoKind::Struct(vec![ + ("x".to_string(), TypeAnnot::Var("float".to_string())), + ("y".to_string(), TypeAnnot::Var("float".to_string())), + ("z".to_string(), TypeAnnot::Var("float".to_string())), + ]), + parameters: vec![], + }, + ); + self.env.types.insert( + "Color".to_string(), + TypeInfo { + kind: TypeInfoKind::Struct(vec![ + ("r".to_string(), TypeAnnot::Var("u8".to_string())), + ("g".to_string(), TypeAnnot::Var("u8".to_string())), + ("b".to_string(), TypeAnnot::Var("u8".to_string())), + ("a".to_string(), TypeAnnot::Var("u8".to_string())), + ]), + parameters: vec![], + }, + ); + self.env.types.insert( + "Shader".to_string(), + TypeInfo { + kind: TypeInfoKind::Struct(vec![ + ("id".to_string(), TypeAnnot::Var("int".to_string())), + ]), + parameters: vec![], + }, + ); + self.env.types.insert( + "Vector2".to_string(), + TypeInfo { + kind: TypeInfoKind::Struct(vec![ + ("x".to_string(), TypeAnnot::Var("float".to_string())), + ("y".to_string(), TypeAnnot::Var("float".to_string())), + ]), + parameters: vec![], + }, + ); + self.env.types.insert( + "sockaddr_in".to_string(), + TypeInfo { + kind: TypeInfoKind::Struct(vec![ + ("sin_family".to_string(), TypeAnnot::Var("u16".to_string())), + ("sin_port".to_string(), TypeAnnot::Var("u16".to_string())), + ("sin_addr".to_string(), TypeAnnot::Cons("in_addr".to_string(), vec![])), + ("sin_zero".to_string(), TypeAnnot::FixedArray(Box::new(TypeAnnot::Var("u8".to_string())), 8)), + ]), + parameters: vec![], + }, + ); + + // Builtin functions + // Raylib + self.env.functions.insert( + "init_window".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Int, Type::String], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "close_window".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "window_should_close".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Bool, + }, + ); + self.env.functions.insert( + "set_target_fps".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "disable_cursor".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "get_char_pressed".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "is_key_pressed".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Bool, + }, + ); + self.env.functions.insert( + "is_key_down".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Bool, + }, + ); + self.env.functions.insert( + "get_mouse_delta".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Struct("Vector2".to_string(), vec![]), + }, + ); + self.env.functions.insert( + "is_mouse_button_down".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Bool, + }, + ); + self.env.functions.insert( + "get_random_value".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "get_frame_time".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "begin_drawing".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "end_drawing".to_string(), + FunctionType { + type_params: vec![], + params: vec![], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "clear_background".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Int, Type::Int, Type::Int], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "draw_text".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::String, Type::Int, Type::Int, Type::Int, Type::Int, Type::Int, Type::Int, Type::Int], + return_type: Type::Unit, + }, + ); + self.env.functions.insert( + "draw_fps".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Int], + return_type: Type::Unit, + }, + ); + + // Math functions + self.env.functions.insert( + "sinf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "cosf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "sqrtf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "fmaxf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float, Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "floorf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "powf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float, Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "expf".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float], + return_type: Type::Float, + }, + ); + + // Noise functions + self.env.functions.insert( + "grad2".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Float, Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "simplex_noise_2d".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float, Type::Float], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "fbm_noise".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float, Type::Float, Type::Int], + return_type: Type::Float, + }, + ); + self.env.functions.insert( + "get_terrain_height".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Float, Type::Float], + return_type: Type::Float, + }, + ); + + // Socket functions + self.env.functions.insert( + "socket".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Int, Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "sendto".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Ptr(Box::new(Type::U8)), Type::Int, Type::Int, Type::Ptr(Box::new(Type::Unit)), Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "recvfrom".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::Ptr(Box::new(Type::U8)), Type::Int, Type::Int, Type::Ptr(Box::new(Type::Unit)), Type::Ptr(Box::new(Type::Int))], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "close".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "htonl".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "htons".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int], + return_type: Type::Int, + }, + ); + self.env.functions.insert( + "inet_pton".to_string(), + FunctionType { + type_params: vec![], + params: vec![Type::Int, Type::String, Type::Ptr(Box::new(Type::Unit))], + return_type: Type::Int, + }, + ); + // ODE Physics Engine functions self.env.functions.insert( "ode_init".to_string(), @@ -1564,6 +1909,19 @@ impl TypeChecker { fn typecheck_node(&mut self, node: &ASTNode) -> Result { let ty = match &node.kind { + ASTNodeKind::Const(c) => { + let typed_value = self.typecheck_expr(&c.value)?; + return Ok(TypedASTNode { + kind: TypedASTNodeKind::Const(TypedConst { + name: c.name.clone(), + typ: c.typ.clone(), + value: typed_value.clone(), + }), + span: node.span.clone(), + attributes: node.attributes.clone(), + ty: typed_value.ty, + }); + } ASTNodeKind::Function(f) => { let typed_func = self.typecheck_function(f)?; let ty = typed_func.ty.clone(); @@ -1862,7 +2220,7 @@ impl TypeChecker { let typed_right = self.typecheck_expr(right)?; let result_type = match op { - BinOp::Add | BinOp::Sub | BinOp::Mul | BinOp::Div | BinOp::Mod | BinOp::BitwiseAnd | BinOp::BitwiseOr => { + BinOp::Add | BinOp::Sub | BinOp::Mul | BinOp::Div | BinOp::Mod | BinOp::BitwiseAnd | BinOp::BitwiseOr | BinOp::LShift | BinOp::RShift => { if !self.types_compatible(&typed_left.ty, &typed_right.ty) { return Err(TypeError { kind: TypeErrorKind::TypeMismatch(