Primitive storage and static model improvements

cmake/compileShaders.cmake

@@ -16,7 +16,6 @@ set(SHADER_SOURCE_DEPENDENCIES
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/precomputed_sky.glsl
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/precomputed_sky_params.h
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/projection.glsl
-    ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/read_visbuf.glsl
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/sky.h
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/tiny_encryption_algorithm.h
     ${CMAKE_SOURCE_DIR}/src/refresh/vkpt/shader/tone_mapping_utils.glsl

inc/common/bsp.h

@@ -326,7 +326,7 @@ void BSP_TransformedLightPoint(lightpoint_t *point, vec3_t start, vec3_t end,
 #endif
 
 byte *BSP_ClusterVis(bsp_t *bsp, byte *mask, int cluster, int vis);
-mleaf_t *BSP_PointLeaf(mnode_t *node, vec3_t p);
+mleaf_t *BSP_PointLeaf(mnode_t *node, const vec3_t p);
 mmodel_t *BSP_InlineModel(bsp_t *bsp, const char *name);
 
 byte* BSP_GetPvs(bsp_t *bsp, int cluster);

inc/common/math.h

@@ -54,7 +54,7 @@ static inline int BoxOnPlaneSideFast(vec3_t emins, vec3_t emaxs, cplane_t *p)
     return BoxOnPlaneSide(emins, emaxs, p);
 }
 
-static inline vec_t PlaneDiffFast(vec3_t v, cplane_t *p)
+static inline vec_t PlaneDiffFast(const vec3_t v, cplane_t *p)
 {
     // fast axial cases
     if (p->type < 3) {

inc/refresh/models.h

@@ -84,7 +84,7 @@ typedef struct
 	float* tangents;
 	byte* colors;
     byte* blend_indices; // byte4 per vertex
-	float* blend_weights; // float4 per vertex
+	byte* blend_weights; // byte4 per vertex
 
 	char* jointNames;
 	int* jointParents;

src/common/bsp.c

@@ -1923,7 +1923,7 @@ byte *BSP_ClusterVis(bsp_t *bsp, byte *mask, int cluster, int vis)
     return mask;
 }
 
-mleaf_t *BSP_PointLeaf(mnode_t *node, vec3_t p)
+mleaf_t *BSP_PointLeaf(mnode_t *node, const vec3_t p)
 {
     float d;
 

src/refresh/model_iqm.c

@@ -481,7 +481,7 @@ qerror_t MOD_LoadIQM_Base(model_t* model, const void* rawdata, size_t length, co
 
 		if (vertexArrayFormat[IQM_BLENDWEIGHTS] != -1)
 		{
-			iqmData->blend_weights = (float*)MOD_Malloc(header->num_vertexes * 4 * sizeof(float));
+			iqmData->blend_weights = MOD_Malloc(header->num_vertexes * 4 * sizeof(byte));
 		}
 	}
 
@@ -574,20 +574,29 @@ qerror_t MOD_LoadIQM_Base(model_t* model, const void* rawdata, size_t length, co
 					n * sizeof(float));
 				break;
 			case IQM_BLENDWEIGHTS:
-				if (vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT)
+				if (vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_UBYTE)
 				{
 					memcpy(iqmData->blend_weights,
 						(const byte*)header + vertexarray->offset,
-						n * sizeof(float));
+						n * sizeof(byte));
 				}
-				else
+				else if(vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT)
 				{
-					// convert blend weights from byte to float
-					for (uint32_t vertex_idx = 0; vertex_idx < 4 * header->num_vertexes; vertex_idx++)
+					const float* weights = (const float*)((const byte*)header + vertexarray->offset);
+
+					// convert blend weights from float to byte
+					for (uint32_t weight_idx = 0; weight_idx < 4 * header->num_vertexes; weight_idx++)
 					{
-						iqmData->blend_weights[vertex_idx] = (float)((const byte*)header + vertexarray->offset)[vertex_idx] / 255.f;
+						float integer_weight = weights[weight_idx] * 255.f;
+						clamp(integer_weight, 0.f, 255.f);
+						iqmData->blend_weights[weight_idx] = (byte)integer_weight;
 					}
 				}
+				else
+				{
+					Com_WPrintf("R_LoadIQM: unsupported format for blend weights (%d)\n", vertexArrayFormat[IQM_BLENDWEIGHTS]);
+					memset(iqmData->blend_weights, 0, n * sizeof(byte));
+				}
 				break;
 			case IQM_COLOR:
 				memcpy(iqmData->colors,