From 17244e031b4dfda88328e783fec558d21071bfcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 8 Dec 2016 18:05:39 -0300 Subject: Update mali400.lua and ppu_rp2c02.lua --- .../scripts/load/graphics/mali400.lua | 131 ++++++++++----- .../scripts/load/graphics/ppu_rp2c02.lua | 182 +++++++++++++-------- .../scripts/load/graphics/mali400.lua | 131 ++++++++++----- .../scripts/load/graphics/ppu_rp2c02.lua | 182 +++++++++++++-------- 4 files changed, 398 insertions(+), 228 deletions(-) diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/mali400.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/mali400.lua index 2ff875d..3fbad18 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/mali400.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/mali400.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + fhd = { width = 1920, height = 1080, fps = 30, @@ -9,7 +9,7 @@ return { y = 0, }, }, - big = { + uhd4k = { width = 3840, height = 2160, fps = 30, @@ -19,54 +19,99 @@ return { }, }, }, - colors = { - '32bpp', + colours = { + total = '32bpp', limit = false, + background = '24bpp', transparent = 'alpha', }, - mesh = true, - api = 'opengl_es_2_0', - shader = { - true, - fragment = true, + meshes = true, + shaders = { + api = 'glsl_es', + version = '1.0.17', + fragment = true, + vectex = true, + geometry = false, + tessellation = false, }, - physic = true, - sprite = { - true, - colors = '32bpp', - limits = { - false, - screen = false, - line = false, - }, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 'free', - height = 'free', + physic = true, + sprites = { + onScreen = false, + onLine = false, + palettes = { + { + colours = '24bpp', + keys = '8bpp', }, + }, + animation = true, + transform = { + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 'free', + height = 'free', }, }, }, - tile = { - layers = 'free', - { - colors = 'free', - specifyColors = true, - moveIndividual = true, - independent = true, - mirror = true, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 'free', - height = 'free', + tiles = { + layers = { + free = { + independent = true, + palettes = { + specify = true, + { + colours = '24bpp', + keys = '8bpp', + }, + }, + transform = { + individual = true, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 'free', + height = 'free', + }, + }, + maps = { + { + width = 'free', + height = 'free', + }, + }, + mirror = { + singleScreen = true, + lShapedUpLeft = true, + lShapedUpRight = true, + lShapedDownLeft = true, + lShapedDownRight = true, + doubleScreensHorizontal = true, + doubleScreensVertical = true, + doubleScreensDiagonal = true, + tripleScreensHorizontalUpLeft = true, + tripleScreensHorizontalUpRight = true, + tripleScreensHorizontalDownLeft = true, + tripleScreensHorizontalDownRight = true, + tripleScreensVerticalUpLeft = true, + tripleScreensVerticalUpRight = true, + tripleScreensVerticalDownLeft = true, + tripleScreensVerticalDownRight = true, + tripleScreensDiagonalUpLeft = true, + tripleScreensDiagonalUpRight = true, + tripleScreensDiagonalDownLeft = true, + tripleScreensDiagonalDownRight = true, + quadrupleScreens = true, }, }, }, diff --git a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/ppu_rp2c02.lua b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/ppu_rp2c02.lua index 5e3da47..98fc647 100644 --- a/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/ppu_rp2c02.lua +++ b/src/gnu_and_bola_-_the_libre_beat_em_up_game/scripts/load/graphics/ppu_rp2c02.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 224, fps = 29.97, @@ -9,7 +9,7 @@ return { y = -8, }, }, - pal = { + pal = { width = 256, height = 240, fps = 25, @@ -19,87 +19,127 @@ return { }, }, }, - colors = { - 54, - limit = { - background = 1, - tiles = { - 3, - 3, - 3, - 3, - }, - sprites = { - 3, - 3, - 3, - 3, - }, - }, + colours = { + total = 54, + limit = 25, + background = 1, transparent = 'colorKey', }, - 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 = '2bpp', - limits = { - true, - screen = 64, - line = 8, + physic = false, + sprites = { + onScreen = 64, + onLine = 8, + palettes = { + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { + animation = true, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + sizes = { + { width = 8, height = 8, }, - bigH = { + { width = 8, height = 16, }, }, }, - tile = { - layers = 1, - a = { - colors = '2bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = { - 'horizontal', - 'vertical', - 'singleScreen', - 'fourScreens', - 'diagonal', - 'lShaped' - 'threeScreenHorizontal', - 'threeScreenVertical', - 'threeScreenDiagonal', - }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = true, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, }, - }, - map = { - default = { - width = 32, - height = 32, + transform = { + individual = true, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + sizes = { + { + width = 8, + height = 8, + }, + }, + maps = { + { + width = 32, + height = 32, + }, + }, + mirror = { + singleScreen = true, + lShapedUpLeft = true, + lShapedUpRight = true, + lShapedDownLeft = true, + lShapedDownRight = true, + doubleScreensHorizontal = true, + doubleScreensVertical = true, + doubleScreensDiagonal = true, + tripleScreensHorizontalUpLeft = true, + tripleScreensHorizontalUpRight = true, + tripleScreensHorizontalDownLeft = true, + tripleScreensHorizontalDownRight = true, + tripleScreensVerticalUpLeft = true, + tripleScreensVerticalUpRight = true, + tripleScreensVerticalDownLeft = true, + tripleScreensVerticalDownRight = true, + tripleScreensDiagonalUpLeft = true, + tripleScreensDiagonalUpRight = true, + tripleScreensDiagonalDownLeft = true, + tripleScreensDiagonalDownRight = true, + quadrupleScreens = true, }, }, }, diff --git a/src/information_only/scripts/load/graphics/mali400.lua b/src/information_only/scripts/load/graphics/mali400.lua index 2ff875d..3fbad18 100644 --- a/src/information_only/scripts/load/graphics/mali400.lua +++ b/src/information_only/scripts/load/graphics/mali400.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + fhd = { width = 1920, height = 1080, fps = 30, @@ -9,7 +9,7 @@ return { y = 0, }, }, - big = { + uhd4k = { width = 3840, height = 2160, fps = 30, @@ -19,54 +19,99 @@ return { }, }, }, - colors = { - '32bpp', + colours = { + total = '32bpp', limit = false, + background = '24bpp', transparent = 'alpha', }, - mesh = true, - api = 'opengl_es_2_0', - shader = { - true, - fragment = true, + meshes = true, + shaders = { + api = 'glsl_es', + version = '1.0.17', + fragment = true, + vectex = true, + geometry = false, + tessellation = false, }, - physic = true, - sprite = { - true, - colors = '32bpp', - limits = { - false, - screen = false, - line = false, - }, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 'free', - height = 'free', + physic = true, + sprites = { + onScreen = false, + onLine = false, + palettes = { + { + colours = '24bpp', + keys = '8bpp', }, + }, + animation = true, + transform = { + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 'free', + height = 'free', }, }, }, - tile = { - layers = 'free', - { - colors = 'free', - specifyColors = true, - moveIndividual = true, - independent = true, - mirror = true, - rotate = true, - scale = true, - shear = true, - affine = true, - size = { - default = { - width = 'free', - height = 'free', + tiles = { + layers = { + free = { + independent = true, + palettes = { + specify = true, + { + colours = '24bpp', + keys = '8bpp', + }, + }, + transform = { + individual = true, + move = true, + rotate = true, + scale = true, + shear = true, + affine = true, + }, + sizes = { + { + width = 'free', + height = 'free', + }, + }, + maps = { + { + width = 'free', + height = 'free', + }, + }, + mirror = { + singleScreen = true, + lShapedUpLeft = true, + lShapedUpRight = true, + lShapedDownLeft = true, + lShapedDownRight = true, + doubleScreensHorizontal = true, + doubleScreensVertical = true, + doubleScreensDiagonal = true, + tripleScreensHorizontalUpLeft = true, + tripleScreensHorizontalUpRight = true, + tripleScreensHorizontalDownLeft = true, + tripleScreensHorizontalDownRight = true, + tripleScreensVerticalUpLeft = true, + tripleScreensVerticalUpRight = true, + tripleScreensVerticalDownLeft = true, + tripleScreensVerticalDownRight = true, + tripleScreensDiagonalUpLeft = true, + tripleScreensDiagonalUpRight = true, + tripleScreensDiagonalDownLeft = true, + tripleScreensDiagonalDownRight = true, + quadrupleScreens = true, }, }, }, diff --git a/src/information_only/scripts/load/graphics/ppu_rp2c02.lua b/src/information_only/scripts/load/graphics/ppu_rp2c02.lua index 5e3da47..98fc647 100644 --- a/src/information_only/scripts/load/graphics/ppu_rp2c02.lua +++ b/src/information_only/scripts/load/graphics/ppu_rp2c02.lua @@ -1,6 +1,6 @@ return { - screen = { - default = { + screen = { + ntsc = { width = 256, height = 224, fps = 29.97, @@ -9,7 +9,7 @@ return { y = -8, }, }, - pal = { + pal = { width = 256, height = 240, fps = 25, @@ -19,87 +19,127 @@ return { }, }, }, - colors = { - 54, - limit = { - background = 1, - tiles = { - 3, - 3, - 3, - 3, - }, - sprites = { - 3, - 3, - 3, - 3, - }, - }, + colours = { + total = 54, + limit = 25, + background = 1, transparent = 'colorKey', }, - 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 = '2bpp', - limits = { - true, - screen = 64, - line = 8, + physic = false, + sprites = { + onScreen = 64, + onLine = 8, + palettes = { + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { + animation = true, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + sizes = { + { width = 8, height = 8, }, - bigH = { + { width = 8, height = 16, }, }, }, - tile = { - layers = 1, - a = { - colors = '2bpp', - specifyColors = false, - moveIndividual = false, - independent = false, - mirror = { - 'horizontal', - 'vertical', - 'singleScreen', - 'fourScreens', - 'diagonal', - 'lShaped' - 'threeScreenHorizontal', - 'threeScreenVertical', - 'threeScreenDiagonal', - }, - rotate = false, - scale = false, - shear = false, - affine = false, - size = { - default = { - width = 8, - height = 8, + tiles = { + layers = { + { + independent = false, + palettes = { + specify = true, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, + { + colours = 3, + keys = 1, + }, }, - }, - map = { - default = { - width = 32, - height = 32, + transform = { + individual = true, + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + sizes = { + { + width = 8, + height = 8, + }, + }, + maps = { + { + width = 32, + height = 32, + }, + }, + mirror = { + singleScreen = true, + lShapedUpLeft = true, + lShapedUpRight = true, + lShapedDownLeft = true, + lShapedDownRight = true, + doubleScreensHorizontal = true, + doubleScreensVertical = true, + doubleScreensDiagonal = true, + tripleScreensHorizontalUpLeft = true, + tripleScreensHorizontalUpRight = true, + tripleScreensHorizontalDownLeft = true, + tripleScreensHorizontalDownRight = true, + tripleScreensVerticalUpLeft = true, + tripleScreensVerticalUpRight = true, + tripleScreensVerticalDownLeft = true, + tripleScreensVerticalDownRight = true, + tripleScreensDiagonalUpLeft = true, + tripleScreensDiagonalUpRight = true, + tripleScreensDiagonalDownLeft = true, + tripleScreensDiagonalDownRight = true, + quadrupleScreens = true, }, }, }, -- cgit v1.2.3