Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2025-01-02 18:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Removed prevPrev (not needed)

Browse Source
This commit is contained in:
tudnai 2020-05-09 13:51:34 -07:00
parent 889b31803a
commit 293ba80f41
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
A2Mac/HiRes.swift
View File

@ -489,7 +489,7 @@ class HiRes: NSView {
let color_blue : UInt32 = 0xFF1166EE; let color_blue : UInt32 = 0xFF1166EE;
let color_orange : UInt32 = 0xFFEE2211; let color_orange : UInt32 = 0xFFEE2211;
func hiresColorPixel ( pixelAddr : Int, pixel : Int, prev : Int, prevPrev : Int ) { func hiresColorPixel ( pixelAddr : Int, pixel : Int, prev : Int ) {
let colorAddr = pixelAddr / 4 let colorAddr = pixelAddr / 4
switch ( pixel ) { switch ( pixel ) {
@ -615,7 +615,6 @@ class HiRes: NSView {
let blockVertIdx = y / 8 * HiRes.blockCols / 2 let blockVertIdx = y / 8 * HiRes.blockCols / 2
var prev = 0 var prev = 0
var prevPrev = 0
for blockHorIdx in 0 ..< HiRes.blockCols / 2 { for blockHorIdx in 0 ..< HiRes.blockCols / 2 {
// print("blockVertIdx:", blockVertIdx, " blockHorIdx:", blockHorIdx) // print("blockVertIdx:", blockVertIdx, " blockHorIdx:", blockHorIdx)
@ -637,24 +636,21 @@ class HiRes: NSView {
for px in 0 ... 2 { for px in 0 ... 2 {
// let bitMask = 3 << ( px * 2 ) // let bitMask = 3 << ( px * 2 )
let pixel = blockH7 | ( (block >> (px * 2)) & 3 ) let pixel = blockH7 | ( (block >> (px * 2)) & 3 )
hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev, prevPrev: prevPrev ) hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev )
pixelAddr += 8 pixelAddr += 8
prevPrev = prev
prev = pixel prev = pixel
} }
let pixel = (blockL7 | blockH7) | ( (block >> (3 * 2)) & 3 ) let pixel = (blockL7 | blockH7) | ( (block >> (3 * 2)) & 3 )
hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev, prevPrev: prevPrev ) hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev )
pixelAddr += 8 pixelAddr += 8
prevPrev = prev
prev = pixel prev = pixel
for px in 4 ... 6 { for px in 4 ... 6 {
// let bitMask = 3 << ( px * 2 ) // let bitMask = 3 << ( px * 2 )
let pixel = blockL7 | ( (block >> (px * 2)) & 3 ) let pixel = blockL7 | ( (block >> (px * 2)) & 3 )
hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev, prevPrev: prevPrev ) hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev )
pixelAddr += 8 pixelAddr += 8
prevPrev = prev
prev = pixel prev = pixel
} }
} }