Bordercollision for GELS (#131)

DerThore · WDrijver · web-flow · commit 24da510b2caf · 2025-05-16T17:46:36.000+02:00
* Fixed Typo in copper.h

* Add Interlace modes, prepare SuperHires

* Implement setwritemask

* Implement minterms

* Implement minterms

* Implement minterms

* Implement minterms

* Implement minterms

* Implement minterms

* Implement minterms

* WritePixel rewrite

* dragging and swapping screens

* Show screens while dragging

needs an "anti flicker" in future.

* Repair requesters

Show requesters with raster background correctly

* Temp workaround for SysInfo

* Temp workaround for SysInfo

* Better detection of matching screenmode

* Better detection of matching screenmode

* Mouse Pointer visible in flipped screen

* Better detection for CGX screens

* Aktualisieren von bestmodeida.c

* Aktualisieren von bestmodeida.c

* Aktualisieren von bestmodeida.c

* Update bestmodeida.c

* Correcting parameter order

* Update amigavideo_hiddclass.c

Activate prepared SuperHires

* Update videocontrol.c

Correct some, added missing ones.

* Update videocontrol.c

added missing define

* Remove RT from AllocMem

* Remove RT from AllocMem

* Enhance GELS with HWSprites

* Update drawglist.c

* Update start.c for new core

* added missing pointer

added missing pointer and BORDER collision preset

* DA/DD bus

* DA/DD IDE Bus

* DA/DD IDE Bus

* DA/DD IDE Bus

* DD/DA IDE Bus

* DA/DD IDE Bus

* DA/DD IDE Bus

* DA/DD Gayle

* DA/DD Gayle

* DA/DD Gayle

* DA/DD Gayle

* DA/DD Gayle

* Add GadGImage

* Make LoadRGB4 more 1.3 and 3.1 compatible

* Aktualisieren von loadrgb4.c

* Add CL Poke Funcs

* Add CL Poke Funcs

* Update setrgb4.c

* Aktualisieren von setrgb4.c

* Aktualisieren von setrgb4.c

* Update setrgb4.c

* Update loadrgb4.c

* change CL in any case

* Implement Changesprite

* Update loadrgb4.c

* Update setrgb4.c

* Immediate color change

* Immediate color change

* Avoid black regions when BOB gets moved

* Use Sprite Precision

* Mask Genlock Bits

* Border Collision

---------

Co-authored-by: Willem Drijver &lt;60568860+WDrijver@users.noreply.github.com&gt;
diff --git a/rom/graphics/docollision.c b/rom/graphics/docollision.c
@@ -1,5 +1,5 @@
 /*
-    Copyright � 1995-2007, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2007, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Graphics function DoCollision()
@@ -52,10 +52,19 @@
 
     struct VSprite * CurVSprite, * _CurVSprite;
     int shift, _shift;
+    BOOL brdh;
+    struct Layer *layer;
+    struct VSprite brdSprite, *brds;
     
     if (NULL != rp->GelsInfo)
     {
       CurVSprite = rp->GelsInfo->gelHead->NextVSprite;
+
+      brdh = (LONG)(rp->GelsInfo->collHandler->collPtrs[0]) != 0;
+      layer = rp->Layer;
+      if(layer)
+        ObtainSemaphore(&layer->Lock);    
+	    
       if (CurVSprite->Flags & VSPRITE)
         shift = 1;
       else
@@ -64,6 +73,67 @@
       while (NULL != CurVSprite->NextVSprite)
       {
         _CurVSprite = CurVSprite->NextVSprite;
+
+	// For safety, break at the tail GEL      
+	if(CurVSprite == rp->GelsInfo->gelTail)
+          break;    
+
+	/*
+         *  Check border collision
+	 */
+        brds = CurVSprite;
+	if(layer && (brds->Flags & VSPRITE))
+        {
+          brdSprite = *CurVSprite;
+          brds = &brdSprite;
+          brds->X = brds->X - (layer->bounds.MinX - layer->Scroll_X);
+          brds->Y = brds->Y - (layer->bounds.MinY - layer->Scroll_Y);
+        }
+	if(brdh)
+        { 
+	  if(brds->HitMask | 0)
+	  {
+	    WORD hit = 0;
+            WORD lr; 
+
+	    // top hit
+            if(brds->Y <= rp->GelsInfo->topmost)
+            {
+              hit = 1;
+            }
+	    // bottom hit
+            if( ((brds->Y + brds->Height) ) >= rp->GelsInfo->bottommost)
+            {
+              hit |= 2;
+            }
+            // left hit
+            lr = rp->GelsInfo->leftmost - brds->X;
+            if(lr >= 0)
+            {
+              if(lr > (brds->Width << 4))
+                lr = (brds->Width << 4);      
+              hit |= 4;
+            }        
+            // right hit
+            lr = (brds->X + (brds->Width << 4)) - rp->GelsInfo->rightmost;
+            if(lr >= 0)
+            {
+               if(lr > (brds->Width << 4))
+                 lr = (brds->Width << 4);
+               hit |= 8;
+            }
+	    /*
+             *  Did we hit a border? Then call Collision 0
+	     */
+	    if(hit != 0)
+            {
+              if(CurVSprite->VSBob && (CurVSprite->VSBob->Flags & BOBSAWAY))
+              {}
+              else
+                rp->GelsInfo->collHandler->collPtrs[0]( CurVSprite, hit);
+            }            
+          }
+        }  
         
         /*
          * As long as they can overlap vertically..
@@ -212,7 +282,7 @@
             if (collision)
             {
               UWORD mask = CurVSprite->MeMask & _CurVSprite->HitMask;
-              int i = 0;
+              int i = 1;
               while (i < 16 && 0 != mask)
               {
                 if (mask & 0x01)
@@ -232,6 +302,9 @@
         }
         CurVSprite = CurVSprite->NextVSprite;
       }
+	    
+      if(layer)
+        ReleaseSemaphore( &layer->Lock);
     }
 
     AROS_LIBFUNC_EXIT
diff --git a/rom/graphics/drawglist.c b/rom/graphics/drawglist.c
@@ -311,15 +311,26 @@
 				struct Spr *spr = (struct Spr *)0xdff120;
 
 				WORD tx, ty, t, dy, dx, h;
-				UWORD pos, ctl, offset;
+				UWORD pos, ctl, offset, xprec;
 				WORD *nextline, *image;
 		
 				nextline = rp->GelsInfo->nextLine + pick;
 				tx = GfxBase->ActiView->DxOffset;
 				ty = GfxBase->ActiView->DyOffset;
 			    
 				if(CurVSprite->X < 0)dx = 0; else dx = CurVSprite->X;
-				tx = tx + dx; // Should we do Hires >>1, SHIRES >> 2 ??
+				xprec = 0;
+				if(vp->Modes & 0x20)
+				{
+					tx = tx + (dx>>2);
+					xprec = 2;
+				}
+				else if(vp->Modes & 0x8000)
+				{
+					tx = tx + (dx>>1);
+					xprec = 1;
+				}
+				else tx = tx + dx;
 			    
 				if(CurVSprite->Y < 0) dy = 0; else dy = CurVSprite->Y;
 				ty = ty + dy;
@@ -331,7 +342,11 @@
 				{
 					// PosCtl
 			 		pos = (ty<<8) | ((tx >> 1) & 0xff); //(y<<15) | (x >> 1);
-			   		ctl = (t << 8) | ((ty>>6)&0x4) | ((t>>7)&0x2) | (tx&0x1);
+			   		ctl = ((t&0xff) << 8) | ((ty>>6)&0x4) | ((t>>7)&0x2) | (tx&0x1) | ((ty>>3)&0x40) | ((t>>4)&0x20);
+					if(xprec > 0)
+					{
+						ctl |= (((CurVSprite->X) & (3 >> (2-xprec))) << (5-xprec));
+					}
 					
 					// image clipping
 			   		image = CurVSprite->ImageData + ((UWORD)CurVSprite->Depth * (UWORD)(dy-CurVSprite->Y));
diff --git a/rom/graphics/gels_internal.c b/rom/graphics/gels_internal.c
@@ -1,5 +1,5 @@
 /*
-    Copyright � 1995-2016, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2016, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Internal function for improved gels handling.
@@ -235,12 +235,13 @@ void _ClearBobAndFollowClearPath(struct VSprite * CurVSprite,
 			/*
 			 * No background was saved. So let's restore the
 			 * standard background!
-			 */
+			 * Edit: This is not really correct, this might end up in black squares. Just do nothing here
 			EraseRect(rp,
 			          CurVSprite->OldX,
 			          CurVSprite->OldY,
 			          CurVSprite->OldX + ( CurVSprite->Width << 4 ) - 1,
 			          CurVSprite->OldY +   CurVSprite->Height	- 1);
+			*/ 
 		}
 		/*
 		 * Mark the BOB as cleared.
diff --git a/rom/graphics/getrgb4.c b/rom/graphics/getrgb4.c
@@ -1,5 +1,5 @@
 /*
-    Copyright � 1995-2012, The AROS Development Team. All rights reserved.
+    Copyright © 1995-2012, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Graphics function GetRGB4()
@@ -60,7 +60,7 @@
 
     /* All we're currently doing is read the entry and return it. */
     CT = colormap->ColorTable;
-    return CT[entry];
+    return CT[entry] & 0xFFF;
 
     AROS_LIBFUNC_EXIT
     
diff --git a/rom/graphics/loadrgb4.c b/rom/graphics/loadrgb4.c
@@ -204,8 +204,7 @@ static struct CopIns *pokeCI(struct CopIns *ci, UWORD *field1, short field2)
 
     // To make it visible immediately we need to update the view. To simplify it, we call MrgCop
     MrgCop(GfxBase->ActiView);
-    if(TypeOfMem(GfxBase->ActiView->LOFCprList->start) == MEMF_CHIP)
-        GfxBase->LOFlist = GfxBase->ActiView->LOFCprList->start;
+    LoadView(GfxBase->ActiView);
 
     AROS_LIBFUNC_EXIT
     
diff --git a/rom/graphics/setrgb4.c b/rom/graphics/setrgb4.c
@@ -98,8 +98,7 @@
     SetRGB32( vp, n, r, g, b );
 
     MrgCop(GfxBase->ActiView);
-    if(TypeOfMem(GfxBase->ActiView->LOFCprList->start) == MEMF_CHIP)
-        GfxBase->LOFlist = GfxBase->ActiView->LOFCprList->start;
+    LoadView(GfxBase->ActiView);
 
     /************************************************************
     / This is the code that works correctly on the real thing
