hersi
/
ExperimentalGear
1
0
Fork 0
Code Issues 14 Pull Requests Projects 1 Releases 6 Activity

scale fix

This commit is contained in:
RealFD 2022-03-04 12:32:45 +01:00
parent 5ccbd922c2
commit 8dd46e733f
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/components/textscrambler.lua
View File

@ -1,9 +1,7 @@
local ScrollScales = {}
local TextWidths = {}
local ScrollScales = {} local Size = {}
local TextWidths = {} local TextWidth = {}
local Size = {}
local TextWidth = {}
function textmaker(text, fontsize, maxWidth, x, y, w, h, lenght, scissorY, id) -- testing is needed function textmaker(text, fontsize, maxWidth, x, y, w, h, lenght, scissorY, id) -- testing is needed
gfx.FontSize(fontsize) gfx.FontSize(fontsize)
@ -17,8 +15,6 @@ function textmaker(text, fontsize, maxWidth, x, y, w, h, lenght, scissorY, id) -
ScrollScales[id] = 0; ScrollScales[id] = 0;
end end
gfx.Scissor(x,y + scissorY,w,h) -- debug gfx.Scissor(x,y + scissorY,w,h) -- debug
gfx.FillColor(0,255,0)
gfx.Text(ScrollScales[id],x,y-25)
gfx.FillColor(255,255,255) gfx.FillColor(255,255,255)
if (x2-x1) < maxWidth then if (x2-x1) < maxWidth then
gfx.Text(text,x,y) gfx.Text(text,x,y)

26
scripts/multiplayerscreen.lua
View File

@ -152,7 +152,7 @@ local drawIdol = function(deltaTime)
idolAnimTransitionScale = 1; idolAnimTransitionScale = 1;
end end
gfx.ImageRect(0, 0, resx,resy, idolAnimation, 1, 0); gfx.ImageRect(0, 0, desw,desh, idolAnimation, 1, 0);
gfx.GlobalAlpha(1); gfx.GlobalAlpha(1);
end end
end end
@ -403,7 +403,7 @@ user_setup = function () -- (semi new) user layering
end end
elseif i == 4 then elseif i == 4 then
draw_user(user, 16+distance+distance, 1142-360/1.2, 420/1.2, 330/1.2, i,215,245.5) draw_user(user, 16+distance+distance, 1142-360/1.2, 42030//1.2, 31.2, i,215,245.5)
if (owner == user_id or host == user_id) and user.id ~= host then if (owner == user_id or host == user_id) and user.id ~= host then
draw_button("H",16+distance+distance, buttonY, 50, function() draw_button("H",16+distance+distance, buttonY, 50, function()
@ -725,11 +725,11 @@ function render_lobby(deltaTime)
local jw , jh = gfx.ImageSize(bg); local jw , jh = gfx.ImageSize(bg);
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(0, 0, resx, resy, bg,1,0); gfx.ImageRect(0, 0, desw, desh, bg,1,0);
drawIdol(deltaTime) drawIdol(deltaTime)
gfx.BeginPath(); gfx.BeginPath();
gfx.ImageRect(0, 0, resx, resy, bg_graid1,1,0); gfx.ImageRect(0, 0, desw, desh, bg_graid1,1,0);
gfx.ImageRect(0, 0, resx, resy, bg_graid2,1,0); gfx.ImageRect(0, 0, desw, desh, bg_graid2,1,0);
drawHeader() drawHeader()
gfx.BeginPath(); gfx.BeginPath();
m_base_part() m_base_part()
@ -744,23 +744,9 @@ function render_lobby(deltaTime)
songjacket() songjacket()
end end
drawResultScreen = function (x, y, w, h, deltaTime)
gfx.BeginPath()
gfx.Translate(x, y);
gfx.Scale(w / 1080, h / 1920);
gfx.Scissor(0, 0, 1080, 1920);
Background.draw(deltaTime)
gfx.GlobalAlpha(1)
IR_Handle();
gfx.ResetTransform()
end
function render_room_list(deltaTime) function render_room_list(deltaTime)
Background.draw(deltaTime)
draw_rooms(175, resy - 290); draw_rooms(175, resy - 290);
-- Draw cover for rooms out of view -- Draw cover for rooms out of view