Skip to content

Commit

Permalink
Tidyings for 4:3 while ChartParsing information is showing RE: #14
Browse files Browse the repository at this point in the history
(cherry picked from commit ee3aa66)

# Conflicts:
#	BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua
#	BGAnimations/ScreenSelectMusic overlay/PerPlayer/StepArtist-Classic.lua
  • Loading branch information
CrashCringle12 committed Dec 28, 2022
1 parent d05e1c0 commit cd7bfd4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
16 changes: 10 additions & 6 deletions BGAnimations/ScreenSelectMusic overlay/PerPlayer/DensityGraph.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ if GAMESTATE:IsCourseMode() then return end
local player = ...
local pn = ToEnumShortString(player)


-- Height and width of the density graph.
local height = 64
local width = IsUsingWideScreen() and 286 or 276
local width = IsUsingWideScreen() and 286 or 268

local af = Def.ActorFrame{
InitCommand=function(self)
self:visible( GAMESTATE:IsHumanPlayer(player) )
self:xy(_screen.cx-182, _screen.cy+23)
self:visible(GAMESTATE:IsHumanPlayer(player))
self:xy(IsUsingWideScreen() and _screen.cx-182 or _screen.cx-176, _screen.cy+23)

if player == PLAYER_2 then
self:addy(height+24)
Expand All @@ -32,6 +33,7 @@ local af = Def.ActorFrame{
self:visible(false)
end
end,

}

-- Background quad for the density graph
Expand Down Expand Up @@ -90,6 +92,7 @@ af2[#af2+1] = NPS_Histogram(player, width, height)..{
end,
RedrawCommand=function(self)
self:visible(true)

end
}
-- Don't let the density graph parse the chart.
Expand All @@ -107,7 +110,6 @@ af2[#af2+1] = LoadFont("Common Normal")..{
else
self:addx(-136):addy(-41)
end

-- We want black text in Rainbow mode, white otherwise.
self:diffuse(ThemePrefs.Get("RainbowMode") and {0, 0, 0, 1} or {1, 1, 1, 1})
end,
Expand All @@ -121,6 +123,7 @@ af2[#af2+1] = LoadFont("Common Normal")..{
self:visible(true)
end
end,

}

-- Breakdown
Expand Down Expand Up @@ -179,6 +182,7 @@ af2[#af2+1] = Def.ActorFrame{
end,
PlayerJoinedMessageCommand=function(self, params)
self:visible(GAMESTATE:GetNumSidesJoined() == 1)

end,
PlayerUnjoinedMessageCommand=function(self, params)
self:visible(GAMESTATE:GetNumSidesJoined() == 1)
Expand Down Expand Up @@ -216,7 +220,7 @@ for i, row in ipairs(layout) do
if col == "Total Stream" then
self:maxwidth(100)
end
self:xy(-width/2 + 40, -height/2 + 10)
self:xy(-width/2 + 40, -height/2 + 13)
self:addx((j-1)*colSpacing)
self:addy((i-1)*rowSpacing)
end,
Expand Down Expand Up @@ -249,7 +253,7 @@ for i, row in ipairs(layout) do
local textHeight = 17
local textZoom = 0.8
self:maxwidth(width/textZoom):zoom(textZoom):horizalign(left)
self:xy(-width/2 + 50, -height/2 + 10)
self:xy(-width/2 + 50, -height/2 + 13)
self:addx((j-1)*colSpacing)
self:addy((i-1)*rowSpacing)
end,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ return Def.ActorFrame{
self:x( _screen.cx - (IsUsingWideScreen() and 356 or 346))
self:y(_screen.cy + 32)
else
self:x( _screen.cx - (IsUsingWideScreen() and 356 or 346))
self:x( _screen.cx - (IsUsingWideScreen() and 356 or 337))
self:y(_screen.cy + 12)
end

elseif player == PLAYER_2 then

if GAMESTATE:IsCourseMode() then
self:x( _screen.cx - 210)
self:x( _screen.cx - (IsUsingWideScreen() and 210 or 242))
self:y(_screen.cy + 85)
else
self:x( _screen.cx - 244)
self:x( _screen.cx - (IsUsingWideScreen() and 244 or 242))
self:y(_screen.cy + 40)
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local GetStepsToDisplay = LoadActor("./StepsToDisplay.lua")

local t = Def.ActorFrame{
Name="StepsDisplayList",
InitCommand=function(self) self:xy(_screen.cx-26, _screen.cy + 67) end,
InitCommand=function(self) self:xy(IsUsingWideScreen() and _screen.cx-26 or _screen.cx-20 , _screen.cy + 67) end,

OnCommand=function(self) self:queuecommand("RedrawStepsDisplay") end,
CurrentSongChangedMessageCommand=function(self) self:queuecommand("RedrawStepsDisplay") end,
Expand Down

0 comments on commit cd7bfd4

Please sign in to comment.