[ro-oslib-commits] OSLib/!OsLib/Source/Core/oslib OSSpriteOp.swi,1.4,1.5

[<th...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv8037/Source/Core/oslib

Modified Files:
	OSSpriteOp.swi 
Log Message:
Added alpha mask support to OSSpriteOp. Change 20030629-3.


Index: OSSpriteOp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OSSpriteOp.swi,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OSSpriteOp.swi	28 Nov 2002 13:08:59 -0000	1.4
--- OSSpriteOp.swi	29 Jun 2003 10:43:03 -0000	1.5
***************
*** 46,55 ****
  TYPE OSSpriteOp_ModeWord = .Bits;
  CONST //for sprite mode words
     OSSpriteOp_XRes      = OSSpriteOp_ModeWord: %11111111111110,
     OSSpriteOp_XResShift = .Int: 1,
     OSSpriteOp_YRes      = OSSpriteOp_ModeWord: %111111111111100000000000000,
     OSSpriteOp_YResShift = .Int: 14,
!    OSSpriteOp_Type      = OSSpriteOp_ModeWord: %11111000000000000000000000000000,
!    OSSpriteOp_TypeShift = .Int: 27;
  
  CONST
--- 46,57 ----
  TYPE OSSpriteOp_ModeWord = .Bits;
  CONST //for sprite mode words
+    OSSpriteOp_NewStyle  = OSSpriteOp_ModeWord: %1,
     OSSpriteOp_XRes      = OSSpriteOp_ModeWord: %11111111111110,
     OSSpriteOp_XResShift = .Int: 1,
     OSSpriteOp_YRes      = OSSpriteOp_ModeWord: %111111111111100000000000000,
     OSSpriteOp_YResShift = .Int: 14,
!    OSSpriteOp_Type      = OSSpriteOp_ModeWord: %1111000000000000000000000000000,
!    OSSpriteOp_TypeShift = .Int: 27,
!    OSSpriteOp_AlphaMask = OSSpriteOp_ModeWord: %10000000000000000000000000000000 "RISC O S Select";
  
  CONST
***************
*** 526,544 ****
     )  ),
  
!    OSSpriteOp_ReadPixelMask = (NUMBER 0x2E, ENTRY (R0 # 43 "Reads pixel
!          mask",
           R0 | OSSpriteOp_Flags: flags,
           R1 -> OSSpriteOp_Area: area,
           R2 = OSSpriteOp_Id: id,
           R3 = .Int: x,
!          R4 = .Int: y),
        EXIT
        (  R5! = .Bool: solid
!       )),
  
!    OSSpriteOp_WritePixelColourDeep =
     (  NUMBER 0x2E,
        ENTRY
!       (  R0 # 42 "Writes pixel colour using 24-bit RGB value",
           R0 | OSSpriteOp_Flags: flags,
           R1 = .Ref OSSpriteOp_Area: area,
--- 528,576 ----
     )  ),
  
!    OSSpriteOp_WritePixelColourDeep =
!    (  NUMBER 0x2E,
!       ENTRY
!       (  R0 # 42 "Writes pixel colour using 24-bit RGB value",
!          R0 | OSSpriteOp_Flags: flags,
!          R1 = .Ref OSSpriteOp_Area: area,
!          R2 = OSSpriteOp_Id: id,
!          R3 = .Int: x,
!          R4 = .Int: y,
!          R5 = .Bits: gcol,
!          R6 = OS_Tint: tint
!    )  ),
! 
!    OSSpriteOp_ReadPixelMask =
!    (  NUMBER 0x2E,
!       ENTRY
!       (  R0 # 43 "Reads pixel mask",
           R0 | OSSpriteOp_Flags: flags,
           R1 -> OSSpriteOp_Area: area,
           R2 = OSSpriteOp_Id: id,
           R3 = .Int: x,
!          R4 = .Int: y
!       ),
        EXIT
        (  R5! = .Bool: solid
!    )  ),
  
!    OSSpriteOp_ReadPixelMaskAlpha =
     (  NUMBER 0x2E,
        ENTRY
!       (  R0 # 43 "Reads pixel mask with alpha channel support - RISC O S Select",
!          R0 | OSSpriteOp_Flags: flags,
!          R1 -> OSSpriteOp_Area: area,
!          R2 = OSSpriteOp_Id: id,
!          R3 = .Int: x,
!          R4 = .Int: y
!       ),
!       EXIT
!       (  R5! = .Int: opacity
!    )  ),
! 
!    OSSpriteOp_WritePixelMask =
!    (  NUMBER 0x2E,
!       ENTRY
!       (  R0 # 44 "Writes pixel mask",
           R0 | OSSpriteOp_Flags: flags,
           R1 = .Ref OSSpriteOp_Area: area,
***************
*** 546,555 ****
           R3 = .Int: x,
           R4 = .Int: y,
!          R5 = .Bits: gcol,
!          R6 = OS_Tint: tint
     )  ),
  
!    OSSpriteOp_WritePixelMask = (NUMBER 0x2E, ENTRY (R0 # 44 "Writes pixel
!          mask",
           R0 | OSSpriteOp_Flags: flags,
           R1 = .Ref OSSpriteOp_Area: area,
--- 578,588 ----
           R3 = .Int: x,
           R4 = .Int: y,
!          R5 = .Bool: solid
     )  ),
  
!    OSSpriteOp_WritePixelMaskAlpha =
!    (  NUMBER 0x2E,
!       ENTRY
!       (  R0 # 44 "Writes pixel mask with alpha channel support - RISC O S Select",
           R0 | OSSpriteOp_Flags: flags,
           R1 = .Ref OSSpriteOp_Area: area,
***************
*** 557,561 ****
           R3 = .Int: x,
           R4 = .Int: y,
!          R5 = .Bool: solid)),
  
     OSSpriteOp_InsertColumn = (NUMBER 0x2E, ENTRY (R0 # 45 "Inserts column",
--- 590,595 ----
           R3 = .Int: x,
           R4 = .Int: y,
!          R5 = .Int: opacity
!    )  ),
  
     OSSpriteOp_InsertColumn = (NUMBER 0x2E, ENTRY (R0 # 45 "Inserts column",