Apple-2-Tools
/
Steve2
mirror of https://github.com/trudnai/Steve2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Preparation for DGR / Double LoRes rendering

This commit is contained in:
Tamas Rudnai 2024-01-14 18:38:13 -08:00
parent 5e272a9686
commit 8cafeff4d9
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
A2Mac.xcodeproj/project.xcworkspace/xcuserdata/trudnai.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

36
A2Mac/LoRes.swift
View File

@ -43,8 +43,9 @@ class LoRes: NSView {
let LoResIntBuffer2 = UnsafeRawBufferPointer(start: RAM + Page2Addr, count: PageSize * 2) let LoResIntBuffer2 = UnsafeRawBufferPointer(start: RAM + Page2Addr, count: PageSize * 2)
let LoResBuffer1 = UnsafeRawBufferPointer(start: MEM + Page1Addr, count: PageSize * 2) let LoResBuffer1 = UnsafeRawBufferPointer(start: MEM + Page1Addr, count: PageSize * 2)
let LoResBuffer2 = UnsafeRawBufferPointer(start: MEM + Page2Addr, count: PageSize * 2) let LoResBuffer2 = UnsafeRawBufferPointer(start: MEM + Page2Addr, count: PageSize * 2)
var LoResBufferPointer = UnsafeRawBufferPointer(start: MEM + Page1Addr, count: PageSize * 2) var LoResBufferPointer1 = UnsafeRawBufferPointer(start: MEM + Page1Addr, count: PageSize * 2)
var LoResBufferPointer2 = UnsafeRawBufferPointer(start: MEM + Page1Addr, count: PageSize * 2)
let LoResRawPointer = UnsafeRawPointer(RAM + Page1Addr) let LoResRawPointer = UnsafeRawPointer(RAM + Page1Addr)
// holds the starting addresses for each lines minus the screen page starting address // holds the starting addresses for each lines minus the screen page starting address
@ -353,18 +354,22 @@ class LoRes: NSView {
} }
if MEMcfg.txt_page_2 == 1 { if MEMcfg.txt_page_2 == 1 {
if (MEMcfg.RD_AUX_MEM == 0) { if (MEMcfg.RD_AUX_MEM == 0) {
LoResBufferPointer = LoResBuffer2 LoResBufferPointer1 = LoResBuffer2
LoResBufferPointer2 = LoResBuffer2
} }
else { else {
LoResBufferPointer = LoResIntBuffer2 LoResBufferPointer1 = LoResIntBuffer2
LoResBufferPointer2 = LoResIntBuffer2
} }
} }
else { else {
if (MEMcfg.RD_AUX_MEM == 0) { if (MEMcfg.RD_AUX_MEM == 0) {
LoResBufferPointer = LoResBuffer1 LoResBufferPointer1 = LoResBuffer1
LoResBufferPointer2 = LoResBuffer1
} }
else { else {
LoResBufferPointer = LoResIntBuffer1 LoResBufferPointer1 = LoResIntBuffer1
LoResBufferPointer2 = LoResIntBuffer1
} }
} }
} }
@ -388,22 +393,25 @@ class LoRes: NSView {
let blockHorIdx = x / 2 let blockHorIdx = x / 2
// print("blockVertIdx:", blockVertIdx, " blockHorIdx:", blockHorIdx) // print("blockVertIdx:", blockVertIdx, " blockHorIdx:", blockHorIdx)
let block = Int(LoResBufferPointer[ Int(lineAddr + blockHorIdx) ]) let block1 = Int(LoResBufferPointer1[ Int(lineAddr + blockHorIdx) ])
let block2 = Int(LoResBufferPointer2[ Int(lineAddr + blockHorIdx) ])
let screenIdx = blockVertIdx + blockHorIdx let screenIdx = blockVertIdx + blockHorIdx
let blockIdx = screenIdx / 2 let blockIdx = screenIdx / 2
let pixelHAddr = blockVertIdx * 2 + blockHorIdx * 2 let pixelHAddr = blockVertIdx * 2 + blockHorIdx * 2
let pixelLAddr = pixelHAddr + LoRes.blockCols let pixelLAddr = pixelHAddr + LoRes.blockCols
// get all changed blocks // mark all changed blocks
blockChanged[ blockIdx ] = blockChanged[ blockIdx ] || shadowScreen[ screenIdx ] != block blockChanged[ blockIdx ] = blockChanged[ blockIdx ] || shadowScreen[ screenIdx ] != block1 || shadowScreen[ screenIdx + 1] != block2
shadowScreen[ screenIdx ] = block
colorPixel(pixelAddr: pixelHAddr, color: block & 0x0F ) shadowScreen[ screenIdx ] = block1
colorPixel(pixelAddr: pixelLAddr, color: (block >> 4) & 0x0F ) shadowScreen[ screenIdx + 1] = block2
colorPixel(pixelAddr: pixelHAddr, color: block1 & 0x0F )
colorPixel(pixelAddr: pixelLAddr, color: (block1 >> 4) & 0x0F )
colorPixel(pixelAddr: pixelHAddr + 1, color: block & 0x0F ) colorPixel(pixelAddr: pixelHAddr + 1, color: block2 & 0x0F )
colorPixel(pixelAddr: pixelLAddr + 1, color: (block >> 4) & 0x0F ) colorPixel(pixelAddr: pixelLAddr + 1, color: (block2 >> 4) & 0x0F )
} }