Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC(LCC) Backlog #65

Merged
merged 44 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
b61fdaa
Implemented CC backlog UI
PringlesGang Aug 30, 2024
4c7e712
Fixed backlog entry mouse highlighting with names
PringlesGang Aug 31, 2024
79e48d0
Implemented CCLCC backlog UI
PringlesGang Aug 31, 2024
299ef08
Added backlog text color to profile
PringlesGang Sep 2, 2024
c1d91d8
Fixed bug where system menu would hijack control when submenu opened …
PringlesGang Sep 3, 2024
8b9582c
Added backlog mask
PringlesGang Sep 15, 2024
f452f5c
Improved CC backlog voice icon location
PringlesGang Sep 15, 2024
6360bb5
Added CCLCC backlog mask
PringlesGang Sep 17, 2024
3b95067
Refactored backlog menu
PringlesGang Sep 17, 2024
afdd1cd
Implemented most of InstSetRevMes
PringlesGang Sep 18, 2024
fc982f4
'Fixed' new chapter backlog separator showing up
PringlesGang Sep 19, 2024
fb55b27
Improved cc(lcc) backlog mask alpha
PringlesGang Sep 19, 2024
eff7dc6
Added backlog hover bounds, so the highlighted entry is always within…
PringlesGang Sep 20, 2024
2111f0c
Added ScrWork SetRevMesValue starting vlaue to profile
PringlesGang Sep 21, 2024
c0a0f82
Fixed issue where backlog entry highlight pushing couldn't keep up wi…
PringlesGang Sep 21, 2024
80b7c98
Improved CCLCC backlog guide position
PringlesGang Sep 21, 2024
5cea867
Extended mouse hover hitbox for backlog entries
PringlesGang Sep 21, 2024
88f4432
Modified CCLCC tips menu to make use of scrollbar thumb length
PringlesGang Sep 21, 2024
b1ebb87
Updated README to point to the right build instructions doc
PringlesGang Sep 21, 2024
5377ad0
Updated BacklogMenu::RenderHighlight() to make use of CurrentlyFocuse…
PringlesGang Sep 21, 2024
1282fd6
Added rendering bounds for mo6tw
PringlesGang Sep 21, 2024
5201a7b
Fixed backlog entries with long names not being selectable
PringlesGang Sep 21, 2024
a267e23
Fixed backlog entries not being selectable by gamepad when near to th…
PringlesGang Sep 22, 2024
55b0ae5
Fixed tips menu overscrolling
PringlesGang Sep 22, 2024
86f313f
Fixed scrollbar clamp error and renamed min/maxvalue to start/endvalue
PringlesGang Sep 24, 2024
3f0acf5
Improved backlog fade animations
PringlesGang Sep 24, 2024
6e5eebe
Fix code style issues with clang_format
lint-action Sep 24, 2024
40ea9dd
Added backlog error sound for clicking unvoiced lines
PringlesGang Sep 24, 2024
6bc9991
Moved backlog error sound specification to CC implementation (whoops)
PringlesGang Sep 24, 2024
9482354
Backlog now snaps back to bottom when reopened
PringlesGang Sep 25, 2024
8763345
Created CC BacklogEntry derived class
PringlesGang Sep 26, 2024
fbd9747
Overhauled backlog controls
PringlesGang Sep 28, 2024
be1db3c
Moved system menu mask back to individual profiles
PringlesGang Sep 28, 2024
684b17a
Voice icon edge fading (broken)
PringlesGang Sep 29, 2024
919b39c
Fix renderer flush for masked text draws
Sep 29, 2024
6902c90
Improved CC backlog hoverbounds
PringlesGang Sep 29, 2024
1e88656
Fixed faulty static cast in CCLCC titlemenu
PringlesGang Sep 29, 2024
a75bacb
Fix the fade issue on outlined text
Sep 30, 2024
e08dc32
Similairly fix fade issue on backlog voice icon
PringlesGang Sep 30, 2024
b048108
Implemented backlog Page Up/Down
PringlesGang Sep 30, 2024
2e5f82d
Changed SW_SETREVMES_VALUE to SW_PLATFORM
PringlesGang Sep 30, 2024
eb99b77
Made InVerticalHoverBounds non-inline
PringlesGang Sep 30, 2024
e1205e8
Changed BacklogEntry to make use of DialoguePage::Move()
PringlesGang Sep 30, 2024
1b5b4b1
Moved SW_PROFILE starting value to game.lua
PringlesGang Sep 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ set(Impacto_Src
src/profile/games/chlcc/trophymenu.cpp
src/profile/games/chlcc/delusiontrigger.cpp

src/profile/games/cc/backlogmenu.cpp
src/profile/games/cc/dialoguebox.cpp
src/profile/games/cc/titlemenu.cpp
src/profile/games/cc/sysmesbox.cpp
Expand All @@ -106,6 +107,7 @@ set(Impacto_Src
src/profile/games/cclcc/delusiontrigger.cpp
src/profile/games/cclcc/yesnotrigger.cpp

src/profile/games/mo6tw/backlogmenu.cpp
src/profile/games/mo6tw/dialoguebox.cpp
src/profile/games/mo6tw/sysmesbox.cpp
src/profile/games/mo6tw/systemmenu.cpp
Expand Down Expand Up @@ -152,6 +154,7 @@ set(Impacto_Src
src/games/chlcc/trophymenuentry.cpp
src/games/chlcc/delusiontrigger.cpp

src/games/cc/backlogmenu.cpp
src/games/cc/dialoguebox.cpp
src/games/cc/titlemenu.cpp
src/games/cc/sysmesbox.cpp
Expand All @@ -169,6 +172,7 @@ set(Impacto_Src
src/games/cclcc/savesystem.cpp
src/games/cclcc/systemmenu.cpp

src/games/mo6tw/backlogmenu.cpp
src/games/mo6tw/dialoguebox.cpp
src/games/mo6tw/sysmesbox.cpp
src/games/mo6tw/systemmenu.cpp
Expand Down Expand Up @@ -234,6 +238,7 @@ set(Impacto_Src
src/ui/widgets/chlcc/albumthumbnailbutton.cpp
src/ui/widgets/chlcc/trackselectbutton.cpp
src/ui/widgets/rne/sysmenubutton.cpp
src/ui/widgets/cc/backlogentry.cpp
src/ui/widgets/cc/titlebutton.cpp
src/ui/widgets/cclcc/titlebutton.cpp
src/ui/widgets/cclcc/saveentrybutton.cpp
Expand Down Expand Up @@ -403,6 +408,7 @@ set(Impacto_Header
src/profile/games/chlcc/trophymenu.h
src/profile/games/chlcc/delusiontrigger.h

src/profile/games/cc/backlogmenu.h
src/profile/games/cc/dialoguebox.h
src/profile/games/cc/titlemenu.h
src/profile/games/cc/sysmesbox.h
Expand All @@ -416,6 +422,7 @@ set(Impacto_Header
src/profile/games/cclcc/mapsystem.h
src/profile/games/cclcc/delusiontrigger.h

src/profile/games/mo6tw/backlogmenu.h
src/profile/games/mo6tw/dialoguebox.h
src/profile/games/mo6tw/sysmesbox.h
src/profile/games/mo6tw/systemmenu.h
Expand Down Expand Up @@ -539,6 +546,7 @@ set(Impacto_Header
src/ui/widgets/chlcc/albumthumbnailbutton.h
src/ui/widgets/chlcc/trackselectbutton.h
src/ui/widgets/rne/sysmenubutton.h
src/ui/widgets/cc/backlogentry.h
src/ui/widgets/cc/titlebutton.h
src/ui/widgets/cclcc/titlebutton.h

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ impacto is currently being developed for **64-bit Windows 10 and desktop Linux P

## Building

For building on Windows with Visual Studio 2019 or newer, please refer to the [building instructions](doc/vs2019_build.md).
For building on Windows with Visual Studio 2019 or newer, please refer to the [building instructions](doc/vs_build.md).

For building on Linux, see the [instructions for Ubuntu 18.04 Desktop](doc/ubuntu1804_build.md) and adapt to your distribution if necessary.

Expand Down
12 changes: 8 additions & 4 deletions profiles/cc/dialogue.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ root.Sprites["WaitIconSprite"] = {
};

root.Dialogue = {
REVBounds = { X = 0, Y = 0, Width = 960, Height = 400 },
REVNameFontSize = 24,
REVNameColor = 24,
REVNameOffset = 34,
REVBounds = { X = 547, Y = 0, Width = 1043, Height = 400 },
REVNameFontSize = 48,
REVColor = 0,
REVNameColor = 61, -- Unsure
REVNameOffset = 22,
REVNameLocation = REVNameLocationType.LeftTop,
REVOutlineMode = 1,
REVNameOutlineMode = 1,
NVLBounds = { X = 188, Y = 128, Width = 1536, Height = 600 },
ADVBounds = { X = 330, Y = 795, Width = 1240, Height = 270 },
ADVBoxSprite = "ADVBox",
Expand Down
2 changes: 2 additions & 0 deletions profiles/cc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ root.Vm = {
MaxLinkedBgBuffers = 2
};

root.PlatformId = 131072;

include('common/scriptinput.lua');
include('common/scriptvars.lua');
include('cc/config.lua');
Expand Down
72 changes: 60 additions & 12 deletions profiles/cc/hud/backlogmenu.lua
Original file line number Diff line number Diff line change
@@ -1,39 +1,87 @@
root.BacklogMenu = {
DrawType = DrawComponentType.ExtrasScenes,
Type = BacklogMenuType.CC,
DrawType = DrawComponentType.SystemMenu,

BacklogBackgroundSprite = "BacklogBackground",
BacklogBackgroundRepeatHeight = 1080,

BacklogHeaderSprite = "BacklogHeader",
BacklogHeaderPosition = { X = 0, Y = 0 },

BacklogControlsSprite = "BacklogControls",
BacklogControlsPosition = { X = 0, Y = 988 },

EntryHighlightSprite = "EntryHighlight",
EntryHighlightLocation = EntryHighlightLocationType.TopLineLeftOfScreen,
EntryHighlightOffset = { X = 0, Y = 0 },

VoiceIconSprite = "VoiceIcon",
VoiceIconOffset = { X = -7, Y = 3 },

ScrollbarTrackSprite = "ScrollbarTrack",
ScrollbarThumbSprite = "ScrollbarThumb",
ScrollbarPosition = { X = 1165, Y = 98 },
EntriesStart = { X = 163, Y = 85 },
RenderingBounds = { X = 87, Y = 83, Width = 1280, Height = 615 },
EntryYPadding = 22,
ScrollbarPosition = { X = 1656, Y = 40 },
ScrollbarThumbLength = 87,

EntriesStart = { X = 547, Y = 149 },
RenderingBounds = { X = 194, Y = 121, Width = 1531, Height = 868 },
EntryYPadding = 26,

FadeInDuration = 0.2,
FadeOutDuration = 0.2
FadeOutDuration = 0.2,

ScrollingSpeed = 900,
MinHoldTime = 0.5,
AdvanceFocusTimeInterval = 0.05,
PageUpDownHeight = 765,

MenuMask = "MenuMask",
BacklogMask = "BacklogMask",
HoverBounds = { X = 380, Y = 145, Width = 1230, Height = 820 }
};

root.Sprites["BacklogBackground"] = {
Sheet = "Backlog",
Bounds = { X = 0, Y = 0, Width = 1280, Height = 720 },
Bounds = { X = 0, Y = 0, Width = 1920, Height = 1100 },
};

root.Sprites["BacklogHeader"] = {
Sheet = "Backlog",
Bounds = { X = 962, Y = 1210, Width = 542, Height = 542 },
};

root.SpriteSheets["BacklogMask"] = {
Path = { Mount = "system", Id = 2 },
DesignWidth = 1920,
DesignHeight = 1080
};

root.Sprites["BacklogControls"] = {
Sheet = "Backlog",
Bounds = { X = 0, Y = 1153, Width = 1920, Height = 57 },
};

root.Sprites["MenuMask"] = {
Sheet = "MenuChip",
Bounds = { X = 154, Y = 140, Width = 1900, Height = 1061 },
};

root.Sprites["VoiceIcon"] = {
Sheet = "Backlog",
Bounds = { X = 1281, Y = 1, Width = 30, Height = 30 },
Bounds = { X = 1519, Y = 1216, Width = 43, Height = 43 },
};

root.Sprites["EntryHighlight"] = {
Sheet = "Data",
Bounds = { X = 65, Y = 1, Width = 94, Height = 30 }
Sheet = "Backlog",
Bounds = { X = 0, Y = 1101, Width = 1920, Height = 52 }
};

root.Sprites["ScrollbarThumb"] = {
Sheet = "Backlog",
Bounds = { X = 1281, Y = 32, Width = 30, Height = 30 },
Bounds = { X = 2025, Y = 1113, Width = 23, Height = 87 },
};

root.Sprites["ScrollbarTrack"] = {
Sheet = "Backlog",
Bounds = { X = 1500, Y = 0, Width = 8, Height = 567 },
Bounds = { X = 2030, Y = 41, Width = 11, Height = 915 },
};
4 changes: 2 additions & 2 deletions profiles/cc/sprites.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ root.SpriteSheets = {
DesignHeight = 1528
},
["Backlog"] = {
Path = {Mount = "system", Id = 6 },
Path = { Mount = "system", Id = 1 },
DesignWidth = 2048,
DesignHeight = 720
DesignHeight = 2048
},
["NamePlate"] = {
Path = { Mount = "system", Id = 23 },
Expand Down
14 changes: 9 additions & 5 deletions profiles/cclcc/dialogue.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ root.Sprites["ADVBoxMask"] = {
root.Dialogue = {
TipsBounds = { X = 1042, Y = 394, Width = 720, Height = 542 },
TipsColorIndex = 10,
REVBounds = { X = 0, Y = 0, Width = 960, Height = 400 },
REVNameFontSize = 24,
REVNameColor = 24,
REVNameOffset = 34,
REVBounds = { X = 547, Y = 0, Width = 1043, Height = 400 },
REVNameFontSize = 42,
REVColor = 10, -- Absolute guess
REVNameColor = 0,
REVNameOffset = 18,
REVNameLocation = REVNameLocationType.LeftTop,
REVOutlineMode = 0,
REVNameOutlineMode = 2,
NVLBounds = { X = 188, Y = 128, Width = 1536, Height = 600 },
ADVBounds = { X = 330, Y = 815, Width = 1320, Height = 270 },
ADVBoxSprite = "ADVBox",
Expand Down Expand Up @@ -48,7 +52,7 @@ root.Dialogue = {
SkipIconOffset = { X = 1688, Y = 794 },
SkipIconFixedSpriteId = 6,
DialogueFont = "Default",
DefaultFontSize = 36,
DefaultFontSize = 42,
RubyFontSize = 21,
RubyYOffset = -27,
ColorTable = {
Expand Down
2 changes: 2 additions & 0 deletions profiles/cclcc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ root.Vm = {
MaxLinkedBgBuffers = 2
};

root.PlatformId = 131072;

include('common/scriptinput.lua');
include('common/scriptvars.lua');

Expand Down
72 changes: 60 additions & 12 deletions profiles/cclcc/hud/backlogmenu.lua
Original file line number Diff line number Diff line change
@@ -1,39 +1,87 @@
root.BacklogMenu = {
DrawType = DrawComponentType.ExtrasScenes,
Type = BacklogMenuType.CC,
DrawType = DrawComponentType.SystemMenu,

BacklogBackgroundSprite = "BacklogBackground",
BacklogBackgroundRepeatHeight = 1005,

BacklogHeaderSprite = "BacklogHeader",
BacklogHeaderPosition = { X = 0, Y = 0 },

BacklogControlsSprite = "BacklogControls",
BacklogControlsPosition = { X = 0, Y = 986 },

EntryHighlightSprite = "EntryHighlight",
EntryHighlightLocation = EntryHighlightLocationType.TopLineLeftOfScreen,
EntryHighlightOffset = { X = 0, Y = -3 },

VoiceIconSprite = "VoiceIcon",
VoiceIconOffset = { X = -16, Y = 0 },

ScrollbarTrackSprite = "ScrollbarTrack",
ScrollbarThumbSprite = "ScrollbarThumb",
ScrollbarPosition = { X = 1165, Y = 98 },
EntriesStart = { X = 163, Y = 85 },
RenderingBounds = { X = 87, Y = 83, Width = 1280, Height = 615 },
EntryYPadding = 22,
ScrollbarPosition = { X = 1656, Y = 40 },
ScrollbarThumbLength = 87,

EntriesStart = { X = 547, Y = 149 },
RenderingBounds = { X = 194, Y = 121, Width = 1531, Height = 868 },
EntryYPadding = 26,

FadeInDuration = 0.2,
FadeOutDuration = 0.2
FadeOutDuration = 0.2,

ScrollingSpeed = 900,
MinHoldTime = 0.5,
AdvanceFocusTimeInterval = 0.05,
PageUpDownHeight = 765,

MenuMask = "MenuMask",
BacklogMask = "BacklogMask",
HoverBounds = { X = 380, Y = 145, Width = 1230, Height = 820 }
};

root.Sprites["BacklogBackground"] = {
Sheet = "Backlog",
Bounds = { X = 0, Y = 0, Width = 1280, Height = 720 },
Bounds = { X = 0, Y = 0, Width = 1920, Height = 1080 },
};

root.Sprites["BacklogHeader"] = {
Sheet = "Backlog",
Bounds = { X = 962, Y = 1210, Width = 542, Height = 542 },
};

root.SpriteSheets["BacklogMask"] = {
Path = { Mount = "system", Id = 2 },
DesignWidth = 1920,
DesignHeight = 1080
};

root.Sprites["BacklogControls"] = {
Sheet = "Backlog",
Bounds = { X = 0, Y = 1151, Width = 1920, Height = 59 },
}

root.Sprites["MenuMask"] = {
Sheet = "MenuChip",
Bounds = { X = 154, Y = 140, Width = 1900, Height = 1061 },
};

root.Sprites["VoiceIcon"] = {
Sheet = "Backlog",
Bounds = { X = 1281, Y = 1, Width = 30, Height = 30 },
Bounds = { X = 1521, Y = 1218, Width = 38, Height = 38 },
};

root.Sprites["EntryHighlight"] = {
Sheet = "Data",
Bounds = { X = 65, Y = 1, Width = 94, Height = 30 }
Sheet = "Backlog",
Bounds = { X = 0, Y = 1105, Width = 1920, Height = 44 }
};

root.Sprites["ScrollbarThumb"] = {
Sheet = "Backlog",
Bounds = { X = 1281, Y = 32, Width = 30, Height = 30 },
Bounds = { X = 2027, Y = 1115, Width = 18, Height = 83 },
};

root.Sprites["ScrollbarTrack"] = {
Sheet = "Backlog",
Bounds = { X = 1500, Y = 0, Width = 8, Height = 567 },
Bounds = { X = 2030, Y = 41, Width = 11, Height = 915 },
};
2 changes: 2 additions & 0 deletions profiles/cclcc/hud/systemmenu.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
root.SystemMenu = {
Type = SystemMenuType.CCLCC,
DrawType = DrawComponentType.SystemMenu,

FadeInDuration = 64 / 60,
FadeOutDuration = 64 / 60,
TitleFadeInDuration = 40 / 60,
Expand Down Expand Up @@ -29,6 +30,7 @@ root.SystemMenu = {
},
MenuEntriesSprites = {},
MenuEntriesHighlightedSprites = {},

MenuButtonGuide = "SystemMenuButtonGuide",
};

Expand Down
1 change: 1 addition & 0 deletions profiles/cclcc/hud/tipsmenu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ root.TipsMenu = {
TipsMenuDarkTextColor = 0x3e3e3c,

TipsScrollThumbSprite = "TipsScrollThumb",
TipsScrollThumbLength = 40,
TipsScrollYStart = 385,
TipsScrollYEnd = 930,
TipsScrollEntriesX = 896,
Expand Down
4 changes: 2 additions & 2 deletions profiles/cclcc/sprites.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ root.SpriteSheets = {
DesignHeight = 1528
},
["Backlog"] = {
Path = { Mount = "system", Id = 6 },
Path = { Mount = "system", Id = 1 },
DesignWidth = 2048,
DesignHeight = 720
DesignHeight = 2048
},
["Tips"] = {
Path = { Mount = "system", Id = 28 },
Expand Down
Loading
Loading