From 605f21bfbf067d0e8a9a3f12d2d393fa04165c3f Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Fri, 16 Dec 2016 22:48:18 -0300 Subject: Update graphics modes --- .../load/graphics/s-ppux_5c7x-0x+cx4_mode1.lua | 244 ++++++++++++--------- .../load/graphics/s-ppux_5c7x-0x+gsu-x_mode1.lua | 241 +++++++++++--------- .../scripts/load/graphics/s-ppux_5c7x-0x_mode1.lua | 4 +- .../scripts/load/graphics/s-ppux_5c7x-0x_mode2.lua | 4 +- .../scripts/load/graphics/s-ppux_5c7x-0x_mode3.lua | 4 +- .../scripts/load/graphics/s-ppux_5c7x-0x_mode4.lua | 2 +- .../scripts/load/graphics/s-ppux_5c7x-0x_mode5.lua | 186 +++++++++------- .../scripts/load/graphics/s-ppux_5c7x-0x_mode6.lua | 126 ++++++----- .../scripts/load/graphics/s-ppux_5c7x-0x_mode7.lua | 184 +++++++++------- 9 files changed, 575 insertions(+), 420 deletions(-) (limited to 'src/hardware_data/scripts/load/graphics') diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+cx4_mode1.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+cx4_mode1.lua index b619b5f..9c0ccd7 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+cx4_mode1.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+cx4_mode1.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 224, fps = 29.97, @@ -9,7 +9,7 @@ return { y = 0, }, }, - pal = { + pal = { width = 256, height = 240, fps = 25, @@ -19,136 +19,172 @@ return { }, }, }, - colors = { - '15bpp', - limit = '8bpp', + colours = { + total = '15bpp', + limit = 256, + background = true, transparent = 'averaging', }, - mesh = true, - api = false, - shader = { - false, - fragment = false, + meshes = true, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, }, - physic = false, - sprite = { - true, - colors = '4bpp', - limits = { - true, - screen = 128, - line = 34, + physic = false, + sprites = { + onScreen = 128, + onLine = 34, + palettes = { + specify = true, + free = { + colours = 3, + keys = 1, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - small = { + sizes = { + { width = 8, height = 8, }, - default = { + { width = 16, height = 16, }, - big = { + { width = 32, height = 32, }, - huge = { + { width = 64, height = 64, }, }, }, - tile = { - layers = 3, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = true, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = false, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, - }, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = true, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - big = { - width = 64, - height = 64, + mirror = true, + transform = { + individual = false, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigW = { - width = 64, - height = 32, - }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, - }, - { - colors = '2bpp', - specifyColors = false, - moveIndividual = true, - independent = false, - mirror = true, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + { + independent = false, + palettes = { + specify = false, + free = { + colours = 3, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = true, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+gsu-x_mode1.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+gsu-x_mode1.lua index 7c36615..8427dce 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+gsu-x_mode1.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x+gsu-x_mode1.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 224, fps = 29.97, @@ -9,7 +9,7 @@ return { y = 0, }, }, - pal = { + pal = { width = 256, height = 240, fps = 25, @@ -19,133 +19,172 @@ return { }, }, }, - colors = { - '15bpp', - limit = '8bpp', + colours = { + total = '15bpp', + limit = 256, + background = true, transparent = 'averaging', }, - mesh = true, - api = false, - shader = { - false, - fragment = false, + meshes = true, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, }, - physic = false, - sprite = { - true, - colors = '4bpp', - limits = { - true, - screen = 128, - line = 34, + physic = false, + sprites = { + onScreen = 128, + onLine = 34, + palettes = { + specify = true, + free = { + colours = 3, + keys = 1, + }, + transform = { + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, }, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - small = { + sizes = { + { width = 8, height = 8, }, - default = { + { width = 16, height = 16, }, - big = { + { width = 32, height = 32, }, - huge = { + { width = 64, height = 64, }, }, }, - tile = { - layers = 3, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = false, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, - }, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 32, - height = 32, + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - big = { - width = 64, - height = 64, + mirror = true, + transform = { + individual = false, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, }, - bigW = { - width = 64, - height = 32, - }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, - }, - { - colors = '2bpp', - specifyColors = false, - moveIndividual = true, - independent = false, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + { + independent = false, + palettes = { + specify = false, + free = { + colours = 3, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = true, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode1.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode1.lua index 0a7d32c..38b78d4 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode1.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode1.lua @@ -78,7 +78,7 @@ return { specify = false, free = { colours = 15, - keys = 1, + keys = 1, }, }, mirror = true, @@ -116,7 +116,7 @@ return { specify = false, free = { colours = 15, - keys = 1, + keys = 1, }, }, mirror = true, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode2.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode2.lua index 71efa5d..1cf52dd 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode2.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode2.lua @@ -78,7 +78,7 @@ return { specify = false, free = { colours = 15, - keys = 1, + keys = 1, }, }, mirror = true, @@ -116,7 +116,7 @@ return { specify = false, free = { colours = 15, - keys = 1, + keys = 1, }, }, mirror = true, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode3.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode3.lua index f892245..aa6701f 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode3.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode3.lua @@ -78,7 +78,7 @@ return { specify = '443ppp', free = { colours = 255, - keys = 1, + keys = 1, }, }, mirror = true, @@ -116,7 +116,7 @@ return { specify = false, free = { colours = 15, - keys = 1, + keys = 1, }, }, mirror = true, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode4.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode4.lua index bdbe5e3..7a9ff1b 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode4.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode4.lua @@ -78,7 +78,7 @@ return { specify = 'true', free = { colours = 255, - keys = 1, + keys = 1, }, }, mirror = true, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode5.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode5.lua index 8f33927..f737962 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode5.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode5.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 512, height = 448, fps = 29.97, @@ -9,7 +9,7 @@ return { y = 0, }, }, - pal = { + pal = { width = 512, height = 480, fps = 25, @@ -19,108 +19,134 @@ return { }, }, }, - colors = { - '15bpp', - limit = '8bpp', + colours = { + total = '15bpp', + limit = 256, + background = true, transparent = 'averaging', }, - 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 = '4bpp', - limits = { - true, - screen = 128, - line = 34, + physic = false, + sprites = { + onScreen = 128, + onLine = 34, + palettes = { + specify = true, + free = { + colours = 3, + keys = 1, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - small = { + sizes = { + { width = 8, height = 8, }, - default = { + { width = 16, height = 16, }, - big = { + { width = 32, height = 32, }, - huge = { + { width = 64, height = 64, }, }, }, - tile = { - layer = { - 2, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = true, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = false, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, - }, - { - colors = '2bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = true, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + { + independent = false, + palettes = { + specify = false, + free = { + colours = 3, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = true, + transform = { + individual = false, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode6.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode6.lua index 4197741..889d1b0 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode6.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode6.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 512, height = 448, fps = 29.97, @@ -9,7 +9,7 @@ return { y = 0, }, }, - pal = { + pal = { width = 512, height = 480, fps = 25, @@ -19,78 +19,96 @@ return { }, }, }, - colors = { - '15bpp', - limit = '8bpp', + colours = { + total = '15bpp', + limit = 256, + background = true, transparent = 'averaging', }, - 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 = '4bpp', - limits = { - true, - screen = 128, - line = 34, + physic = false, + sprites = { + onScreen = 128, + onLine = 34, + palettes = { + specify = true, + free = { + colours = 3, + keys = 1, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - small = { + sizes = { + { width = 8, height = 8, }, - default = { + { width = 16, height = 16, }, - big = { + { width = 32, height = 32, }, - huge = { + { width = 64, height = 64, }, }, }, - tile = { - layers = 1, - { - colors = '4bpp', - specifyColors = false, - moveIndividual = true, - independent = false, - mirror = false, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 32, - height = 32, - }, - big = { - width = 64, - height = 64, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = false, + free = { + colours = 15, + keys = 1, + }, }, - bigW = { - width = 64, - height = 32, + mirror = false, + transform = { + individual = true, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - bigH = { - width = 32, - height = 64, + sizes = { + { + width = 32, + height = 32, + }, + { + width = 64, + height = 64, + }, + { + width = 64, + height = 32, + }, + { + width = 32, + height = 64, + }, }, + map = false, }, }, }, diff --git a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode7.lua b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode7.lua index 1e33e87..cadaf00 100644 --- a/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode7.lua +++ b/src/hardware_data/scripts/load/graphics/s-ppux_5c7x-0x_mode7.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 224, fps = 29.97, @@ -9,7 +9,7 @@ return { y = 0, }, }, - pal = { + pal = { width = 256, height = 240, fps = 25, @@ -19,100 +19,136 @@ return { }, }, }, - colors = { - '15bpp', - limit = '8bpp', + colours = { + total = '15bpp', + limit = 256, + background = true, transparent = 'averaging', }, - 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 = '4bpp', - limits = { - true, - screen = 128, - line = 34, + physic = false, + sprites = { + onScreen = 128, + onLine = 34, + palettes = { + specify = true, + free = { + colours = 3, + keys = 1, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - small = { + sizes = { + { width = 8, height = 8, }, - default = { + { width = 16, height = 16, }, - big = { + { width = 32, height = 32, }, - huge = { + { width = 64, height = 64, }, }, }, - tile = { - layers = 1, - plane = { - colors = '8bpp', - specifyColors = false, - moveIndividual = false, - independent = true, - mirror = false, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 128, - height = 128, + tiles = { + layers = { + plane = { + independent = true, + palettes = { + specify = 'false', + free = { + colours = 255, + keys = 1, + }, + }, + mirror = false, + transform = { + individual = false, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 128, + height = 128, + }, }, + map = false, }, - }, - a = { - colors = '7bpp', - specifyColors = false, - moveIndividual = false, - independent = 'plane', - mirror = 'b', - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 128, - height = 128, + a = { + independent = 'plane', + palettes = { + specify = 'false', + free = { + colours = 127, + keys = 1, + }, + }, + mirror = 'b', + transform = { + individual = false, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, }, + sizes = { + { + width = 128, + height = 128, + }, + }, + map = false, }, - }, - b = { - colors = '7bpp', - specifyColors = false, - moveIndividual = false, - independent = 'plane', - mirror = 'a', - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 128, - height = 128, + b = { + independent = 'plane', + palettes = { + specify = 'false', + free = { + colours = 127, + keys = 1, + }, + }, + mirror = 'a', + transform = { + individual = false, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 128, + height = 128, + }, }, + map = false, }, }, }, -- cgit v1.2.3-54-g00ecf