misc fixes

rjd_geo: fix ray-box collision bug rjd_array: fix integer conversion warning
rdunnington · Aug 2, 2023 · b5c4d08 · b5c4d08
1 parent 6c0e001
commit b5c4d08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rjd_array.h b/rjd_array.h
@@ -147,7 +147,7 @@ void* rjd_array_alloc_impl(uint32_t capacity, struct rjd_mem_allocator* allocato
 	RJD_ASSERT(sizeof_type > 0);
 
 	if (capacity == 0) {
-		capacity = 128 / sizeof_type;
+		capacity = 128 / (uint32_t)sizeof_type;
 		if (capacity < 4) {
 			capacity = 4;
 		}

diff --git a/rjd_geo.h b/rjd_geo.h
@@ -192,7 +192,7 @@ bool rjd_geo_ray_boxfast(rjd_math_vec3 ray_pos, rjd_math_vec3 ray_inv_dir, rjd_g
 	rjd_math_vec3 max = rjd_math_vec3_max(v0, v1);
 
 	float tmin = rjd_math_vec3_hmax(min);
-	float tmax = rjd_math_vec3_hmax(max);
+	float tmax = rjd_math_vec3_hmin(max);
 
 	bool colliding = (tmax >= 0) && (tmax >= tmin) && (tmin <= *t_out);
 	if (colliding) {