From df4ac266583dae4442df9f00902e6ad4b14e91e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Mon, 19 Oct 2026 16:07:01 +0300 Subject: [PATCH] normal map --- components/render/renderConstShader.swift | 23 +++++++++ game/ver-mac/Resources/assets/cube_normal.png | Bin 0 -> 19435 bytes game/ver-mac/bridge/raylib_bridge.c | 47 ++++++++++++++++-- 3 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 game/ver-mac/Resources/assets/cube_normal.png diff --git a/components/render/renderConstShader.swift b/components/render/renderConstShader.swift index 97bbb4a..665feb9 100644 --- a/components/render/renderConstShader.swift +++ b/components/render/renderConstShader.swift @@ -7,6 +7,8 @@ in vec2 vTexCoord; in vec4 vLightClip; uniform sampler2D texture0; +uniform sampler2D u_normalMap; +uniform float u_normalStrength; uniform sampler2D u_shadowMap; uniform vec3 u_lightPos; uniform vec3 u_lightColor; @@ -55,12 +57,33 @@ float shadowFactor() return sum / count; } +mat3 cotangentFrame(vec3 N, vec3 p, vec2 uv) +{ + vec3 dp1 = dFdx(p); + vec3 dp2 = dFdy(p); + vec2 duv1 = dFdx(uv); + vec2 duv2 = dFdy(uv); + vec3 dp2perp = cross(dp2, N); + vec3 dp1perp = cross(N, dp1); + vec3 T = dp2perp * duv1.x + dp1perp * duv2.x; + vec3 B = dp2perp * duv1.y + dp1perp * duv2.y; + float invmax = inversesqrt(max(dot(T, T), dot(B, B))); + return mat3(T * invmax, B * invmax, N); +} + void main() { vec4 texel = texture(texture0, vTexCoord); vec3 albedo = texel.rgb * u_albedoColor; vec3 N = normalize(vNormal); + if (u_normalStrength > 0.0) + { + vec3 nm = texture(u_normalMap, vTexCoord).rgb * 2.0 - 1.0; + nm.xy *= u_normalStrength; + N = normalize(cotangentFrame(N, vWorldPos, vTexCoord) * nm); + } + if (u_isGround > 0.5) { vec2 uv = vWorldPos.xz; diff --git a/game/ver-mac/Resources/assets/cube_normal.png b/game/ver-mac/Resources/assets/cube_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..efa061c7bd4aa3c9904bef1631d5f3e8cddb7746 GIT binary patch literal 19435 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 #include #include +#include static int sr_width = 1; static int sr_height = 1; @@ -27,6 +28,7 @@ static int sr_has_model = 0; static Material sr_cube_material = { 0 }; static Material sr_cube_shadow_material = { 0 }; +static Texture2D sr_cube_normal = { 0 }; static Model sr_ground_model = { 0 }; static Material sr_ground_material = { 0 }; @@ -53,6 +55,8 @@ static int loc_albedo_color = -1; static int loc_shadow_map = -1; static int loc_shadow_bias = -1; static int loc_shadow_softness = -1; +static int loc_normal_map = -1; +static int loc_normal_strength = -1; static int loc_light_mvp = -1; static int loc_is_ground = -1; static int loc_grid_color = -1; @@ -100,6 +104,8 @@ static void sr_load_shaders(const char *main_vs, const char *main_fs, loc_shadow_map = GetShaderLocation(sr_main_shader, "u_shadowMap"); loc_shadow_bias = GetShaderLocation(sr_main_shader, "u_shadowBias"); loc_shadow_softness = GetShaderLocation(sr_main_shader, "u_shadowSoftness"); + loc_normal_map = GetShaderLocation(sr_main_shader, "u_normalMap"); + loc_normal_strength = GetShaderLocation(sr_main_shader, "u_normalStrength"); loc_light_mvp = GetShaderLocation(sr_main_shader, "u_lightMVP"); loc_is_ground = GetShaderLocation(sr_main_shader, "u_isGround"); loc_grid_color = GetShaderLocation(sr_main_shader, "u_gridColor"); @@ -156,6 +162,12 @@ void sr_load_model(const char *gltf_path) sr_model = LoadModel(gltf_path); sr_has_model = (sr_model.meshCount > 0); + // The matching normal map sits next to the glTF; load it separately. + char asset_dir[1024]; + const char *slash = strrchr(gltf_path, '/'); + size_t dir_len = (slash != NULL) ? (size_t)(slash - gltf_path + 1) : 0; + snprintf(asset_dir, sizeof(asset_dir), "%.*s", (int)dir_len, gltf_path); + if (sr_has_model) { int cube_mat_index = (sr_model.materialCount > 0) ? sr_model.meshMaterial[0] : 0; @@ -166,6 +178,15 @@ void sr_load_model(const char *gltf_path) SetTextureFilter(base_tex, TEXTURE_FILTER_BILINEAR); SetTextureWrap(base_tex, TEXTURE_WRAP_CLAMP); + char normal_path[1024]; + snprintf(normal_path, sizeof(normal_path), "%scube_normal.png", asset_dir); + if (FileExists(normal_path)) + { + sr_cube_normal = LoadTexture(normal_path); + SetTextureFilter(sr_cube_normal, TEXTURE_FILTER_BILINEAR); + SetTextureWrap(sr_cube_normal, TEXTURE_WRAP_CLAMP); + } + sr_cube_shadow_material = sr_cube_material; sr_cube_shadow_material.shader = sr_shadow_shader; } @@ -242,14 +263,28 @@ static void sr_set_light_mvp(Matrix model) SetShaderValueMatrix(sr_main_shader, loc_light_mvp, light_mvp); } -static void sr_draw_object(Model model, Material material, Matrix model_mat, float is_ground, float emissive) +static void sr_bind_normal(Texture2D tex) +{ + int unit = 2; + SetShaderValue(sr_main_shader, loc_normal_map, &unit, SHADER_UNIFORM_INT); + rlActiveTextureSlot(2); + if (tex.id > 0) rlEnableTexture(tex.id); + rlActiveTextureSlot(0); +} + +static void sr_draw_object(Model model, Material material, Matrix model_mat, + Texture2D normal, float is_ground, float emissive) { sr_set_light_mvp(model_mat); float albedo[3] = { 1.0f, 1.0f, 1.0f }; + float normal_strength = (normal.id > 0) ? 1.0f : 0.0f; SetShaderValue(sr_main_shader, loc_albedo_color, albedo, SHADER_UNIFORM_VEC3); SetShaderValue(sr_main_shader, loc_emissive, &emissive, SHADER_UNIFORM_FLOAT); SetShaderValue(sr_main_shader, loc_is_ground, &is_ground, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_normal_strength, &normal_strength, SHADER_UNIFORM_FLOAT); + + sr_bind_normal(normal); DrawMesh(model.meshes[0], material, model_mat); } @@ -331,12 +366,12 @@ void sr_render(void) rlActiveTextureSlot(0); // --- Ground (procedural grid floor) --- - sr_draw_object(sr_ground_model, sr_ground_material, MatrixTranslate(0.0f, 0.0f, 0.0f), 1.0f, 0.0f); + sr_draw_object(sr_ground_model, sr_ground_material, MatrixTranslate(0.0f, 0.0f, 0.0f), (Texture2D){ 0 }, 1.0f, 0.0f); // --- Cubes --- if (sr_has_model) { - sr_draw_object(sr_model, sr_cube_material, sr_cube_transform(), 0.0f, 0.0f); + sr_draw_object(sr_model, sr_cube_material, sr_cube_transform(), sr_cube_normal, 0.0f, 0.0f); } // Flush while the projection/modelview matrices are still active, otherwise @@ -364,6 +399,12 @@ void sr_shutdown(void) UnloadModel(sr_ground_model); + if (sr_cube_normal.id > 0) + { + UnloadTexture(sr_cube_normal); + sr_cube_normal.id = 0; + } + if (sr_shadow_color > 0) rlUnloadTexture(sr_shadow_color); if (sr_shadow_depth > 0) rlUnloadTexture(sr_shadow_depth); if (sr_shadow_fbo > 0) rlUnloadFramebuffer(sr_shadow_fbo);