add c64 as well...

python/machines.py

@@ -51,23 +51,31 @@ MACHINES = (
 	# 128k clones
 	# "unitron", "utrn1024",
 
+
+	# acorn
+	"bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron",
+
 	#atari
 	"st", "megast",
 
+
+	# commodore
+	"c64", "c64c",
+
+	# oric
+	"oric1", "orica", "prav8d", "telstrat",
+	# mt65, micron, mt6809 -- need tanbus support...
+
+
 	# trs
 	"coco", "coco2b", "coco3", "coco3p", "mc10",
 	"cocoh", "coco3h", "coco2bh",
 	"trs80", "trs80l2",
 	"dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64",
 
-	# oric
-	"oric1", "orica", "prav8d", "telstrat",
-	# mt65, micron, mt6809 -- need tanbus support...
 
 
 
-	# acorn
-	"bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron",
 
 )
 
@@ -77,8 +85,7 @@ MACHINES_EXTRA = MACHINES + (
 	# other (for Ample-lite...)
 
 	# commodore
-	"c64", "c64c", "c128",
-
+	"c128",
 
 	# amiga
 	"a500", "a500n", "a1000", "a1000n", "a2000", "a2000n",

python/mkmachines.py

@@ -691,13 +691,29 @@ def find_machine_resolution(machine):
 	hscale = 1
 	wscale = 1
 
-	# mame height is often garbage.
 
-	# raster screens have a default aspect ratio of 4 : 3
-	# pre-calc something like that, but integer-based.
+	# bbc...
+
+	# mode    us            euro
+	# (xml)   640x200       640x256
+	# 0       640x220 (200) 640x282 (256)
+	# 1       320x220       320x282
+	# 2       160x220       160x282
+	# 3       640x218 (198) 640x275 (250)
+	# 4       320x220       320x282
+	# 5       160x220       160x282
+	# 6       320x218       320x275
+	# 7       480x440 (400) 480x550 (500)
+	#
+	# mode 3/6/7 are strictly text modes so pixel values aren't comparable
+	# + 10% for layout UI?
+
+	#
+	# if name == "electron" or name[:3] == "bbc":
+	# 	if width == 640: width = 480
+	# 	if height == 200: height = 400 # us
+	# 	if height == 256: height = 500 # euro
 
-	#hscale = round((width * 3 / 4 ) / height)
-	#if hscale < 1 : hscale = 1
 
 	return [width, height * hscale]
 

python/mkmodels.py

@@ -72,7 +72,8 @@ oric_children = [
 amiga_children = ["a500", "a500n", "a1000", "a1000n", "a2000", "a2000n" ]
 
 acorn_children = [ "bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron" ]
-commodore_children = ["c64", "c64c", "c128"]
+commodore_children = ["c64", "c64c"]
+commodore_children_extra = ["c64", "c64c", "c128"]
 
 dec_vt_children = ["vt52", "vt100", "vt101", "vt102", "vt240"]
 dec_children = ["ds2100", "ds3100", "ds5k133", "pdp11qb", "pdp11ub", "pdp11ub2"]
@@ -108,15 +109,15 @@ TREE = [
 	("Macintosh (LC)", None, mac_lc_children),
 	("Macintosh (Portable)", None, mac_portable_children),
 	("Macintosh (PowerBook)", None, mac_powerbook_children),
-	("Atari ST", "st", atari_st_children),
 	("Acorn", None, acorn_children),
+	("Atari ST", "st", atari_st_children),
+	("Commodore", "c64", commodore_children),
 	("Oric", None, oric_children),
 	("Tandy", None, tandy_children),
 ]
 
 TREE_EXTRA = TREE + [
 	("Amiga", None, amiga_children),
-	("Commodore", "c64", commodore_children),
 	("DEC VT", None, dec_vt_children),
 	("DEC", None, dec_children),
 	("HP 9000", None, hp_9000_children),