Graphics natives fixes and improvements for RedM

code/client/shared/CfxRGBA.h

@@ -42,8 +42,19 @@ struct CRGBA
 		return CRGBA((argb & 0xFF0000) >> 16, ((argb & 0xFF00) >> 8), argb & 0xFF, (argb & 0xFF000000) >> 24);
 	}
 
+	inline static CRGBA FromABGR(uint32_t abgr)
+	{
+		return CRGBA(abgr & 0xFF, ((abgr & 0xFF00) >> 8), (abgr & 0xFF0000) >> 16, (abgr & 0xFF000000) >> 24);
+	}
+
+
 	inline uint32_t AsARGB() const
 	{
 		return (alpha << 24) | (red << 16) | (green << 8) | blue;
 	}
-};
+
+	inline uint32_t AsABGR() const
+	{
+		return (alpha << 24) | (blue << 16) | (green << 8) | red;
+	}
+};

code/components/extra-natives-five/include/GamePrimitives.h

@@ -54,7 +54,7 @@ struct alignas(16) Vec3V
 	float pad;
 
 	Vec3V()
-		: x(0), y(0), z(0), pad(0)
+		: x(0), y(0), z(0), pad(NAN)
 	{
 	}
 
@@ -74,8 +74,8 @@ struct alignas(16) Vec4V
 
 struct spdAABB
 {
-	rage::Vec3V mins;
-	rage::Vec3V maxs;
+	Vec3V mins;
+	Vec3V maxs;
 };
 
 struct spdSphere
@@ -88,8 +88,8 @@ struct spdSphere
 // fake name
 struct spdRay
 {
-	rage::Vec3V start;
-	rage::Vec3V end;
+	Vec3V start;
+	Vec3V end;
 };
 
 enum class eSearchVolumeType : int

code/components/extra-natives-rdr3/include/GamePrimitives.h

@@ -0,0 +1,54 @@
+#pragma once
+
+// SSE4 is pretty common
+#define _XM_SSE4_INTRINSICS_
+#include <DirectXMath.h>
+
+namespace rage
+{
+struct alignas(16) Vec3V
+{
+	float x;
+	float y;
+	float z;
+	float pad;
+
+	Vec3V()
+		: x(0), y(0), z(0), pad(NAN)
+	{
+	}
+
+	Vec3V(float x, float y, float z)
+		: x(x), y(y), z(z), pad(NAN)
+	{
+	}
+};
+
+struct alignas(16) Vec4V
+{
+	float x;
+	float y;
+	float z;
+	float w;
+};
+
+struct spdAABB
+{
+	Vec3V mins;
+	Vec3V maxs;
+};
+
+struct spdSphere
+{
+	// xyz = center
+	// w   = radius
+	Vec4V sphere;
+};
+
+// fake name
+struct spdRay
+{
+	Vec3V start;
+	Vec3V end;
+};
+}