Fixed dodgy sprite colors and added more uint color conversions.

modules/mojo3d/render/spritebuffer.monkey2

@@ -100,7 +100,7 @@ Class SpriteBuffer
 
 			Local sprite:=spriteOps[spritei].sprite
 			
-			Local rgba:=(sprite.Color*sprite.Alpha).ToRGBA()
+			Local rgba:=(sprite.Color*sprite.Alpha).ToABGR()
 			
 			Local material:=sprite.Material
 			

modules/std/graphics/color.monkey2

@@ -276,16 +276,40 @@ Struct Color
 		Return New Color( r*idelta+color.r*delta,g*idelta+color.g*delta,b*idelta+color.b*delta,a*idelta+color.a*delta )
 	End
 
-	#rem monkeydoc Converts the color to 32 bit ARGB format.
+	#rem monkeydoc Converts the color to 32 bit big endian ARGB format.
+	
+	Big endian ARGB is the same as little endian BGRA.
+	
 	#end	
 	Method ToARGB:UInt()
 		Return UInt(a*255) Shl 24 | UInt(r*255) Shl 16 | UInt(g*255) Shl 8 | UInt(b*255)
 	End
 
-	#rem monkeydoc Converts the color to 32 bit RGBA format.
+	#rem monkeydoc Converts the color to 32 bit big endian BGRA format.
+
+	Big endian BGRA is the same as little endian ARGB.
+	
+	#end	
+	Method ToBGRA:UInt()
+		Return UInt(b*255) Shl 24 | UInt(g*255) Shl 16 | UInt(r*255) Shl 8 | UInt(a*255)
+	End
+
+	#rem monkeydoc Converts the color to 32 bit big endian RGBA format.
+	
+	Big endian RGBA is the same as little endian ABGR.
+	
 	#end	
 	Method ToRGBA:UInt()
-		Return Int(r*255)Shl 24 | Int(g*255)Shl 16 |Int(b*255)Shl 8|Int(a*255)
+		Return UInt(r*255) Shl 24 | UInt(g*255) Shl 16 | UInt(b*255) Shl 8 | UInt(a*255)
+	End
+
+	#rem monkeydoc Converts the color to 32 bit big endianABGR format.
+	
+	Big endian ABGR is the same as little endian RGBA.
+	
+	#end	
+	Method ToABGR:UInt()
+		Return UInt(a*255) Shl 24 | UInt(b*255) Shl 16 | UInt(g*255) Shl 8 | UInt(r*255)
 	End
 
 	#rem monkeydoc Converts the color to printable string.
@@ -320,7 +344,10 @@ Struct Color
 		Return New Color( r,g,b,a )
 	End
 	
-	#rem monkeydoc Creates a color from a 32 bit ARGB color.
+	#rem monkeydoc Creates a color from a 32 bit big endian ARGB color.
+
+	Big endian ARGB is the same as little endian BGRA.
+
 	#end
 	Function FromARGB:Color( argb:UInt )
 		Local a:=(argb Shr 24 & $ff)/255.0
@@ -330,13 +357,42 @@ Struct Color
 		Return New Color( r,g,b,a )
 	End
 	
-	#rem monkeydoc Creates a color from a 32 bit RGBA color.
+	#rem monkeydoc Creates a color from a 32 bit big endian BGRA color.
+
+	Big endian BGRA is the same as little endian ARGB.
+	
+	#end
+	Function FromBGRA:Color( bgra:UInt )
+		Local b:=(bgra Shr 24 & $ff)/255.0
+		Local g:=(bgra Shr 16 & $ff)/255.0
+		Local r:=(bgra Shr 8 & $ff)/255.0
+		Local a:=(bgra & $ff)/255.0
+		Return New Color( r,g,b,a )
+	End
+	
+	#rem monkeydoc Creates a color from a 32 bit big endian RGBA color.
+
+	Big endian RGBA is the same as little endian ABGR.
+	
+	#end
+	Function FromRGBA:Color( rgba:UInt )
+		Local r:=(rgba Shr 24 & $ff)/255.0
+		Local g:=(rgba Shr 16 & $ff)/255.0
+		Local b:=(rgba Shr 8 & $ff)/255.0
+		Local a:=(rgba & $ff)/255.0
+		Return New Color( r,g,b,a )
+	End
+	
+	#rem monkeydoc Creates a color from a 32 bit big endian ABGR color.
+
+	Big endian ABGR is the same as little endian RGBA.
+	
 	#end
-	Function FromRGBA:Color( argb:UInt )
-		Local r:=(argb Shr 24 & $ff)/255.0
-		Local g:=(argb Shr 16 & $ff)/255.0
-		Local b:=(argb Shr 8 & $ff)/255.0
-		Local a:=(argb & $ff)/255.0
+	Function FromABGR:Color( abgr:UInt )
+		Local a:=(abgr Shr 24 & $ff)/255.0
+		Local b:=(abgr Shr 16 & $ff)/255.0
+		Local g:=(abgr Shr 8 & $ff)/255.0
+		Local r:=(abgr & $ff)/255.0
 		Return New Color( r,g,b,a )
 	End
 	

modules/std/tests/color.monkey2

@@ -0,0 +1,14 @@
+
+#Import "<std>"
+
+Using std..
+
+Function Main()
+	
+	'Test UInt conversions
+	Print Color.FromARGB( Color.Orange.ToARGB() )	'1,.5,0,1
+	Print Color.FromBGRA( Color.Orange.ToBGRA() )	'1,.5,0,1
+	Print Color.FromRGBA( Color.Orange.ToRGBA() )	'1,.5,0,1
+	Print Color.FromABGR( Color.Orange.ToABGR() )	'1,.5,0,1
+	
+End