From adf9e1d66133b007178d597ef40d32c7f9496a0b Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sat, 24 Dec 2016 15:57:19 -0300 Subject: Update graphics modes --- .../uze_atmega644_mode1_6x8px-tile-size.lua | 4 +- .../uze_atmega644_mode1_8x8px-tile-size.lua | 4 +- .../graphics/uze_atmega644_mode4-default.lua | 147 --------------------- src/hardware_data/graphics/uze_atmega644_mode4.lua | 2 +- .../graphics/uze_atmega644_mode4_default.lua | 147 +++++++++++++++++++++ src/hardware_data/graphics/uze_atmega644_mode5.lua | 84 +----------- .../graphics/uze_atmega644_mode5_default.lua | 97 ++++++++++++++ 7 files changed, 250 insertions(+), 235 deletions(-) delete mode 100644 src/hardware_data/graphics/uze_atmega644_mode4-default.lua create mode 100644 src/hardware_data/graphics/uze_atmega644_mode4_default.lua mode change 100644 => 120000 src/hardware_data/graphics/uze_atmega644_mode5.lua create mode 100644 src/hardware_data/graphics/uze_atmega644_mode5_default.lua (limited to 'src/hardware_data') diff --git a/src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua b/src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua index 91663b5..d847126 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua @@ -99,8 +99,8 @@ return { all = { Xtiles = 40, Ytiles = 28, - tiles = 1600, - pixels = 76800, + tiles = 1120, + pixels = 53760, }, }, tiles = 'screenSections', diff --git a/src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua b/src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua index a745a84..f07bc6c 100644 --- a/src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua @@ -99,8 +99,8 @@ return { all = { Xtiles = 30, Ytiles = 28, - tiles = 900, - pixels = 57600, + tiles = 840, + pixels = 53760, }, }, tiles = 'screenSections', diff --git a/src/hardware_data/graphics/uze_atmega644_mode4-default.lua b/src/hardware_data/graphics/uze_atmega644_mode4-default.lua deleted file mode 100644 index a5f2eb7..0000000 --- a/src/hardware_data/graphics/uze_atmega644_mode4-default.lua +++ /dev/null @@ -1,147 +0,0 @@ --- Information: -- --- Video Mode 4 (official) -- --- -- - --- Sites: --- http://uzebox.org/wiki/index.php?title=Video_Modes --- https://github.com/Uzebox/uzebox --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode4/videoMode4.def.h --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode4/videomode4.s - -return { - screen = { - width = 288, - height = 224, - vsync = 60, - origin = { - x = 0, - y = 0, - }, - -- Total of unique texels, pixels and vertices on VRAM -- - pixels = '?', - texels = '?', - vertices = false, - }, - colours = { - total = 256, - limit = false, - transparent = { - sprite = false, - tile = false, - }, - palettes = false, - }, - meshes = false, - shaders = { - api = false, - version = false, - fragment = false, - vectex = false, - geometry = false, - tessellation = false, - }, - physic = false, - sprites = false, - tiles = { - layers = { - { - -- Total tiles and pixels on VRAM -- - onVRAM = { - screenSections = { - all = { - Xtiles = 32, - Ytiles = 32, - tiles = 1024, - pixels = 262144, - }, - }, - 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 = false, - Ytiles = false, - tiles = 198+18+11+1+72, - pixels = 50688+4608, - main = { - Xtiles = 18+1, - Ytiles = 11+1, - tiles = 198+18+11+1, - pixels = 50688, - }, - text = { - Xtiles = 36, - Ytiles = 2, - tiles = 72, - pixels = 4608, - }, - }, - tiles = 'screenSections', - pixels = 'screenSections', - }, - -- Total of unique tiles on VRAM -- - unique = '?', - screenSections = { - mirror = false, - main = { - optional = false, - moveSection = true, - { - 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, - }, - }, - }, - text = { - optional = false, - moveSection = false, - { - startSection = { - x = 'startVRAM', - y = -272, - }, - endSection = { - x = 'endScreen', - y = 'endScreen', - }, - size = { - -- Tile size in pixels -- - width = 8, - height = 8, - }, - transform = { - move = false, - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} diff --git a/src/hardware_data/graphics/uze_atmega644_mode4.lua b/src/hardware_data/graphics/uze_atmega644_mode4.lua index defcefe..0f6be98 120000 --- a/src/hardware_data/graphics/uze_atmega644_mode4.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode4.lua @@ -1 +1 @@ -uze_atmega644_mode4-default.lua \ No newline at end of file +uze_atmega644_mode4_default.lua \ No newline at end of file diff --git a/src/hardware_data/graphics/uze_atmega644_mode4_default.lua b/src/hardware_data/graphics/uze_atmega644_mode4_default.lua new file mode 100644 index 0000000..a5f2eb7 --- /dev/null +++ b/src/hardware_data/graphics/uze_atmega644_mode4_default.lua @@ -0,0 +1,147 @@ +-- Information: -- +-- Video Mode 4 (official) -- +-- -- + +-- Sites: +-- http://uzebox.org/wiki/index.php?title=Video_Modes +-- https://github.com/Uzebox/uzebox +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode4/videoMode4.def.h +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode4/videomode4.s + +return { + screen = { + width = 288, + height = 224, + vsync = 60, + origin = { + x = 0, + y = 0, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = '?', + texels = '?', + vertices = false, + }, + colours = { + total = 256, + limit = false, + transparent = { + sprite = false, + tile = false, + }, + palettes = false, + }, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, + }, + physic = false, + sprites = false, + tiles = { + layers = { + { + -- Total tiles and pixels on VRAM -- + onVRAM = { + screenSections = { + all = { + Xtiles = 32, + Ytiles = 32, + tiles = 1024, + pixels = 262144, + }, + }, + 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 = false, + Ytiles = false, + tiles = 198+18+11+1+72, + pixels = 50688+4608, + main = { + Xtiles = 18+1, + Ytiles = 11+1, + tiles = 198+18+11+1, + pixels = 50688, + }, + text = { + Xtiles = 36, + Ytiles = 2, + tiles = 72, + pixels = 4608, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total of unique tiles on VRAM -- + unique = '?', + screenSections = { + mirror = false, + main = { + optional = false, + moveSection = true, + { + 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, + }, + }, + }, + text = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = -272, + }, + endSection = { + x = 'endScreen', + y = 'endScreen', + }, + size = { + -- Tile size in pixels -- + width = 8, + height = 8, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua deleted file mode 100644 index 8ccc369..0000000 --- a/src/hardware_data/graphics/uze_atmega644_mode5.lua +++ /dev/null @@ -1,83 +0,0 @@ -return { - screen = { - { - width = 240, - height = 224, - refresh = 60, - origin = { - x = 0, - y = 0, - }, - }, - pixels = 12288, - texels = 256, - vertices = false, - }, - colours = { - total = 256, - limit = false, - background = true, - transparent = { - sprite = false, - tile = false, - }, - palettes = false, - }, - meshes = false, - shaders = { - api = false, - version = false, - fragment = false, - vectex = false, - geometry = false, - tessellation = false, - }, - physic = false, - sprites = false, - tiles = { - layers = { - { - total = { - x = 40, - y = 28, - 1120, - }, - onScreen = { - { - 1120, - }, - }, - unique = 256, - screenSections = { - mirror = false, - main = { - optional = false, - { - startCut = { - x = 0, - y = 0, - }, - endCut = { - x = 0, - y = 0, - }, - sizes = { - { - width = 6, - height = 8, - }, - }, - transform = { - move = 'simulate', - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} diff --git a/src/hardware_data/graphics/uze_atmega644_mode5.lua b/src/hardware_data/graphics/uze_atmega644_mode5.lua new file mode 120000 index 0000000..5adf5c9 --- /dev/null +++ b/src/hardware_data/graphics/uze_atmega644_mode5.lua @@ -0,0 +1 @@ +uze_atmega644_mode5_default.lua \ No newline at end of file diff --git a/src/hardware_data/graphics/uze_atmega644_mode5_default.lua b/src/hardware_data/graphics/uze_atmega644_mode5_default.lua new file mode 100644 index 0000000..4bd6112 --- /dev/null +++ b/src/hardware_data/graphics/uze_atmega644_mode5_default.lua @@ -0,0 +1,97 @@ +-- Information: -- +-- Video Mode 5 (official) -- +-- -- + +-- Sites: +-- http://uzebox.org/wiki/index.php?title=Video_Modes +-- https://github.com/Uzebox/uzebox +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode5/videoMode5.def.h +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode5/videoMode5.s + +return { + screen = { + width = 240, + height = 224, + vsync = 60, + origin = { + x = 0, + y = 0, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 12288, + texels = 256, + vertices = false, + }, + colours = { + total = 256, + limit = false, + transparent = { + sprite = false, + tile = false, + }, + palettes = false, + }, + meshes = false, + shaders = { + api = false, + version = false, + fragment = false, + vectex = false, + geometry = false, + tessellation = false, + }, + physic = false, + sprites = false, + tiles = { + layers = { + { + -- Total tiles and pixels on VRAM -- + onVRAM = { + screenSections = { + all = { + Xtiles = 40, + Ytiles = 28, + tiles = 1120, + pixels = 53760, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen (is same as VRAM) -- + onScreen = 'vram', + -- Total of unique tiles on VRAM -- + unique = 256, + screenSections = { + mirror = false, + main = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = 'startVRAM', + }, + endSection = { + x = 'endVRAM', + y = 'endVRAM', + }, + size = { + -- Tile size in pixels -- + width = 6, + height = 8, + }, + transform = { + move = false, + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} -- cgit v1.2.3-54-g00ecf