QB64/InForm
QB64/InForm
1
1
Fork 0
mirror of https://github.com/FellippeHeitor/InForm.git synced 2025-01-14 19:49:33 +00:00
Code Issues Releases Wiki Activity

Clear final render surface with correct 32-bit RGBA background color

Browse source
This commit is contained in:
Samuel Gomes 2023-12-01 04:41:35 +05:30
parent db355486c1
commit af6eb0957d
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
InForm/extensions/GIFPlay.bas
View file

@ -249,14 +249,15 @@ $IF GIFPLAY_BAS = UNDEFINED THEN
' Get the rendered image handle ' Get the rendered image handle
DIM renderedFrame AS LONG: renderedFrame = GIF_GetFrame(Id) DIM renderedFrame AS LONG: renderedFrame = GIF_GetFrame(Id)
' Clear the surface ' Cache the GIF index because we'll be using this a lot
CLS DIM idx AS LONG: idx = HashTable_LookupLong(__GIFPlayHashTable(), Id)
' Clear the surface using the background color (this will be black if the GIF has no global color table)
CLS , __GIFPlay(idx).bgColor
' Blit the rendered frame ' Blit the rendered frame
_PUTIMAGE , renderedFrame, , , _SMOOTH _PUTIMAGE , renderedFrame, , , _SMOOTH
DIM idx AS LONG: idx = HashTable_LookupLong(__GIFPlayHashTable(), Id)
' Render the overlay if needed ' Render the overlay if needed
IF NOT __GIFPlay(idx).isPlaying AND __GIFPlay(idx).overlayEnabled AND __GIFPlay(idx).frameCount > 1 THEN IF NOT __GIFPlay(idx).isPlaying AND __GIFPlay(idx).overlayEnabled AND __GIFPlay(idx).frameCount > 1 THEN
DIM overlayImage AS LONG: overlayImage = __GIF_GetOverlayImage DIM overlayImage AS LONG: overlayImage = __GIF_GetOverlayImage
@ -325,13 +326,20 @@ $IF GIFPLAY_BAS = UNDEFINED THEN
__GIFPlay(idx).lastFrameRendered = lastFrameRendered __GIFPlay(idx).lastFrameRendered = lastFrameRendered
' Take appropriate action based on the disposal method of the previous frame ' Take appropriate action based on the disposal method of the previous frame
DIM oldDest AS LONG: oldDest = _DEST ' this is needed for CLS. CLS in v3.9.1 does not support using image handles (can remove with v4.0)
IF __GIFPlay(idx).frame = __GIFPlay(idx).firstFrame THEN IF __GIFPlay(idx).frame = __GIFPlay(idx).firstFrame THEN
' If this is the first frame, then we do not have any previous disposal method ' If this is the first frame, then we do not have any previous disposal method
CLS , __GIFPlay(idx).bgColor, __GIFPlay(idx).image ' clear the render image using the BG color _DEST __GIFPlay(idx).image
'CLS , __GIFPlay(idx).bgColor, __GIFPlay(idx).image ' clear the render image using the BG color
CLS , __GIFPlay(idx).bgColor
_DEST oldDest
ELSE ELSE
SELECT CASE __GIFPlayFrame(__GIFPlayFrame(__GIFPlay(idx).frame).prevFrame).disposalMethod SELECT CASE __GIFPlayFrame(__GIFPlayFrame(__GIFPlay(idx).frame).prevFrame).disposalMethod
CASE 2 ' Restore to background color CASE 2 ' Restore to background color
CLS , __GIFPlay(idx).bgColor, __GIFPlay(idx).image _DEST __GIFPlay(idx).image
'CLS , __GIFPlay(idx).bgColor, __GIFPlay(idx).image
CLS , __GIFPlay(idx).bgColor
_DEST oldDest
_CLEARCOLOR __GIFPlay(idx).bgColor, __GIFPlay(idx).image _CLEARCOLOR __GIFPlay(idx).bgColor, __GIFPlay(idx).image
CASE 3 ' Restore to previous CASE 3 ' Restore to previous
@ -668,7 +676,7 @@ $IF GIFPLAY_BAS = UNDEFINED THEN
IF _READBIT(i, 7) THEN rawFrame.globalColors = _SHL(1, ((i AND 7) + 1)) IF _READBIT(i, 7) THEN rawFrame.globalColors = _SHL(1, ((i AND 7) + 1))
' Background color is only valid with a global palette ' Background color is only valid with a global palette
__GIFPlay(idx).bgColor = StringFile_ReadByte(sf) i = StringFile_ReadByte(sf)
' Skip aspect ratio ' Skip aspect ratio
StringFile_Seek sf, StringFile_GetPosition(sf) + 1 StringFile_Seek sf, StringFile_GetPosition(sf) + 1
@ -676,6 +684,9 @@ $IF GIFPLAY_BAS = UNDEFINED THEN
' Read the global palette data ' Read the global palette data
IF rawFrame.globalColors > 0 THEN MID$(rawFrame.globalPalette, 1, 3 * rawFrame.globalColors) = StringFile_ReadString(sf, 3 * rawFrame.globalColors) IF rawFrame.globalColors > 0 THEN MID$(rawFrame.globalPalette, 1, 3 * rawFrame.globalColors) = StringFile_ReadString(sf, 3 * rawFrame.globalColors)
' Get RGBA value from the global palette for the backgrond color
__GIFPlay(idx).bgColor = _RGB32(ASC(rawFrame.globalPalette, i + 1), ASC(rawFrame.globalPalette, i + 2), ASC(rawFrame.globalPalette, i + 3))
DIM frameIdx AS LONG: frameIdx = -1 DIM frameIdx AS LONG: frameIdx = -1
DO DO

2
InForm/extensions/GIFPlay.bi
View file

@ -16,7 +16,7 @@ $IF GIFPLAY_BI = UNDEFINED THEN
isUsed AS _BYTE ' is this slot being used (this is only here to assist slot allocation) isUsed AS _BYTE ' is this slot being used (this is only here to assist slot allocation)
isReady AS _BYTE ' this is set if the GIF is fully loaded (helps fix issues with InForm-PE TIMERs) isReady AS _BYTE ' this is set if the GIF is fully loaded (helps fix issues with InForm-PE TIMERs)
image AS LONG ' the rendered 32bpp frame image image AS LONG ' the rendered 32bpp frame image
bgColor AS _UNSIGNED _BYTE ' background color bgColor AS _UNSIGNED LONG ' background color (32-bit RGBA!)
firstFrame AS LONG ' index of the first frame in the frame data array firstFrame AS LONG ' index of the first frame in the frame data array
lastFrame AS LONG ' index of the last frame in the frame data array lastFrame AS LONG ' index of the last frame in the frame data array
frame AS LONG ' index of the current frame being played frame AS LONG ' index of the current frame being played