bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use correction values for the coordinates so that the x/y coordinates are

Browse Source 
0/0 if the upper left corner of the mouse sprite is in the upper left corner
of the screen.
Use always sprite #0 for the mouse pointer.


git-svn-id: svn://svn.cc65.org/cc65/trunk@892 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2001-09-12 13:43:00 +00:00
parent 35f403b702
commit 20f23128cd
1 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
libsrc/c64/mouse.s
View File

@@ -12,33 +12,39 @@
.export _mouse_buttons, _mouse_info .export _mouse_buttons, _mouse_info
.import _readjoy .import _readjoy
.import popa, popsreg, addysp1 .import popa, popax, addysp1
.importzp ptr1, sp, sreg .importzp ptr1, sp, sreg
.include "c64.inc" .include "c64.inc"
.macpack generic .macpack generic
.code .code
; --------------------------------------------------------------------------
;
; Constants
;
SPRITE_HEIGHT = 21
SPRITE_WIDTH = 24
SCREEN_HEIGHT = 200
SCREEN_WIDTH = 320
XCORR = SPRITE_WIDTH
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
; ;
; unsigned char __fastcall__ mouse_init (unsigned char port, ; unsigned char __fastcall__ mouse_init (unsigned char port,
; unsigned char sprite,
; unsigned char type); ; unsigned char type);
; ;
_mouse_init: _mouse_init:
jsr popa ; Ignore the type, get sprite param jsr popa ; Ignore type and port
tax ; Save sprite number
jsr popa ; Get the port number
ldy OldIRQ+1 ; Already initialized? ldy OldIRQ+1 ; Already initialized?
bne AlreadyInitialized ; Jump if yes bne AlreadyInitialized ; Jump if yes
stx MouseSprite ; Remember the sprite number
sta MousePort ; Remember the port number
; Initialize variables ; Initialize variables
ldx #0 ldx #0
@@ -49,18 +55,22 @@ _mouse_init:
stx OldPotX stx OldPotX
stx OldPotY stx OldPotY
stx XMin stx XMin
stx XMin+1 ; XMin = 0 stx XMin+1 ; XMin = 0
lda #29 lda #50 ; ## FIXME: This is the PAL value
sta YCorr
sec
sbc #SPRITE_HEIGHT ; Sprite height in pixels
sta YMin sta YMin
stx YMin+1 ; YMin = 29 stx YMin+1 ; YMin = 29
lda #250 lda #SCREEN_HEIGHT ; Vertical screen res
add YCorr ; Add correction factor
sta YMax sta YMax
stx YMax+1 ; YMax = 250 stx YMax+1
inx ; X = 1 inx ; X = 1
stx Invisible ; Mouse *not* visible stx Invisible ; Mouse *not* visible
lda #<344 lda #<(SCREEN_WIDTH + SPRITE_WIDTH)
sta XMax sta XMax
stx XMax+1 ; XMax = 344 stx XMax+1 ; XMax = 320 + sprite width
; Remember the old IRQ vector ; Remember the old IRQ vector
@@ -107,11 +117,8 @@ Done: rts
_mouse_hide: _mouse_hide:
lda Invisible ; Get the flag lda Invisible ; Get the flag
bne @L1 ; Jump if already invisible bne @L1 ; Jump if already invisible
ldx MouseSprite ; Sprite defined?
beq @L1 ; Jump if no
lda NotMask-1,x ; Get clean mask
lda #$FE ; Clear bit for sprite #0
sei ; Disable interrupts sei ; Disable interrupts
and VIC_SPR_ENA and VIC_SPR_ENA
sta VIC_SPR_ENA ; Disable sprite sta VIC_SPR_ENA ; Disable sprite
@@ -130,17 +137,12 @@ _mouse_show:
beq @L1 ; Jump if no beq @L1 ; Jump if no
dec Invisible ; Set the flag dec Invisible ; Set the flag
bne @L1 ; Jump if still invisible bne @L1 ; Jump if still invisible
ldx MouseSprite ; Sprite defined?
beq @L1 ; Jump if no
sei ; Disable interrupts sei ; Disable interrupts
jsr MoveSprite1 ; Move the sprite to it's position jsr MoveSprite1 ; Move the sprite to it's position
lda VIC_SPR_ENA ; Get sprite enable register
ldx MouseSprite ; Get sprite number (again) ora #$01 ; Enable sprite #0
lda BitMask-1,x ; Get bit mask sta VIC_SPR_ENA ; Write back
ora VIC_SPR_ENA
sta VIC_SPR_ENA ; Enable sprite
cli ; Enable interrupts cli ; Enable interrupts
@L1: rts @L1: rts
@@ -153,32 +155,42 @@ _mouse_show:
_mouse_box: _mouse_box:
ldy #0 ; Stack offset ldy #0 ; Stack offset
sei ; Disable interrupts add YCorr ; Adjust the Y value
bcc @L1
inx
clc
@L1: sei ; Disable interrupts
sta YMax sta YMax
stx YMax+1 ; maxy stx YMax+1 ; maxy
lda (sp),y lda (sp),y
adc #XCORR
sta XMax sta XMax
iny iny
lda (sp),y lda (sp),y
sta XMax+1 ; maxx adc #$00
sta XMax+1 ; maxx
iny iny
lda (sp),y lda (sp),y
sta YMin add YCorr
sta YMin
iny iny
lda (sp),y lda (sp),y
sta YMin+1 ; miny adc #$00
sta YMin+1 ; miny
iny iny
lda (sp),y lda (sp),y
sta XMin add #XCORR
sta XMin
iny iny
lda (sp),y lda (sp),y
sta XMin+1 ; minx adc #$00
sta XMin+1 ; minx
cli ; Enable interrupts cli ; Enable interrupts
jmp addysp1 ; Drop params, return jmp addysp1 ; Drop params, return
@@ -192,25 +204,31 @@ _mouse_pos:
sta ptr1 sta ptr1
stx ptr1+1 ; Remember the argument pointer stx ptr1+1 ; Remember the argument pointer
ldy #0 ; Structure offset ldy #0 ; Structure offset
sec ; Needed for the SBC later
sei ; Disable interrupts
sei ; Disable interrupts
lda XPos ; Transfer the position lda XPos ; Transfer the position
sbc #XCORR
sta (ptr1),y sta (ptr1),y
lda XPos+1 lda XPos+1
sbc #$00
iny iny
sta (ptr1),y sta (ptr1),y
lda YPos lda YPos
iny ldx YPos+1
sta (ptr1),y cli ; Restore initial interrupt state
lda YPos+1
iny
sta (ptr1),y
cli ; Restore initial interrupt state sub YCorr ; Apply the Y correction value
bcs @L1
dex
@L1: iny
sta (ptr1),y ; Store YPos
txa
iny
sta (ptr1),y
rts ; Done rts ; Done
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
; ;
@@ -229,9 +247,9 @@ _mouse_info:
; Fill in the button state ; Fill in the button state
jsr _mouse_buttons ; Will not touch ptr1 jsr _mouse_buttons ; Will not touch ptr1
ldy #4 ldy #4
sta (ptr1),y sta (ptr1),y
rts rts
@@ -241,29 +259,34 @@ _mouse_info:
; ;
_mouse_move: _mouse_move:
jsr popsreg ; Get X add YCorr ; Add Y coordinate correction
sei ; Disable interrupts bcc @L1
inx
clc
@L1: sei
sta YPos sta YPos
stx YPos+1 stx YPos+1
lda sreg cli
ldx sreg+1
sta XPos
stx XPos+1 ; Set new position
jsr MoveSprite ; Move the sprite to the mouse pos jsr popax ; Get X
adc #XCORR ; Adjust X coordinate
bcc @L2
inx
@L2: sei
sta XPos
stx XPos+1 ; Set new position
jsr MoveSprite ; Move the sprite to the mouse pos
cli ; Enable interrupts
@L9: cli ; Enable interrupts
rts rts
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
; ;
; unsigned char mouse_buttons (void); ; unsigned char mouse_buttons (void);
; ;
_mouse_buttons: _mouse_buttons:
lda MousePort ; Get the port lda #$00 ; Use port #0
jmp _readjoy ; Same as joystick jmp _readjoy ; Same as joystick
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
@@ -386,41 +409,35 @@ MoveCheck:
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
; ;
; Move the mouse sprite to the current mouse position. Must be called ; Move the mouse sprite to the current mouse position. Must be called
; with interrupts off. MoveSprite1 is an entry without checking and ; with interrupts off. MoveSprite1 is an entry without checking.
; loading X
; ;
MoveSprite: MoveSprite:
lda Invisible ; Mouse visible? lda Invisible ; Mouse visible?
bne MoveSpriteDone ; Jump if no bne MoveSpriteDone ; Jump if no
ldx MouseSprite ; Sprite defined?
beq MoveSpriteDone ; Jump if no
; Set the high X bit ; Set the high X bit
MoveSprite1: MoveSprite1:
lda VIC_SPR_HI_X ; Get high X bits of all sprites lda VIC_SPR_HI_X ; Get high X bits of all sprites
and NotMask-1,x ; Mask out sprite bit and #$FE ; Clear bit for sprite #0
ldy XPos+1 ; Test Y position ldy XPos+1 ; Test Y position
beq @L1 beq @L1
ora BitMask-1,x ; Set high X bit ora #$01 ; Set high X bit
@L1: sta VIC_SPR_HI_X ; Set hi X sprite values @L1: sta VIC_SPR_HI_X ; Set hi X sprite values
; Set the low X byte ; Set the low X byte
txa
asl a ; Index*2
tax
lda XPos lda XPos
sta VIC_SPR0_X-2,x ; Set low byte sta VIC_SPR0_X ; Set low byte
; Set the Y position ; Set the Y position
ldy YPos+1 ; Negative or too large? ldy YPos+1 ; Negative or too large?
bne MoveSpriteDone ; Jump if yes bne MoveSpriteDone ; Jump if yes
lda YPos lda YPos
sta VIC_SPR0_Y-2,x ; Set Y position sta VIC_SPR0_Y ; Set Y position
; Done ; Done
@@ -432,11 +449,10 @@ MoveSpriteDone:
.bss .bss
OldIRQ: .res 2 ; Old IRQ vector OldIRQ: .res 2 ; Old IRQ vector
MousePort: .res 1 ; Port used for the mouse
MouseSprite: .res 1 ; Number of sprite to control
OldValue: .res 1 ; Temp for MoveCheck routine OldValue: .res 1 ; Temp for MoveCheck routine
NewValue: .res 1 ; Temp for MoveCheck routine NewValue: .res 1 ; Temp for MoveCheck routine
YCorr: .res 1 ; Correction for Y coordinate
Invisible: .res 1 ; Is the mouse invisible? Invisible: .res 1 ; Is the mouse invisible?
OldPotX: .res 1 ; Old hw counter values OldPotX: .res 1 ; Old hw counter values
@@ -450,12 +466,4 @@ YMin: .res 2 ; Y1 value of bounding box
XMax: .res 2 ; X2 value of bounding box XMax: .res 2 ; X2 value of bounding box
YMax: .res 2 ; Y2 value of bounding box YMax: .res 2 ; Y2 value of bounding box
.data
BitMask: .byte $01, $02, $04, $08, $10, $20, $40, $80
NotMask: .byte $FE, $FD, $FB, $F7, $EF, $DF, $BF, $7F