From 23672eef5c67e3bb0ed0ba5e4033be89abcec6a4 Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Sat, 26 Mar 2016 18:24:14 +1100
Subject: [PATCH] Text work in progress

---
 024.simple_text/Makefile      |   2 +-
 024.simple_text/blit.s        |  90 +++++++++++++++++++++++++++++-----
 024.simple_text/simple_text.s |  25 +++-------
 assets/font.png               | Bin 0 -> 6219 bytes
 4 files changed, 86 insertions(+), 31 deletions(-)
 create mode 100644 assets/font.png

diff --git a/024.simple_text/Makefile b/024.simple_text/Makefile
index 4940b17..b1c8082 100644
--- a/024.simple_text/Makefile
+++ b/024.simple_text/Makefile
@@ -19,7 +19,7 @@ include ../shared/base.mk
 
 
 out/%.bin: ../assets/%.png
-	$(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes  --output-palette-asm --output-palette --output out/$* --colors=16 --use-palette palette.pal --output-mask
+	$(IMAGECON) --input $< $(IMAGECON_ARGS) --output-bitplanes  --output-palette-asm --output-palette --output out/$* --colors=16 --use-palette palette.pal --full-color-palette-file --output-mask --transparent-color=0,0,0
 
 out/main.o: $(IMAGEDATA) constants.i Makefile link.script.x palette.pal
 out/init.o: constants.i Makefile
\ No newline at end of file
diff --git a/024.simple_text/blit.s b/024.simple_text/blit.s
index be994fc..d8f8f3e 100644
--- a/024.simple_text/blit.s
+++ b/024.simple_text/blit.s
@@ -1,5 +1,5 @@
 	include "includes.i"
-	xdef blitObject64
+	xdef DrawText
 
 ;; BLTCON? configuration
 ;; http://amigadev.elowar.com/read/ADCD_2.1/Hardware_Manual_guide/node011C.html
@@ -26,7 +26,7 @@ BLIT_SRCA	    	equ $800
 BLIT_ASHIFTSHIFT	equ 12   ;Bit index of ASH? bits
 
 BLIT_BOB_WIDTH 		equ 32 ; Must blit extra word to allow shifting
-BLIT_BOB_HEIGHT		equ 12
+BLIT_BOB_HEIGHT		equ 10
 BLIT_BOB_WIDTH_BYTES	equ BLIT_BOB_WIDTH/8
 BLIT_BOB_WIDTH_WORDS	equ BLIT_BOB_WIDTH/16
 	
@@ -40,23 +40,34 @@ blitWait:
 	;; blitobject
 	;; d0 - xpos
 	;; d1 - ypos
+	;; d3 - odd character
 	;; a0 - display
 	;; a1 - object
 	;; a2 - mask
-blitObject64: 
+blitText: 
 	movem.l	d0-a6,-(sp)
 	bsr	 blitWait
 
 	;; d0 = XPOS
 	;; d1 = YPOS
+	;; d3 = odd character
 	;; d4 = XPOS_BYTES
 
  	move.w	d0,d4	; d4 = XPOS
 	lsr.w	#3,d4	; d4 = XPOS_BYTES
 
-	if 1
+	cmp.b	#1,d3
+	bne	.evenChar
+.oddChar
 	sub.w	#8,d0
-	endif
+	move.w	#$00FF,BLTAFWM(a6)	; no mask for first word
+	move.w	#$0000,BLTALWM(a6) 	; mask out last word
+	sub.l	#1,a0	
+	bra	.continue
+.evenChar:
+	move.w	#$ff00,BLTAFWM(a6)	; no mask for first word
+	move.w	#$0000,BLTALWM(a6) 	; mask out last word
+.continue:
 
 	;; this shift will give us the bits to shift (bits 0-3) in bits (12-15) of d0
 	lsl.w	#8,d0	; BLIT_SOURCE_SHIFT<<BLIT_ASHIFTSHIFT
@@ -66,14 +77,6 @@ blitObject64:
 	ori.w   #BLIT_SRCA|BLIT_SRCB|BLIT_SRCC|BLIT_DEST|BLIT_LF_MINTERM,d0
 	move.w	d0,BLTCON0(A6)
 
-	if 1
-	move.w	#$00FF,BLTAFWM(a6)	; no mask for first word
-	move.w	#$0000,BLTALWM(a6) 	; mask out last word
-	else
-	move.w	#$ff00,BLTAFWM(a6)	; no mask for first word
-	move.w	#$0000,BLTALWM(a6) 	; mask out last word
-	endif
-
 
 	move.w 	#SCREEN_WIDTH_BYTES-BLIT_BOB_WIDTH_BYTES,BLTAMOD(a6)	;A modulo
 	move.w 	#SCREEN_WIDTH_BYTES-BLIT_BOB_WIDTH_BYTES,BLTBMOD(a6)	;B modulo
@@ -97,3 +100,64 @@ blitObject64:
 	move.w 	#(BLIT_BOB_HEIGHT*SCREEN_BIT_DEPTH)<<6|(BLIT_BOB_WIDTH_WORDS),BLTSIZE(a6)	;rectangle size, starts blit
 	movem.l (sp)+,d0-a6
 	rts
+
+DrawText:
+	;; a0 - bitplane
+	;; a1 - text
+	;; d0 - xpos
+	;; d1 - ypos
+	
+
+.loop:
+	clr.l	d2
+	move.b	(a1)+,d2
+	cmp.b	#0,d2
+	beq	.done
+	jsr	DrawChar
+	add.l	#8,d0
+	bra	.loop
+.done:
+	rts
+	
+DrawChar:
+	;; d0 - xpos
+	;; d1 - ypos
+	;; d2 - char
+	;; a0 - bitplane
+	movem.l	d0-a6,-(sp)
+	move.l	#'!',d4 	; fontmap offset
+	sub.l	d4,d2		; index = char - '!'
+	move.l	d2,d5
+	lsr.l	#5,d5		; fontmap y offset
+	
+	move.l	d5,d4
+	lsl.l	#5,d4		; start of line
+	sub.l	d4,d2		;
+	
+	add.l	#1,d5		; temp marker first line xx	
+	lea	font,a1
+	lea	fontMask,a2
+	mulu.w	#SCREEN_WIDTH_BYTES*SCREEN_BIT_DEPTH*BLIT_BOB_HEIGHT,d5
+	add.l	d5,a2
+	add.l	d5,a1
+	
+
+	btst.l	#0,d2
+	beq	.even
+.odd:
+	move.b	#1,d3
+	bra	.c1
+.even:	
+	move.b	#0,d3
+.c1
+
+	add.l	d2,a1
+	add.l	d2,a2
+	jsr	blitText
+	movem.l	(sp)+,d0-a6
+	rts
+
+font:
+	incbin	"out/font.bin"
+fontMask:
+	incbin	"out/font-mask.bin"	
diff --git a/024.simple_text/simple_text.s b/024.simple_text/simple_text.s
index 42d83ac..22c20e3 100644
--- a/024.simple_text/simple_text.s
+++ b/024.simple_text/simple_text.s
@@ -2,13 +2,10 @@
 	
 	xdef 	PokeBitplanePointers
 	xdef	copperList
-	xdef 	copperListAlternate
 	xdef 	bitplanes1
 	xdef 	bitplanes2
 	xdef 	bitplanes3
-	xdef	Module
 	xdef	copperListBplPtr
-	xdef	copperListAlternateBplPtr
 	
 byteMap:
 	dc.l	Entry
@@ -59,19 +56,19 @@ Entry:
 	;; a2 - mask
 
 	;; add.l	#1,xpos
-	move.l  #4,xpos
+	move.b	#0,d3
+	move.l  #0,xpos
 	move.l	xpos,d0
 	move.l	#50,d1
 	lea	bitplanes1,a0
-	if 1
-	sub.l	#2,a0
-	endif
-	lea	font,a1
-	lea	fontMask,a2
-	jsr	blitObject64
-
+	lea	text,a1
+	jsr	DrawText
 	bra	.mainLoop
 
+text:
+	dc.b	"My first text on an Amiga!"
+	dc.b	0
+	align	4
 xpos:
 	dc.l	0
 Level3InterruptHandler:
@@ -119,12 +116,6 @@ copperListBplPtr:
 InstallPalette:
 	include	"out/font-palette.s"
 	rts
-
-font:
-	incbin	"out/font.bin"
-fontMask:
-	incbin	"out/font-mask.bin"	
-
 	section .bss	
 bitplanes1:
 	ds.b	IMAGESIZE+(512)
diff --git a/assets/font.png b/assets/font.png
new file mode 100644
index 0000000000000000000000000000000000000000..135229a77164e9e3154bb689e1ae64beb5c38bf5
GIT binary patch
literal 6219
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
X<yvvSXz7yxaQuk>;fjA>{{4RdwAob5

literal 0
HcmV?d00001