From f838d14aff724eda35f3423ac7524ac9b1484c7a Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 10 Jan 2017 18:11:47 -0300 Subject: Update graphics modes --- .../graphics/ppu_rp2c02+mmc3.lua | 1 + .../graphics/ppu_rp2c07+mmc3.lua | 1 + src/hardware_data/graphics/ppu_rp2c02+mmc2.lua | 26 ---- src/hardware_data/graphics/ppu_rp2c02+mmc3.lua | 166 +++++++++++++++++++++ src/hardware_data/graphics/ppu_rp2c02.lua | 26 ---- src/hardware_data/graphics/ppu_rp2c03+mmc2.lua | 26 ---- src/hardware_data/graphics/ppu_rp2c03+mmc3.lua | 166 +++++++++++++++++++++ src/hardware_data/graphics/ppu_rp2c03.lua | 26 ---- src/hardware_data/graphics/ppu_rp2c07+mmc2.lua | 26 ---- src/hardware_data/graphics/ppu_rp2c07+mmc3.lua | 166 +++++++++++++++++++++ src/hardware_data/graphics/ppu_rp2c07.lua | 26 ---- 11 files changed, 500 insertions(+), 156 deletions(-) create mode 120000 src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc3.lua create mode 120000 src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc3.lua create mode 100644 src/hardware_data/graphics/ppu_rp2c02+mmc3.lua create mode 100644 src/hardware_data/graphics/ppu_rp2c03+mmc3.lua create mode 100644 src/hardware_data/graphics/ppu_rp2c07+mmc3.lua diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc3.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc3.lua new file mode 120000 index 0000000..c731846 --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c02+mmc3.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c02+mmc3.lua \ No newline at end of file diff --git a/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc3.lua b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc3.lua new file mode 120000 index 0000000..5d59c89 --- /dev/null +++ b/src/gnu_and_bola_brawlers/graphics/ppu_rp2c07+mmc3.lua @@ -0,0 +1 @@ +../../hardware_data/graphics/ppu_rp2c07+mmc3.lua \ No newline at end of file diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua index a407396..8202e52 100644 --- a/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc2.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua new file mode 100644 index 0000000..9d0d5a6 --- /dev/null +++ b/src/hardware_data/graphics/ppu_rp2c02+mmc3.lua @@ -0,0 +1,166 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C02 with MMC3/MMC6 -- +-- (Memory management controller) -- + +return { + screen = { + width = 256, + height = 224, + vsync = 60.0988, + origin = { + x = 0, + y = -8, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 73728, + texels = 320, + vertices = false, + }, + colours = { + total = 64, + limit = 25, + transparent = { + sprite = colourKey, + tile = colourKey, + }, + palettes = { + { + total = 4, + type = 'tilePerPalette', + colours = 3, + layers = false, + }, + { + total = 4, + type = 'spritePerPalette', + colours = 3, + layers = false, + }, + }, + }, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, + }, + physic = false, + sprites = { + -- Limit sprites on screen -- + onScreen = 64, + -- Limit sprites on line (scanline) without flickering -- + onLine = 8, + transform = { + move = true, + rotate = false, + scale = 'flip', + shear = false, + affine = false, + }, + -- Sprite sizes in pixels -- + sizes = { + { + width = 8, + height = 8, + }, + { + width = 8, + height = 16, + }, + }, + }, + tiles = { + layers = { + { + -- Total tiles and pixels on VRAM -- + onVRAM = { + screenSections = { + all = { + Xtiles = 32, + Ytiles = 30, + tiles = 960, + pixels = 245760, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen -- + onScreen = { + screenSections = { + -- On screen section with support scrolling X and/or Y, -- + -- will be include one tile by axis -- + all = { + Xtiles = 16+1, + Ytiles = 15+1, + tiles = 240+16+14+1, + pixels = 61440, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total of unique tiles on VRAM -- + unique = 256, + screenSections = { + main = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = 'startVRAM', + }, + endSection = { + x = 'endVRAM', + y = 'endVRAM', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} diff --git a/src/hardware_data/graphics/ppu_rp2c02.lua b/src/hardware_data/graphics/ppu_rp2c02.lua index a8ca070..ea3c893 100644 --- a/src/hardware_data/graphics/ppu_rp2c02.lua +++ b/src/hardware_data/graphics/ppu_rp2c02.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua index 5bbe30b..3c593ae 100644 --- a/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc2.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua new file mode 100644 index 0000000..a1ac2a8 --- /dev/null +++ b/src/hardware_data/graphics/ppu_rp2c03+mmc3.lua @@ -0,0 +1,166 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C03/RP2C04/RP2C05 with MMC3/MMC6 -- +-- (Memory management controller) -- + +return { + screen = { + width = 256, + height = 224, + vsync = 60.0985, + origin = { + x = 0, + y = -8, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 73728, + texels = 320, + vertices = false, + }, + colours = { + total = 64, + limit = 25, + transparent = { + sprite = colourKey, + tile = colourKey, + }, + palettes = { + { + total = 4, + type = 'tilePerPalette', + colours = 3, + layers = false, + }, + { + total = 4, + type = 'spritePerPalette', + colours = 3, + layers = false, + }, + }, + }, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, + }, + physic = false, + sprites = { + -- Limit sprites on screen -- + onScreen = 64, + -- Limit sprites on line (scanline) without flickering -- + onLine = 8, + transform = { + move = true, + rotate = false, + scale = 'flip', + shear = false, + affine = false, + }, + -- Sprite sizes in pixels -- + sizes = { + { + width = 8, + height = 8, + }, + { + width = 8, + height = 16, + }, + }, + }, + tiles = { + layers = { + { + -- Total tiles and pixels on VRAM -- + onVRAM = { + screenSections = { + all = { + Xtiles = 32, + Ytiles = 30, + tiles = 960, + pixels = 245760, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen -- + onScreen = { + screenSections = { + -- On screen section with support scrolling X and/or Y, -- + -- will be include one tile by axis -- + all = { + Xtiles = 16+1, + Ytiles = 15+1, + tiles = 240+16+14+1, + pixels = 61440, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total of unique tiles on VRAM -- + unique = 256, + screenSections = { + main = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = 'startVRAM', + }, + endSection = { + x = 'endVRAM', + y = 'endVRAM', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} diff --git a/src/hardware_data/graphics/ppu_rp2c03.lua b/src/hardware_data/graphics/ppu_rp2c03.lua index 422e649..1aaf272 100644 --- a/src/hardware_data/graphics/ppu_rp2c03.lua +++ b/src/hardware_data/graphics/ppu_rp2c03.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua index d1fbf3d..ab72c0f 100644 --- a/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc2.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, diff --git a/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua b/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua new file mode 100644 index 0000000..3b6b5ef --- /dev/null +++ b/src/hardware_data/graphics/ppu_rp2c07+mmc3.lua @@ -0,0 +1,166 @@ +-- Information: -- +-- PPU (Picture processing unit) -- +-- RP2C07 with MMC3/MMC6 -- +-- (Memory management controller) -- + +return { + screen = { + width = 256, + height = 240, + vsync = 50.0070, + origin = { + x = 0, + y = 0, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 73728, + texels = 320, + vertices = false, + }, + colours = { + total = 64, + limit = 25, + transparent = { + sprite = colourKey, + tile = colourKey, + }, + palettes = { + { + total = 4, + type = 'tilePerPalette', + colours = 3, + layers = false, + }, + { + total = 4, + type = 'spritePerPalette', + colours = 3, + layers = false, + }, + }, + }, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, + }, + physic = false, + sprites = { + -- Limit sprites on screen -- + onScreen = 64, + -- Limit sprites on line (scanline) without flickering -- + onLine = 8, + transform = { + move = true, + rotate = false, + scale = 'flip', + shear = false, + affine = false, + }, + -- Sprite sizes in pixels -- + sizes = { + { + width = 8, + height = 8, + }, + { + width = 8, + height = 16, + }, + }, + }, + tiles = { + layers = { + { + -- Total tiles and pixels on VRAM -- + onVRAM = { + screenSections = { + all = { + Xtiles = 32, + Ytiles = 30, + tiles = 960, + pixels = 245760, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen -- + onScreen = { + screenSections = { + -- On screen section with support scrolling X and/or Y, -- + -- will be include one tile by axis -- + all = { + Xtiles = 16+1, + Ytiles = 15+1, + tiles = 240+16+14+1, + pixels = 61440, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total of unique tiles on VRAM -- + unique = 256, + screenSections = { + main = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = 'startVRAM', + }, + endSection = { + x = 'endVRAM', + y = 'endVRAM', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = true, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + overlay = { + optional = true, + moveSection = false, + { + startSection = { + x = 'free', + y = 'free', + }, + endSection = { + x = 'free', + y = 'free', + }, + size = { + -- Tile size in pixels -- + width = 16, + height = 16, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} diff --git a/src/hardware_data/graphics/ppu_rp2c07.lua b/src/hardware_data/graphics/ppu_rp2c07.lua index e58fce5..4e0b6d3 100644 --- a/src/hardware_data/graphics/ppu_rp2c07.lua +++ b/src/hardware_data/graphics/ppu_rp2c07.lua @@ -133,32 +133,6 @@ return { }, }, }, - overlay = { - optional = true, - moveSection = false, - { - startSection = { - x = 'free', - y = 'free', - }, - endSection = { - x = 'free', - y = 'free', - }, - size = { - -- Tile size in pixels -- - width = 16, - height = 16, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, }, }, }, -- cgit v1.2.3-54-g00ecf