Merge pull request #281 from neilsf/develop

Develop to Main

Author: neilsf

.github/workflows/dub-build.yml

@@ -2,7 +2,7 @@ name: Build project
 
 on:
   push:
-    branches: [ main, feature/x16-support, feature/mega65-support ]
+    branches: [ main, release/v3.2.0-beta ]
 
 jobs:
     build:

examples/gravity.bas

@@ -11,9 +11,7 @@ CONST MIN_X = 24.0
 CONST MAX_X = 318.0
 CONST MAX_Y = 228.0
 
-DIM key AS BYTE
-
-TYPE SPRITE
+TYPE MOB
   x AS FLOAT
   y AS FLOAT
   vx AS FLOAT
@@ -24,14 +22,14 @@ TYPE SPRITE
     THIS.y = THIS.y + THIS.vy
     THIS.vy = THIS.vy + GRAVITY
 
-    REM -- Hit the wall
+    ' Hit the wall
     IF (THIS.x >= MAX_X AND THIS.vx > 0) OR (THIS.x <= MIN_X AND THIS.vx < 0) THEN THIS.vx = THIS.vx * HBOUNCE
-    REM -- Hit the ground
+    ' Hit the ground
     IF THIS.y >= MAX_Y AND THIS.vy > 0.0 THEN
       IF ABS(THIS.vx) < 0.2 THEN END
       THIS.vy = THIS.vy * VBOUNCE
 
-      if THIS.vx > 0.0 THEN
+      IF THIS.vx > 0.0 THEN
         THIS.vx = THIS.vx - FRICTION
       ELSE
         THIS.vx = THIS.vx + FRICTION
@@ -45,30 +43,29 @@ TYPE SPRITE
     STATIC screen_y AS BYTE
     screen_x = CINT(THIS.x)
     screen_y = CBYTE(THIS.y)
-    POKE $D000, screen_x : REM sprite X coord
-    IF screen_x > 255 THEN POKE $D010, 1 ELSE POKE $D010, 0
-    POKE $D001, screen_y : REM sprite y coord
+    lab_h:
+    SPRITE 1 AT screen_x, screen_y
   END SUB
 
   SUB init () STATIC
     THIS.x = 28.0
     THIS.y = 48.0
     THIS.vy = 0.0
     THIS.vx = 5.5
-    POKE $D015, 1 : REM enable sprite
     MEMCPY @ball_shape, 960, 63
-    POKE $07F8, 15 : REM sprite pointer
+    SPRITE 1 SHAPE 15 COLOR 13 ON
   END SUB
 END TYPE
 
-DIM ball AS SPRITE
+DIM ball AS MOB
 CALL ball.init()
 
-loop:
+DO
   CALL ball.update()
-  WAIT 53265, 128 : REM wait one frame
+  ' wait one frame
+  WAIT 53265, 128
   CALL ball.draw()
-  GOTO loop
+LOOP WHILE 1
 
 ball_shape:
 DATA AS BYTE 0,126,0,3,255,192,7,255,224,31,255,248
@@ -77,4 +74,4 @@ DATA AS BYTE 127,255,254,255,255,255,255,255,255
 DATA AS BYTE 255,255,255,255,255,255,255,255,255
 DATA AS BYTE 127,255,254,127,255,254,63,255,252
 DATA AS BYTE 31,255,248,31,255,248,7,255,224
-DATA AS BYTE 3,255,192,0,126,0
+DATA AS BYTE 3,255,192,0,126,0

examples/gravity.prg

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 	
 	; Add top 2 decimals on stack
 	MAC adddecimal

lib/core/arith/_decimal.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 
 	; Add top 2 floats on stack
 	MAC addfloat ; @push

lib/core/arith/_float.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 
 	; Add top 2 ints on stack
 	MAC addint

lib/core/arith/_int.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 
 	; Perform OR on top 2 long ints of stack
 	MAC orlong

lib/core/arith/_long.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 
 	; Add top 2 words on stack
 	; 32 cycles - could it be less?

lib/core/arith/_word.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 
 	; Compare two bytes on stack for less than
 	MAC cmpbytelt ; @pull @push

lib/core/comp/_byte.asm

@@ -1,4 +1,4 @@
-	PROCESSOR 6502
+	
 	
 	; Compare two decimals on stack for equality
 	MAC cmpdecimaleq ; @pull @push