Skip to content

Commit

Permalink
Total redesign
Browse files Browse the repository at this point in the history 
Layout has redesigned. It’s currently a 4x3 only layout. Uses new helpers, shaders, and shuffle modules. Has a new intro layout.
  • Loading branch information
@keilmillerjr
keilmillerjr committed Jan 7, 2019
1 parent ee0a4aa commit 32360d7
Show file tree
Hide file tree
Showing 16 changed files with 458 additions and 401 deletions.
Binary file added Roboto-Allcaps.ttf
View file
Binary file not shown.
Binary file added Roboto-Bold.ttf
View file
Binary file not shown.
Binary file removed VAG Rounded Bold.ttf
View file
Binary file not shown.
202 changes: 80 additions & 122 deletions config.nut
View file
Original file line number Diff line number Diff line change
@@ -1,142 +1,100 @@
local flw = fe.layout.width;
local flh = fe.layout.height;
local overscan = per(2, flh);
::flw <- fe.layout.width;
::flh <- fe.layout.height;
::overscan <- per(2, flh);

fe.layout.font = "VAG Rounded Bold";
fe.layout.font = "Roboto-Bold";

::config <- {
snap = {
x = 0,
containerParent = {
x = (flw - matchAspect(4, 3, "height", flh)) / 2,
y = 0,
width = flw,
width = matchAspect(4, 3, "height", flh),
height = flh,
},
marquee = {
container = {
x = 0,
y = 0,
width = flw,
height = per(50, flh),
rgb = [0, 0, 0],
},
marqueeRed = {
rgb = [226, 52, 16],
},
container = {
x = ((flw - matchAspect(4, 3, "height", flh)) / 2) + overscan,
y = overscan,
width = matchAspect(4, 3, "height", flh) - (overscan * 2),
height = per(50, flh) - (overscan * 2),
width = matchAspect(4, 3, "height", flh),
height = flh,
},
artwork_radius = overscan / 2,
}
};

config.video <- {
x = 0,
y = 0,
width = config.container.width,
height = config.container.height,
};

config.display <- {
config.marquee <- {
x = 0,
y = 0,
width = per(25, config.container.width),
height = per(10, config.container.height),
width = config.container.width,
height = per(40, config.container.height),
rgb = [0, 0, 0],
alpha = 75,
};

config.artwork <- [];

config.artwork.push({
x = overscan + (per(25, config.marquee.width-(overscan*2)) / 2) - (matchAspect(4, 5, "height", config.marquee.height - (overscan * 2)) / 2)
y = overscan,
width = matchAspect(4, 5, "height", config.marquee.height - (overscan * 2)),
height = config.marquee.height - (overscan * 2),
});

config.artwork.push({
x = config.artwork[0].x + per(25, config.marquee.width-(overscan*2)),
y = config.artwork[0].y,
width = config.artwork[0].width,
height = config.artwork[0].height,
});

config.artwork.push({
x = config.artwork[1].x + per(25, config.marquee.width-(overscan*2)),
y = config.artwork[0].y,
width = config.artwork[0].width,
height = config.artwork[0].height,
});

config.artwork.push({
x = config.artwork[2].x + per(25, config.marquee.width-(overscan*2)),
y = config.artwork[0].y,
width = config.artwork[0].width,
height = config.artwork[0].height,
});

config.artworkRadius <- overscan / 2;

config.gameTitle <- {
x = overscan,
y = config.container.height - per(12, config.container.height - (overscan*2)) - (overscan*1.5),
width = per(62.5, config.container.width - (overscan*3)),
height = per(6, config.container.height - (overscan*2)),
align = Align.Left,
nomargin = true,
}

config.title <- {
x = per(25, config.container.width),
y = 0,
width = per(50, config.container.width),
height = per(10, config.container.height),
align = Align.Centre,
config.gameInfo <- {
x = overscan,
y = config.container.height - per(6, config.container.height - (overscan*2)) - overscan,
width = per(62.5, config.container.width - (overscan*3)),
height = per(6, config.container.height - (overscan*2)),
align = Align.Left,
}

config.filter <- {
x = per(75, config.container.width),
y = 0,
width = per(25, config.container.width),
height = per(10, config.container.height),
config.displayName <- {
x = overscan + per(62.5, config.container.width - (overscan*3)),
y = config.container.height - per(12, config.container.height - (overscan*2)) - (overscan*1.5),
width = per(37.5, config.container.width - (overscan*3)),
height = per(6, config.container.height - (overscan*2)),
align = Align.Right,
nomargin = true,
}

config.artwork <- [
{
x = (per(25, config.container.width) - matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2))) / 2,
y = per(10, config.container.height) + overscan,
width = matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2)),
height = per(80, config.container.height) - (overscan * 2),
},
{
x = per(25, config.container.width) + ((per(25, config.container.width) - matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2))) / 2),
y = per(10, config.container.height) + overscan,
width = matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2)),
height = per(80, config.container.height) - (overscan * 2),
},
{
x = per(50, config.container.width) + ((per(25, config.container.width) - matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2))) / 2),
y = per(10, config.container.height) + overscan,
width = matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2)),
height = per(80, config.container.height) - (overscan * 2),
},
{
x = per(75, config.container.width) + ((per(25, config.container.width) - matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2))) / 2),
y = per(10, config.container.height) + overscan,
width = matchAspect(4, 5, "height", per(80, config.container.height) - (overscan * 2)),
height = per(80, config.container.height) - (overscan * 2),
},
]

config.favorite <- [
{
x = config.artwork[0].x,
y = config.artwork[0].y,
width = per(20, config.artwork[0].width),
height = matchAspect(1, 1, "width", per(20, config.artwork[0].width)),
},
{
x = config.artwork[1].x,
y = config.artwork[1].y,
width = per(20, config.artwork[0].width),
height = matchAspect(1, 1, "width", per(20, config.artwork[1].width)),
},
{
x = config.artwork[2].x,
y = config.artwork[2].y,
width = per(20, config.artwork[0].width),
height = matchAspect(1, 1, "width", per(20, config.artwork[2].width)),
},
{
x = config.artwork[3].x,
y = config.artwork[3].y,
width = per(20, config.artwork[0].width),
height = matchAspect(1, 1, "width", per(20, config.artwork[3].width)),
},
]

config.entry <- [
{
x = 0,
y = per(90, config.container.height),
width = per(25, config.container.width),
height = per(10, config.container.height),
align = Align.Centre,
},
{
x = per(25, config.container.width),
y = per(90, config.container.height),
width = per(25, config.container.width),
height = per(10, config.container.height),
align = Align.Centre,
},
{
x = per(50, config.container.width),
y = per(90, config.container.height),
width = per(25, config.container.width),
height = per(10, config.container.height),
align = Align.Centre,
},
{
x = per(75, config.container.width),
y = per(90, config.container.height),
width = per(25, config.container.width),
height = per(10, config.container.height),
align = Align.Centre,
},
]
config.filterName <- {
x = overscan + per(62.5, config.container.width - (overscan*3)),
y = config.container.height - per(6, config.container.height - (overscan*2)) - overscan,
width = per(37.5, config.container.width - (overscan*3)),
height = per(6, config.container.height - (overscan*2)),
align = Align.Right,
}
Binary file removed heart.png
View file
Binary file not shown.
Binary file removed intro/neogeo.mp4
View file
Binary file not shown.
Binary file removed intro/snk_16x9.mp4
View file
Binary file not shown.
Binary file removed intro/snk_4x3.mp4
View file
Binary file not shown.
Binary file removed intro/song_16x9.mp4
View file
Binary file not shown.
Binary file removed intro/song_4x3.mp4
View file
Binary file not shown.
Binary file modified layout.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 32360d7

Please sign in to comment.