mirror of
https://github.com/Cesarus85/ringfall-mjolnir-vr.git
synced 2026-10-17 16:00:26 +02:00
Batch 5b: reviewed zero-credit storage and provider hygiene
- geometry: drop the NODUP hand copy of plane2d_distance_to_point, so the
header inline is used (selection byte only; removes a latent
collision_bsp<->geometry LNK2005).
- collision_bsp: collision_bsp_usage_times is file-static (cachebeta publics).
- rasterizer_lights P1: HCEX file statics with January's .bss layout (the
load-bearing `= {0}` follows the VC7 initialised-statics law and precedent);
lands atomically with its 6 symbols.json rows.
- motion_sensor: .bss symbol layout fix (object_audit 44/2 -> 44/0).
- rasterizer_xbox_models: five D3D wrapper rows static.
All byte- and credit-neutral (gated with batch 5a); objects stay incomplete
on residual functions and held owner items.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jonas VolmanandClaude Opus 5.5 committed
1 parent
466698b85a
commit
cdc8ebd3fe
5 files changed
+20
-28
No files matched your search
+12
-12
@@ -5841,12 +5841,12 @@
|
||||
{ "file_offset": 1412896, "flags": 32, "name": "_rasterizer_sun_glow_copy_source", "static": true },
|
||||
{ "file_offset": 1413792, "flags": 32, "name": "_rasterizer_sun_glow_convolve", "static": true },
|
||||
{ "file_offset": 1415200, "flags": 32, "name": "_rasterizer_sun_glow_draw" },
|
||||
{ "file_offset": 1417552, "flags": 32, "name": "_D3DDevice_SetRenderState" },
|
||||
{ "file_offset": 1417984, "flags": 32, "name": "_D3DDevice_SetTextureStageState" },
|
||||
{ "file_offset": 1417552, "flags": 32, "name": "_D3DDevice_SetRenderState", "static": true },
|
||||
{ "file_offset": 1417984, "flags": 32, "name": "_D3DDevice_SetTextureStageState", "static": true },
|
||||
{ "file_offset": 1418064, "flags": 32, "name": "_set_environment_shader_pixel_shader", "static": true },
|
||||
{ "file_offset": 1419072, "flags": 32, "name": "_IDirect3DDevice8_SetRenderState@12" },
|
||||
{ "file_offset": 1419616, "flags": 32, "name": "_IDirect3DDevice8_SetTextureStageState@16" },
|
||||
{ "file_offset": 1419712, "flags": 32, "name": "_IDirect3DDevice8_SetVertexShaderConstant@16" },
|
||||
{ "file_offset": 1419072, "flags": 32, "name": "_IDirect3DDevice8_SetRenderState@12", "static": true },
|
||||
{ "file_offset": 1419616, "flags": 32, "name": "_IDirect3DDevice8_SetTextureStageState@16", "static": true },
|
||||
{ "file_offset": 1419712, "flags": 32, "name": "_IDirect3DDevice8_SetVertexShaderConstant@16", "static": true },
|
||||
{ "file_offset": 1419728, "flags": 32, "name": "__rasterizer_models_begin" },
|
||||
{ "file_offset": 1419792, "flags": 32, "name": "__rasterizer_model_end" },
|
||||
{ "file_offset": 1419920, "flags": 32, "name": "__rasterizer_models_end" },
|
||||
@@ -6210,7 +6210,7 @@
|
||||
{ "file_offset": 1510144, "flags": 32, "name": "_rasterizer_lights_begin" },
|
||||
{ "file_offset": 1510160, "flags": 32, "name": "_rasterizer_light_submit" },
|
||||
{ "file_offset": 1510496, "flags": 32, "name": "_rasterizer_lights_end" },
|
||||
{ "file_offset": 1510512, "flags": 32, "name": "_lens_flare_evaluate_corona_rotation_function" },
|
||||
{ "file_offset": 1510512, "flags": 32, "name": "_lens_flare_evaluate_corona_rotation_function", "static": true },
|
||||
{ "file_offset": 1511104, "flags": 32, "name": "_rasterizer_lens_flare_submit" },
|
||||
{ "file_offset": 1511760, "flags": 32, "name": "_rasterizer_lens_flare_submit_for_cluster" },
|
||||
{ "file_offset": 1512160, "flags": 32, "name": "_rasterizer_lens_flares_submit_occlusion_tests" },
|
||||
@@ -23114,7 +23114,7 @@
|
||||
{ "file_offset": 4550308, "flags": 0, "name": "_object_globals", "static": true },
|
||||
{ "file_offset": 4550312, "flags": 0, "name": "_debug_objects_position_velocity" },
|
||||
{ "file_offset": 4550316, "flags": 0, "name": "_globals" },
|
||||
{ "file_offset": 4550320, "flags": 0, "name": "_collision_bsp_usage_times" },
|
||||
{ "file_offset": 4550320, "flags": 0, "name": "_collision_bsp_usage_times", "static": true },
|
||||
{ "file_offset": 4550336, "flags": 0, "name": "_collision_debug_spray_normals", "static": true },
|
||||
{ "file_offset": 4564736, "flags": 0, "name": "_collision_debug_spray_points", "static": true },
|
||||
{ "file_offset": 4579136, "flags": 0, "name": "_collision_debug_spray_hit_flags", "static": true },
|
||||
@@ -23224,11 +23224,11 @@
|
||||
{ "file_offset": 4615028, "flags": 0, "name": "_profile_accumulation_index", "static": true },
|
||||
{ "file_offset": 4615032, "flags": 0, "name": "_profile_accumulated_time", "static": true },
|
||||
{ "file_offset": 4615036, "flags": 0, "name": "_profile_accumulated_pushbuffer_size", "static": true },
|
||||
{ "file_offset": 4615040, "flags": 0, "name": "_local_lens_flare_occlusion_test_results2" },
|
||||
{ "file_offset": 4877216, "flags": 0, "name": "_local_lens_flare_occlusion_test_results" },
|
||||
{ "file_offset": 4907680, "flags": 0, "name": "_local_lens_flare_parameters" },
|
||||
{ "file_offset": 4948640, "flags": 0, "name": "_local_lens_flare_count" },
|
||||
{ "file_offset": 4948644, "flags": 0, "name": "_local_lens_flare_error_printed" },
|
||||
{ "file_offset": 4615040, "flags": 0, "name": "_local_lens_flare_occlusion_test_results2", "static": true },
|
||||
{ "file_offset": 4877216, "flags": 0, "name": "_local_lens_flare_occlusion_test_results", "static": true },
|
||||
{ "file_offset": 4907680, "flags": 0, "name": "_local_lens_flare_parameters", "static": true },
|
||||
{ "file_offset": 4948640, "flags": 0, "name": "_local_lens_flare_count", "static": true },
|
||||
{ "file_offset": 4948644, "flags": 0, "name": "?warned@?1??rasterizer_lens_flare_submit@@9@9", "static": true },
|
||||
{ "file_offset": 4948648, "flags": 0, "name": "_global_memory_pool" },
|
||||
{ "file_offset": 4948652, "flags": 0, "name": "_global_memory_index" },
|
||||
{ "file_offset": 4948656, "flags": 0, "name": "_rasterizer_swizzle_z_mask", "static": true },
|
||||
|
||||
@@ -276,8 +276,8 @@ real scale[] =
|
||||
};
|
||||
|
||||
long next_vertex_index= {0};
|
||||
static struct motion_sensor_globals_definition *motion_sensor_globals;
|
||||
static real sweep_theta;
|
||||
static struct motion_sensor_globals_definition *motion_sensor_globals = NULL;
|
||||
static real sweep_theta = 0.f;
|
||||
boolean debug_motion_sensor_draw_all_units= {0};
|
||||
|
||||
extern struct motion_sensor_hud_globals *hud_globals;
|
||||
|
||||
@@ -185,9 +185,7 @@ symbols in this file:
|
||||
|
||||
#include "cseries.h"
|
||||
|
||||
#define plane2d_distance_to_point plane2d_distance_to_point_inline
|
||||
#include "real_math.h"
|
||||
#undef plane2d_distance_to_point
|
||||
|
||||
#include "geometry.h"
|
||||
|
||||
@@ -543,13 +541,6 @@ boolean convex_hull3d_verify(void)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
real plane2d_distance_to_point(
|
||||
real_plane2d const *plane,
|
||||
real_point2d const *point)
|
||||
{
|
||||
return (plane->n.i*point->x + plane->n.j*point->y) - plane->d;
|
||||
}
|
||||
|
||||
real vector_intersect_plane2d(
|
||||
real_point2d const *point,
|
||||
real_vector2d const *vector,
|
||||
|
||||
@@ -302,7 +302,7 @@ void render_debug_collision_edge(
|
||||
|
||||
/* ---------- globals */
|
||||
|
||||
struct collision_bsp_usage_times collision_bsp_usage_times = { 0 };
|
||||
static struct collision_bsp_usage_times collision_bsp_usage_times = { 0 };
|
||||
|
||||
/* ---------- public code */
|
||||
|
||||
|
||||
@@ -381,11 +381,10 @@ static real lens_flare_evaluate_corona_rotation_function(
|
||||
|
||||
/* ---------- globals */
|
||||
|
||||
static struct lens_flare_occlusion_test_results local_lens_flare_occlusion_test_results[MAXIMUM_LIGHTS_PER_MAP];
|
||||
static struct lens_flare_occlusion_test_results local_lens_flare_occlusion_test_results[MAXIMUM_LIGHTS_PER_MAP] = {0};
|
||||
static byte local_lens_flare_occlusion_test_results2[MAXIMUM_LENS_FLARE_MARKERS_PER_STRUCTURE+MAXIMUM_QUEUED_LENS_FLARES][MAXIMUM_WINDOWS];
|
||||
static struct rasterizer_lens_flare_submit_parameters local_lens_flare_parameters[MAXIMUM_LENS_FLARES_PER_FRAME] = {0};
|
||||
static long local_lens_flare_count = 0;
|
||||
static boolean local_lens_flare_error_printed = FALSE;
|
||||
extern struct rasterizer_lights_globals rasterizer_lights;
|
||||
extern struct rasterizer_lights_window_parameters global_window_parameters;
|
||||
extern short global_screenshot_count;
|
||||
@@ -548,6 +547,8 @@ void rasterizer_lights_reset_for_new_map(
|
||||
void rasterizer_lens_flare_submit(
|
||||
struct rasterizer_lens_flare_submit_parameters const *parameters)
|
||||
{
|
||||
static boolean warned = FALSE;
|
||||
|
||||
match_assert(
|
||||
"c:\\halo\\SOURCE\\rasterizer\\rasterizer_lights.c",
|
||||
266,
|
||||
@@ -633,10 +634,10 @@ void rasterizer_lens_flare_submit(
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!local_lens_flare_error_printed)
|
||||
if (!warned)
|
||||
{
|
||||
error(2, "### ERROR too many lens flares submitted to frame");
|
||||
local_lens_flare_error_printed= TRUE;
|
||||
warned= TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user