rt: improve sprite blending even moar

fixes most glaring sprite blending issues for ray tracing

ref/vk/shaders/trace_additive.glsl

@@ -15,8 +15,8 @@ vec3 traceAdditive(vec3 pos, vec3 dir, float L) {
 		const MiniGeometry geom = readCandidateMiniGeometry(rq);
 		const uint tex_base_color = getKusok(geom.kusok_index).tex_base_color;
 		const vec4 texture_color = texture(textures[nonuniformEXT(tex_base_color)], geom.uv);
-		const vec3 kusok_emissive = getKusok(geom.kusok_index).emissive;
-		const vec3 color = texture_color.rgb * kusok_emissive * texture_color.a; // * kusok_color.a;
+		const Kusok kusok = getKusok(geom.kusok_index);
+		const vec3 color = texture_color.rgb * kusok.emissive * texture_color.a * kusok.color.a;
 
 		const float hit_t = rayQueryGetIntersectionTEXT(rq, false);
 		const float overshoot = hit_t - L;

ref/vk/vk_brush.c

@@ -707,6 +707,7 @@ qboolean VK_BrushModelLoad( model_t *mod, qboolean map )
 		bmodel->render_model.static_map = map;
 
 		bmodel->num_water_surfaces = sizes.water_surfaces;
+		Vector4Set(bmodel->render_model.color, 1, 1, 1, 1);
 
 		if (sizes.num_surfaces != 0) {
 			bmodel->render_model.geometries = (vk_render_geometry_t*)((char*)(bmodel + 1));

ref/vk/vk_ray_model.c

@@ -196,7 +196,6 @@ static void applyMaterialToKusok(vk_kusok_data_t* kusok, const vk_render_geometr
 
 	if (geom->material == kXVkMaterialEmissive) {
 		VectorCopy(geom->emissive, kusok->emissive);
-		Vector4Set(kusok->color, 0, 0, 0, 0); // Do not accept light from outside
 	} else {
 		RT_GetEmissiveForTexture( kusok->emissive, geom->texture );
 	}
@@ -300,8 +299,7 @@ vk_ray_model_t* VK_RayModelCreate( vk_ray_model_init_t args ) {
 			kusochki[i].tex_base_color &= (~KUSOK_MATERIAL_FLAG_SKYBOX);
 		}
 
-		const vec4_t color = {1, 1, 1, 1};
-		applyMaterialToKusok(kusochki + i, mg, color, false);
+		applyMaterialToKusok(kusochki + i, mg, args.model->color, false);
 		Matrix4x4_LoadIdentity(kusochki[i].prev_transform);
 	}
 
@@ -422,7 +420,7 @@ static void computeConveyorSpeed(const color24 rendercolor, int tex_index, vec2_
 	speed[1] = sy * flRate;
 }
 
-void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render_model, const matrix3x4 *transform_row, const vec4_t color, color24 entcolor) {
+void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render_model, const matrix3x4 *transform_row) {
 	qboolean HACK_reflective = false;
 	vk_ray_draw_model_t* draw_model = g_ray_model_state.frame.models + g_ray_model_state.frame.num_models;
 
@@ -493,8 +491,7 @@ void VK_RayFrameAddModel( vk_ray_model_t *model, const vk_render_model_t *render
 
 		for (int i = 0; i < render_model->num_geometries; ++i) {
 			const vk_render_geometry_t *geom = render_model->geometries + i;
-			applyMaterialToKusok(kusochki + i, geom, color, HACK_reflective);
-
+			applyMaterialToKusok(kusochki + i, geom, render_model->color, HACK_reflective);
 			Matrix4x4_Copy((kusochki + i)->prev_transform, render_model->prev_transform);
 		}
 

ref/vk/vk_render.c

@@ -696,7 +696,7 @@ void VK_RenderModelDraw( const cl_entity_t *ent, vk_render_model_t* model ) {
 			Matrix4x4_Copy( model->prev_transform, g_render_state.model );
 		}
 
-		VK_RayFrameAddModel(model->ray_model, model, (const matrix3x4*)g_render_state.model, g_render_state.dirty_uniform_data.color, ent ? ent->curstate.rendercolor : (color24){255,255,255});
+		VK_RayFrameAddModel(model->ray_model, model, (const matrix3x4*)g_render_state.model);
 
 		return;
 	}

ref/vk/vk_rtx.h

@@ -17,7 +17,7 @@ void VK_RayModelDestroy( struct vk_ray_model_s *model );
 void VK_RayFrameBegin( void );
 
 // TODO how to improve this render vs ray model storage/interaction?
-void VK_RayFrameAddModel( struct vk_ray_model_s *model, const struct vk_render_model_s *render_model, const matrix3x4 *transform_row, const vec4_t color, color24 entcolor );
+void VK_RayFrameAddModel(struct vk_ray_model_s *model, const struct vk_render_model_s *render_model, const matrix3x4 *transform_row);
 
 typedef struct {
 	VkBuffer buffer;