AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-08 06:41:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix raw set fg and bg methods for row, col, and even the color fields. closes #3401

Browse Source
This commit is contained in:
payonel 2021-05-12 07:21:54 -07:00
parent 90be0181bc
commit 4a50b50725
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -25,3 +25,7 @@
# VSCode # VSCode
/.vscode /.vscode
/saves /saves
/logs
/config
/options.txt
/usernamecache.json

12
src/main/scala/li/cil/oc/common/component/traits/TextBufferProxy.scala
View File

@ -130,9 +130,9 @@ trait TextBufferProxy extends api.internal.TextBuffer {
for (y <- row until ((row + color.length) min data.height)) { for (y <- row until ((row + color.length) min data.height)) {
val line = color(y - row) val line = color(y - row)
for (x <- col until ((col + line.length) min data.width)) { for (x <- col until ((col + line.length) min data.width)) {
val packedBackground = data.format.deflate(PackedColor.Color(line(x - col))) & 0x00FF val packedBackground = data.color(y)(x) & 0x00FF
val packedForeground = data.color(row)(col) & 0xFF00 val packedForeground = (data.format.deflate(PackedColor.Color(line(x - col))) << PackedColor.ForegroundShift) & 0xFF00
data.color(row)(col) = (packedForeground | packedBackground).toShort data.color(y)(x) = (packedForeground | packedBackground).toShort
} }
} }
} }
@ -141,9 +141,9 @@ trait TextBufferProxy extends api.internal.TextBuffer {
for (y <- row until ((row + color.length) min data.height)) { for (y <- row until ((row + color.length) min data.height)) {
val line = color(y - row) val line = color(y - row)
for (x <- col until ((col + line.length) min data.width)) { for (x <- col until ((col + line.length) min data.width)) {
val packedBackground = data.color(row)(col) & 0x00FF val packedBackground = data.format.deflate(PackedColor.Color(line(x - col))) & 0x00FF
val packedForeground = (data.format.deflate(PackedColor.Color(line(x - col))) << PackedColor.ForegroundShift) & 0xFF00 val packedForeground = data.color(y)(x) & 0xFF00
data.color(row)(col) = (packedForeground | packedBackground).toShort data.color(y)(x) = (packedForeground | packedBackground).toShort
} }
} }
} }