BUGFIX: accidentally set width instead of @width
This commit is contained in:
Howland Owl
parent
c2baa5e28f
commit
3bddd790e6
1 changed files with 117 additions and 119 deletions
236
textmode.coffee
236
textmode.coffee
|
|
@ -117,7 +117,6 @@ class @ImageTextModePaletteANSI extends @ImageTextModePalette
|
|||
]
|
||||
|
||||
class @ImageTextModeFont
|
||||
|
||||
constructor: ( options ) ->
|
||||
@chars = []
|
||||
@width = 8
|
||||
|
|
@ -389,7 +388,7 @@ class @ImageTextModeFont8x16 extends @ImageTextModeFont
|
|||
|
||||
class @ImageTextModeFont8x8 extends @ImageTextModeFont
|
||||
constructor: ( options ) ->
|
||||
super width
|
||||
super @width
|
||||
@chars = [
|
||||
[ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ],
|
||||
[ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e ],
|
||||
|
|
@ -653,7 +652,7 @@ class @ImageTextModeFont8x8 extends @ImageTextModeFont
|
|||
|
||||
class @ImageTextModeFontAmiga extends @ImageTextModeFont
|
||||
constructor: ( options ) ->
|
||||
super width
|
||||
super @width
|
||||
@chars = [
|
||||
[ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ],
|
||||
[ 0x83, 0x83, 0x39, 0x39, 0x21, 0x21, 0x29, 0x29, 0x21, 0x21, 0x3f, 0x3f, 0x87, 0x87, 0xff, 0xff ],
|
||||
|
|
@ -1030,122 +1029,6 @@ class @ImageTextMode
|
|||
bufView[i] = str.charCodeAt(i) for i in [0...str.length]
|
||||
buf
|
||||
|
||||
class @ImageTextModeXBin extends @ImageTextMode
|
||||
|
||||
# Header constants
|
||||
PALETTE = 1
|
||||
FONT = 2
|
||||
COMPRESSED = 4
|
||||
NON_BLINK = 8
|
||||
FIVETWELVE_CHARS = 16
|
||||
|
||||
# Compression type constants
|
||||
NO_COMPRESSION = 0
|
||||
CHARACTER_COMPRESSION = 64
|
||||
ATTRIBUTE_COMPRESSION = 128
|
||||
FULL_COMPRESSION = 192
|
||||
|
||||
# Compression byte constants
|
||||
COMPRESSION_TYPE = 192
|
||||
COMPRESSION_COUNTER = 63
|
||||
|
||||
constructor: ( options ) ->
|
||||
super
|
||||
@header = { width: 0, height: 0, fontisze: 0, flags: 0 }
|
||||
this[k] = v for own k, v of options
|
||||
|
||||
parse: ( content ) ->
|
||||
@screen = []
|
||||
headerData = content.substr( 0, 11 )
|
||||
if headerData.length isnt 11 || !headerData.match( '^XBIN\x1a' )
|
||||
throw new Error( 'File is not an XBin' )
|
||||
|
||||
@header.width = @unpackShort( headerData.substr( 5, 2 ) )
|
||||
@header.height = @unpackShort( headerData.substr( 7, 2 ) )
|
||||
@header.fontsize = @getByteAt( headerData.substr( 9, 1 ) )
|
||||
@header.flags = @getByteAt( headerData.substr( 10, 1 ) )
|
||||
offset = 11
|
||||
|
||||
if @header.flags & PALETTE
|
||||
@parsePaletteData( content.substr( offset, 48 ) );
|
||||
offset += 48
|
||||
|
||||
if @header.flags & FONT
|
||||
fontlength = @header.fontsize
|
||||
if @header.flags & FIVETWELVE_CHARS
|
||||
fontlength *= 512
|
||||
else
|
||||
fontlength *= 256
|
||||
@parseFontData( content.substr( offset, fontlength ), @header.fontsize );
|
||||
offset += fontlength
|
||||
|
||||
if @header.flags & COMPRESSED
|
||||
@_parse_compressed( content.substr( offset ) )
|
||||
else
|
||||
@_parse_uncompressed( content.substr( offset ) )
|
||||
|
||||
_parse_compressed: ( data ) ->
|
||||
x = 0
|
||||
y = 0
|
||||
@screen[ y ] = []
|
||||
|
||||
data = data.split( '' )
|
||||
while info = data.shift()
|
||||
info = @getByteAt( info, 0 )
|
||||
break if info == 26
|
||||
|
||||
type = info & COMPRESSION_TYPE
|
||||
counter = ( info & COMPRESSION_COUNTER ) + 1
|
||||
|
||||
ch = null
|
||||
attr = null
|
||||
|
||||
while counter-- > 0
|
||||
switch type
|
||||
when NO_COMPRESSION
|
||||
ch = data.shift()
|
||||
attr = data.shift()
|
||||
when CHARACTER_COMPRESSION
|
||||
ch = data.shift() if !ch?
|
||||
attr = data.shift()
|
||||
when ATTRIBUTE_COMPRESSION
|
||||
attr = data.shift() if !attr?
|
||||
ch = data.shift()
|
||||
else
|
||||
ch = data.shift() if !ch?
|
||||
attr = data.shift() if !attr?
|
||||
|
||||
@screen[ y ][ x ] = { ch: ch, attr: @getByteAt( attr, 0 ) }
|
||||
|
||||
x++
|
||||
if x == @header.width
|
||||
x = 0
|
||||
y++
|
||||
break if y == @header.height
|
||||
@screen[ y ] = [] if !@screen[ y ]?
|
||||
|
||||
_parse_uncompressed: ( data ) ->
|
||||
x = 0
|
||||
y = 0
|
||||
@screen[ y ] = []
|
||||
|
||||
for i in [ 0 .. data.length - 2 ] by 2
|
||||
ch = data.substr( i, 1 )
|
||||
break if ch == "\x1a"
|
||||
attr = @getByteAt( data, i + 1 )
|
||||
@screen[ y ][ x ] = { 'ch': ch, 'attr': attr }
|
||||
x++
|
||||
if x == @header.width
|
||||
x = 0
|
||||
y++
|
||||
break if y == @header.height
|
||||
@screen[ y ] = [] if !@screen[ y ]?
|
||||
|
||||
getWidth: ->
|
||||
return @header.width
|
||||
|
||||
getHeight: ->
|
||||
return @header.height
|
||||
|
||||
class @ImageTextModeANSI extends @ImageTextMode
|
||||
ANSI_ESC = String.fromCharCode(0x1b)
|
||||
|
|
@ -1650,4 +1533,119 @@ class @ImageTextModeAVATAR extends @ImageTextMode
|
|||
@x = 0
|
||||
@y++
|
||||
|
||||
class @ImageTextModeXBin extends @ImageTextMode
|
||||
|
||||
# Header constants
|
||||
PALETTE = 1
|
||||
FONT = 2
|
||||
COMPRESSED = 4
|
||||
NON_BLINK = 8
|
||||
FIVETWELVE_CHARS = 16
|
||||
|
||||
# Compression type constants
|
||||
NO_COMPRESSION = 0
|
||||
CHARACTER_COMPRESSION = 64
|
||||
ATTRIBUTE_COMPRESSION = 128
|
||||
FULL_COMPRESSION = 192
|
||||
|
||||
# Compression byte constants
|
||||
COMPRESSION_TYPE = 192
|
||||
COMPRESSION_COUNTER = 63
|
||||
|
||||
constructor: ( options ) ->
|
||||
super
|
||||
@header = { width: 0, height: 0, fontisze: 0, flags: 0 }
|
||||
this[k] = v for own k, v of options
|
||||
|
||||
parse: ( content ) ->
|
||||
@screen = []
|
||||
headerData = content.substr( 0, 11 )
|
||||
if headerData.length isnt 11 || !headerData.match( '^XBIN\x1a' )
|
||||
throw new Error( 'File is not an XBin' )
|
||||
|
||||
@header.width = @unpackShort( headerData.substr( 5, 2 ) )
|
||||
@header.height = @unpackShort( headerData.substr( 7, 2 ) )
|
||||
@header.fontsize = @getByteAt( headerData.substr( 9, 1 ) )
|
||||
@header.flags = @getByteAt( headerData.substr( 10, 1 ) )
|
||||
offset = 11
|
||||
|
||||
if @header.flags & PALETTE
|
||||
@parsePaletteData( content.substr( offset, 48 ) );
|
||||
offset += 48
|
||||
|
||||
if @header.flags & FONT
|
||||
fontlength = @header.fontsize
|
||||
if @header.flags & FIVETWELVE_CHARS
|
||||
fontlength *= 512
|
||||
else
|
||||
fontlength *= 256
|
||||
@parseFontData( content.substr( offset, fontlength ), @header.fontsize );
|
||||
offset += fontlength
|
||||
|
||||
if @header.flags & COMPRESSED
|
||||
@_parse_compressed( content.substr( offset ) )
|
||||
else
|
||||
@_parse_uncompressed( content.substr( offset ) )
|
||||
|
||||
_parse_compressed: ( data ) ->
|
||||
x = 0
|
||||
y = 0
|
||||
@screen[ y ] = []
|
||||
|
||||
data = data.split( '' )
|
||||
while info = data.shift()
|
||||
info = @getByteAt( info, 0 )
|
||||
break if info == 26
|
||||
|
||||
type = info & COMPRESSION_TYPE
|
||||
counter = ( info & COMPRESSION_COUNTER ) + 1
|
||||
|
||||
ch = null
|
||||
attr = null
|
||||
|
||||
while counter-- > 0
|
||||
switch type
|
||||
when NO_COMPRESSION
|
||||
ch = data.shift()
|
||||
attr = data.shift()
|
||||
when CHARACTER_COMPRESSION
|
||||
ch = data.shift() if !ch?
|
||||
attr = data.shift()
|
||||
when ATTRIBUTE_COMPRESSION
|
||||
attr = data.shift() if !attr?
|
||||
ch = data.shift()
|
||||
else
|
||||
ch = data.shift() if !ch?
|
||||
attr = data.shift() if !attr?
|
||||
|
||||
@screen[ y ][ x ] = { ch: ch, attr: @getByteAt( attr, 0 ) }
|
||||
|
||||
x++
|
||||
if x == @header.width
|
||||
x = 0
|
||||
y++
|
||||
break if y == @header.height
|
||||
@screen[ y ] = [] if !@screen[ y ]?
|
||||
|
||||
_parse_uncompressed: ( data ) ->
|
||||
x = 0
|
||||
y = 0
|
||||
@screen[ y ] = []
|
||||
|
||||
for i in [ 0 .. data.length - 2 ] by 2
|
||||
ch = data.substr( i, 1 )
|
||||
break if ch == "\x1a"
|
||||
attr = @getByteAt( data, i + 1 )
|
||||
@screen[ y ][ x ] = { 'ch': ch, 'attr': attr }
|
||||
x++
|
||||
if x == @header.width
|
||||
x = 0
|
||||
y++
|
||||
break if y == @header.height
|
||||
@screen[ y ] = [] if !@screen[ y ]?
|
||||
|
||||
getWidth: ->
|
||||
return @header.width
|
||||
|
||||
getHeight: ->
|
||||
return @header.height
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue