From f22f5fc0bc0faea3d4948bbe6c526871f9efdbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Fri, 23 Dec 2016 12:48:40 -0300 Subject: Update graphics modes --- src/hardware_data/graphics/uze_atmega644_mode1.lua | 2 +- .../uze_atmega644_mode1_6x8px-tile-size.lua | 147 +++++++++++++++++++++ .../uze_atmega644_mode1_8x8px-tile-size.lua | 147 +++++++++++++++++++++ .../uze_atmega644_mode1_tile-size-6x8px.lua | 147 --------------------- .../uze_atmega644_mode1_tile-size-8x8px.lua | 147 --------------------- 5 files changed, 295 insertions(+), 295 deletions(-) create mode 100644 src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua create mode 100644 src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua delete mode 100644 src/hardware_data/graphics/uze_atmega644_mode1_tile-size-6x8px.lua delete mode 100644 src/hardware_data/graphics/uze_atmega644_mode1_tile-size-8x8px.lua diff --git a/src/hardware_data/graphics/uze_atmega644_mode1.lua b/src/hardware_data/graphics/uze_atmega644_mode1.lua index b2b9224..5285df1 120000 --- a/src/hardware_data/graphics/uze_atmega644_mode1.lua +++ b/src/hardware_data/graphics/uze_atmega644_mode1.lua @@ -1 +1 @@ -uze_atmega644_mode1_tile-size-6x8px.lua \ No newline at end of file +uze_atmega644_mode1_6x8px-tile-size.lua \ No newline at end of file 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 new file mode 100644 index 0000000..d9c970f --- /dev/null +++ b/src/hardware_data/graphics/uze_atmega644_mode1_6x8px-tile-size.lua @@ -0,0 +1,147 @@ +-- Information: -- +-- Video Mode 1 (official) -- +-- -- +-- Vertical tiles on screen and VRAM, -- +-- can be changed by compilation, -- +-- but is not recomended. -- +-- Default value is: -- +-- {VRAM,SCREEN}_TILES_V=224/TILE_HEIGHT -- +-- -- +-- Horizontal tiles on screen and VRAM, -- +-- can not be changed by compilation. -- +-- Default value is: -- +-- {VRAM,SCREEN}_TILES_H=40 if TILE_WIDTH=6 -- +-- {VRAM,SCREEN}_TILES_H=30 if TILE_WIDTH=8 -- +-- -- +-- Tile width size in pixels, -- +-- can be changed by compilation. -- +-- Default value is: -- +-- TILE_WIDTH=6 -- +-- Available value is: -- +-- TILE_WIDTH=6 or TILE_WIDTH=8 -- +-- -- +-- Tile height size in pixels, -- +-- can be changed by compilation, -- +-- more that 224 pixels is not recommended. -- +-- Default value is: -- +-- TILE_HEIGHT=8 -- +-- Available value is: -- +-- TILE_WIDTH=1 to TILE_WIDTH=224 -- +-- -- +-- Vertical synchronization, -- +-- can be changed by compilation. -- +-- Default value is: -- +-- MODE1_FAST_VSYNC=1 (60Mhz) -- +-- Available value is: -- +-- MODE1_FAST_VSYNC=1 (60Mhz) -- +-- MODE1_FAST_VSYNC=0 (30Mhz) -- +-- -- +-- Only one screen section support. -- +-- -- +-- Numbers of video lines to render, -- +-- can be changed by compilation, -- +-- but is not recommended, changes the -- +-- CPU cyles. -- +-- Default value is: -- +-- FRAME_LINES=SCREEN_TILES_V*TILE_HEIGHT -- +-- -- +-- Fist render line is used to adjust -- +-- vertical centering if the value -- +-- FRAME_LINES is changed. -- +-- Can be changed by compilation. -- +-- Default value is: -- +-- FIRST_RENDER_LINE=20 -- + +-- Sites: +-- http://uzebox.org/wiki/index.php?title=Video_Modes +-- https://github.com/Uzebox/uzebox +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.def.h +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.s + +return { + screen = { + width = 240, + height = 224, + vsync = 60, + origin = { + x = 0, + y = 0, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 3145728, + texels = 65536, + 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 = 1600, + pixels = 76800, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen (is same as VRAM) -- + onScreen = 'vram', + -- Total of unique tiles on VRAM -- + unique = 65536, + 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 = 'simulate', + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} 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 new file mode 100644 index 0000000..3520733 --- /dev/null +++ b/src/hardware_data/graphics/uze_atmega644_mode1_8x8px-tile-size.lua @@ -0,0 +1,147 @@ +-- Information: -- +-- Video Mode 1 (official) -- +-- -- +-- Vertical tiles on screen and VRAM, -- +-- can be changed by compilation, -- +-- but is not recomended. -- +-- Default value is: -- +-- {VRAM,SCREEN}_TILES_V=224/TILE_HEIGHT -- +-- -- +-- Horizontal tiles on screen and VRAM, -- +-- can not be changed by compilation. -- +-- Default value is: -- +-- {VRAM,SCREEN}_TILES_H=40 if TILE_WIDTH=6 -- +-- {VRAM,SCREEN}_TILES_H=30 if TILE_WIDTH=8 -- +-- -- +-- Tile width size in pixels, -- +-- can be changed by compilation. -- +-- Default value is: -- +-- TILE_WIDTH=6 -- +-- Available value is: -- +-- TILE_WIDTH=6 or TILE_WIDTH=8 -- +-- -- +-- Tile height size in pixels, -- +-- can be changed by compilation, -- +-- more that 224 pixels is not recommended. -- +-- Default value is: -- +-- TILE_HEIGHT=8 -- +-- Available value is: -- +-- TILE_WIDTH=1 to TILE_WIDTH=224 -- +-- -- +-- Vertical synchronization, -- +-- can be changed by compilation. -- +-- Default value is: -- +-- MODE1_FAST_VSYNC=1 (60Mhz) -- +-- Available value is: -- +-- MODE1_FAST_VSYNC=1 (60Mhz) -- +-- MODE1_FAST_VSYNC=0 (30Mhz) -- +-- -- +-- Only one screen section support. -- +-- -- +-- Numbers of video lines to render, -- +-- can be changed by compilation, -- +-- but is not recommended, changes the -- +-- CPU cyles. -- +-- Default value is: -- +-- FRAME_LINES=SCREEN_TILES_V*TILE_HEIGHT -- +-- -- +-- Fist render line is used to adjust -- +-- vertical centering if the value -- +-- FRAME_LINES is changed. -- +-- Can be changed by compilation. -- +-- Default value is: -- +-- FIRST_RENDER_LINE=20 -- + +-- Sites: +-- http://uzebox.org/wiki/index.php?title=Video_Modes +-- https://github.com/Uzebox/uzebox +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.def.h +-- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.s + +return { + screen = { + width = 240, + height = 224, + vsync = 60, + origin = { + x = 0, + y = 0, + }, + -- Total of unique texels, pixels and vertices on VRAM -- + pixels = 4194304, + texels = 65536, + 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 = 30, + Ytiles = 28, + tiles = 900, + pixels = 57600, + }, + }, + tiles = 'screenSections', + pixels = 'screenSections', + }, + -- Total tiles and pixels on screen (is same as VRAM) -- + onScreen = 'vram', + -- Total of unique tiles on VRAM -- + unique = 65536, + screenSections = { + mirror = false, + main = { + optional = false, + moveSection = false, + { + startSection = { + x = 'startVRAM', + y = 'startVRAM', + }, + endSection = { + x = 'endVRAM', + y = 'endVRAM', + }, + size = { + -- Tile size in pixels -- + width = 8, + height = 8, + }, + transform = { + move = 'simulate', + rotate = false, + scale = false, + shear = false, + affine = false, + }, + }, + }, + }, + }, + }, + }, +} diff --git a/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-6x8px.lua b/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-6x8px.lua deleted file mode 100644 index d9c970f..0000000 --- a/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-6x8px.lua +++ /dev/null @@ -1,147 +0,0 @@ --- Information: -- --- Video Mode 1 (official) -- --- -- --- Vertical tiles on screen and VRAM, -- --- can be changed by compilation, -- --- but is not recomended. -- --- Default value is: -- --- {VRAM,SCREEN}_TILES_V=224/TILE_HEIGHT -- --- -- --- Horizontal tiles on screen and VRAM, -- --- can not be changed by compilation. -- --- Default value is: -- --- {VRAM,SCREEN}_TILES_H=40 if TILE_WIDTH=6 -- --- {VRAM,SCREEN}_TILES_H=30 if TILE_WIDTH=8 -- --- -- --- Tile width size in pixels, -- --- can be changed by compilation. -- --- Default value is: -- --- TILE_WIDTH=6 -- --- Available value is: -- --- TILE_WIDTH=6 or TILE_WIDTH=8 -- --- -- --- Tile height size in pixels, -- --- can be changed by compilation, -- --- more that 224 pixels is not recommended. -- --- Default value is: -- --- TILE_HEIGHT=8 -- --- Available value is: -- --- TILE_WIDTH=1 to TILE_WIDTH=224 -- --- -- --- Vertical synchronization, -- --- can be changed by compilation. -- --- Default value is: -- --- MODE1_FAST_VSYNC=1 (60Mhz) -- --- Available value is: -- --- MODE1_FAST_VSYNC=1 (60Mhz) -- --- MODE1_FAST_VSYNC=0 (30Mhz) -- --- -- --- Only one screen section support. -- --- -- --- Numbers of video lines to render, -- --- can be changed by compilation, -- --- but is not recommended, changes the -- --- CPU cyles. -- --- Default value is: -- --- FRAME_LINES=SCREEN_TILES_V*TILE_HEIGHT -- --- -- --- Fist render line is used to adjust -- --- vertical centering if the value -- --- FRAME_LINES is changed. -- --- Can be changed by compilation. -- --- Default value is: -- --- FIRST_RENDER_LINE=20 -- - --- Sites: --- http://uzebox.org/wiki/index.php?title=Video_Modes --- https://github.com/Uzebox/uzebox --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.def.h --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.s - -return { - screen = { - width = 240, - height = 224, - vsync = 60, - origin = { - x = 0, - y = 0, - }, - -- Total of unique texels, pixels and vertices on VRAM -- - pixels = 3145728, - texels = 65536, - 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 = 1600, - pixels = 76800, - }, - }, - tiles = 'screenSections', - pixels = 'screenSections', - }, - -- Total tiles and pixels on screen (is same as VRAM) -- - onScreen = 'vram', - -- Total of unique tiles on VRAM -- - unique = 65536, - 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 = 'simulate', - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} diff --git a/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-8x8px.lua b/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-8x8px.lua deleted file mode 100644 index 3520733..0000000 --- a/src/hardware_data/graphics/uze_atmega644_mode1_tile-size-8x8px.lua +++ /dev/null @@ -1,147 +0,0 @@ --- Information: -- --- Video Mode 1 (official) -- --- -- --- Vertical tiles on screen and VRAM, -- --- can be changed by compilation, -- --- but is not recomended. -- --- Default value is: -- --- {VRAM,SCREEN}_TILES_V=224/TILE_HEIGHT -- --- -- --- Horizontal tiles on screen and VRAM, -- --- can not be changed by compilation. -- --- Default value is: -- --- {VRAM,SCREEN}_TILES_H=40 if TILE_WIDTH=6 -- --- {VRAM,SCREEN}_TILES_H=30 if TILE_WIDTH=8 -- --- -- --- Tile width size in pixels, -- --- can be changed by compilation. -- --- Default value is: -- --- TILE_WIDTH=6 -- --- Available value is: -- --- TILE_WIDTH=6 or TILE_WIDTH=8 -- --- -- --- Tile height size in pixels, -- --- can be changed by compilation, -- --- more that 224 pixels is not recommended. -- --- Default value is: -- --- TILE_HEIGHT=8 -- --- Available value is: -- --- TILE_WIDTH=1 to TILE_WIDTH=224 -- --- -- --- Vertical synchronization, -- --- can be changed by compilation. -- --- Default value is: -- --- MODE1_FAST_VSYNC=1 (60Mhz) -- --- Available value is: -- --- MODE1_FAST_VSYNC=1 (60Mhz) -- --- MODE1_FAST_VSYNC=0 (30Mhz) -- --- -- --- Only one screen section support. -- --- -- --- Numbers of video lines to render, -- --- can be changed by compilation, -- --- but is not recommended, changes the -- --- CPU cyles. -- --- Default value is: -- --- FRAME_LINES=SCREEN_TILES_V*TILE_HEIGHT -- --- -- --- Fist render line is used to adjust -- --- vertical centering if the value -- --- FRAME_LINES is changed. -- --- Can be changed by compilation. -- --- Default value is: -- --- FIRST_RENDER_LINE=20 -- - --- Sites: --- http://uzebox.org/wiki/index.php?title=Video_Modes --- https://github.com/Uzebox/uzebox --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.def.h --- https://raw.githubusercontent.com/Uzebox/uzebox/master/kernel/videoMode1/videoMode1.s - -return { - screen = { - width = 240, - height = 224, - vsync = 60, - origin = { - x = 0, - y = 0, - }, - -- Total of unique texels, pixels and vertices on VRAM -- - pixels = 4194304, - texels = 65536, - 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 = 30, - Ytiles = 28, - tiles = 900, - pixels = 57600, - }, - }, - tiles = 'screenSections', - pixels = 'screenSections', - }, - -- Total tiles and pixels on screen (is same as VRAM) -- - onScreen = 'vram', - -- Total of unique tiles on VRAM -- - unique = 65536, - screenSections = { - mirror = false, - main = { - optional = false, - moveSection = false, - { - startSection = { - x = 'startVRAM', - y = 'startVRAM', - }, - endSection = { - x = 'endVRAM', - y = 'endVRAM', - }, - size = { - -- Tile size in pixels -- - width = 8, - height = 8, - }, - transform = { - move = 'simulate', - rotate = false, - scale = false, - shear = false, - affine = false, - }, - }, - }, - }, - }, - }, - }, -} -- cgit v1.2.3