From b5fd43f59b65028f0c18d1bf56598e73c01c34ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Fri, 9 Dec 2016 04:05:10 -0300 Subject: Update graphics modes --- .../scripts/load/graphics/tms9918a_mode20.lua | 153 +++++++++------------ .../scripts/load/graphics/tms9918a_mode21.lua | 153 +++++++++------------ .../scripts/load/graphics/tms9918a_mode23.lua | 114 --------------- 3 files changed, 134 insertions(+), 286 deletions(-) delete mode 100644 src/hardware_data/scripts/load/graphics/tms9918a_mode23.lua diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua index 2ffd722..70bbbe6 100644 --- a/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua +++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode20.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 240, height = 192, fps = 29.97, @@ -9,104 +9,85 @@ return { y = 0, }, }, - pal = { - width = 240, - height = 192, - fps = 25, - origin = { - x = 0, - y = 0, - }, - }, }, - colors = { - '5bpp', - limit = '4bpp', - transparent = 'colorKey', + colours = { + total = '15+1', + limit = '15+1', + background = false, + transparent = 'transparentColour', }, - mesh = false, - api = false, - shader = { - false, - fragment = false, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, }, - physic = false, - sprite = { - true, - colors = '0bpp', - limits = { - true, - screen = 32, - line = 4, + physic = false, + sprites = { + onScreen = 32, + onLine = 4, + palettes = { + specify = true, + free = { + colours = 1, + keys = 1, + }, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { + sizes = { + { width = 8, height = 8, }, - big = { + { width = 16, height = 16, }, }, }, - tile = { - layers = 1, - a = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'bc', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 6, - height = 8, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = true, + free = { + colours = 2, + keys = false, + }, }, - }, - }, - b = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ac', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 6, - height = 8, + mirror = false, + transform = { + individual = false, + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, }, - }, - }, - c = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ab', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 6, - height = 8, + sizes = { + { + width = 6, + height = 8, + }, + }, + map = { + width = 240, + height = 64, + tiles = false, + pixels = { + width = false, + height = 1, + }, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua index 1d17583..103c22e 100644 --- a/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua +++ b/src/hardware_data/scripts/load/graphics/tms9918a_mode21.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 192, fps = 29.97, @@ -9,104 +9,85 @@ return { y = 0, }, }, - pal = { - width = 256, - height = 192, - fps = 25, - origin = { - x = 0, - y = 0, - }, - }, }, - colors = { - '5bpp', - limit = '4bpp', - transparent = 'colorKey', + colours = { + total = '15+1', + limit = '15+1', + background = false, + transparent = 'transparentColour', }, - mesh = false, - api = false, - shader = { - false, - fragment = false, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, }, - physic = false, - sprite = { - true, - colors = '0bpp', - limits = { - true, - screen = 8, - line = 4, + physic = false, + sprites = { + onScreen = 8, + onLine = 4, + palettes = { + specify = true, + free = { + colours = 1, + keys = 1, + }, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { + sizes = { + { width = 8, height = 8, }, - big = { + { width = 16, height = 16, }, }, }, - tile = { - layers = 1, - a = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'bc', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = true, + free = { + colours = 2, + keys = false, + }, }, - }, - }, - b = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ac', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, + mirror = false, + transform = { + individual = false, + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, }, - }, - }, - c = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ab', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, + sizes = { + { + width = 8, + height = 8, + }, + }, + map = { + width = 256, + height = 64, + tiles = 8, + pixels = { + width = false, + height = 1, + }, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/tms9918a_mode23.lua b/src/hardware_data/scripts/load/graphics/tms9918a_mode23.lua deleted file mode 100644 index 1763b11..0000000 --- a/src/hardware_data/scripts/load/graphics/tms9918a_mode23.lua +++ /dev/null @@ -1,114 +0,0 @@ -return { - screen = { - default = { - width = 64, - height = 48, - fps = 29.97, - origin = { - x = 0, - y = 0, - }, - }, - pal = { - width = 64, - height = 48, - fps = 25, - origin = { - x = 0, - y = 0, - }, - }, - }, - colors = { - '5bpp', - limit = '4bpp', - transparent = 'colorKey', - }, - mesh = false, - api = false, - shader = { - false, - fragment = false, - }, - physic = false, - sprite = { - true, - colors = '0bpp', - limits = { - true, - screen = 32, - line = 4, - }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, - }, - big = { - width = 16, - height = 16, - }, - }, - }, - tile = { - layers = 1, - a = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'bc', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 4, - height = 4, - }, - }, - }, - b = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ac', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 4, - height = 4, - }, - }, - }, - c = { - tilesSet = 'width', - colors = '1bpp', - specifyColors = false, - moveIndividual = false, - independent = 'ab', - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 4, - height = 4, - }, - }, - }, - }, -} -- cgit v1.2.3