RocketRobz/SuperAllStarPhotoStudio
1
Fork 0
mirror of https://github.com/RocketRobz/SuperAllStarPhotoStudio.git synced 2025-06-19 01:25:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add title screen and make GUI dark

Browse Source
This commit is contained in:
RocketRobz 2020-07-08 00:31:26 -06:00
parent 84ab7e11a5
commit 9b678a375c
24 changed files with 39 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/camera shutter_data/e08/d08/e0808181.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808305.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e080833a.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e08083d3.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808542.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e08085cd.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e08087cd.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e08087e1.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e08087f6.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808a59.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808bb6.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808dda.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808e04.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808f2b.au
View File

Binary file not shown.

BIN
app/camera shutter_data/e08/d08/e0808f4a.au
View File

Binary file not shown.

BIN
assets/gfx/emblem_back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 27 KiB

BIN
assets/gfx/item_button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
assets/gfx/phone_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
assets/gfx/photo_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 22 KiB

3
assets/gfx/sprites.t3s
View File

@ -8,15 +8,14 @@ button_shadow.png
button_msg.png
button_msg_shadow.png
cursor.png
emblem_back.png
icon_female.png
icon_male.png
icon_msg.png
icon_question.png
item_button.png
phone_bg.png
photo_bg.png
logo_horiHD.png
logo_rocketrobz.png
title.png
logo_UniversalCore.png
homeicon.png

BIN
assets/gfx/title.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
resources/title.xcf
View File

Binary file not shown.

71
source/screens/photoStudio.cpp
View File

@ -205,15 +205,10 @@ void PhotoStudio::Draw(void) const {
if (this->displayStudioBg) {
GFX::showBgSprite(zoomIn);
} else if (this->showScrollingBg) {
GFX::DrawSprite(sprites_title_idx, 0, 0, 0.5);
} else {
Gui::Draw_Rect(0, 0, 400, 240, WHITE); // Fill gaps of BG
if (this->showScrollingBg) {
for(int w = 0; w < 7; w++) {
for(int h = 0; h < 3; h++) {
GFX::DrawSprite(sprites_phone_bg_idx, -72+bg_xPos+w*72, bg_yPos+h*136);
}
}
}
Gui::Draw_Rect(0, 0, 400, 240, WHITE);
}
if (this->previewCharacter) {
if (this->previewCharacterFound) {
@ -246,29 +241,29 @@ void PhotoStudio::Draw(void) const {
// Game name
switch (this->char_highlightedGame) {
case 4:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, "Your character files");
Gui::DrawStringCentered(0, 8, 0.50, WHITE, "Your character files");
break;
case 3:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss4Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss4Title());
break;
case 2:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss3Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss3Title());
break;
case 1:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss2Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss2Title());
break;
case 0:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss1Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss1Title());
break;
}
Gui::DrawString(8, 8, 0.50, BLACK, "<");
Gui::DrawString(304, 8, 0.50, BLACK, ">");
Gui::DrawString(8, 8, 0.50, WHITE, "<");
Gui::DrawString(304, 8, 0.50, WHITE, ">");
if (char_highlightedGame != 4) {
// Selected season
Gui::DrawString(120-32, 208, 0.65, BLACK, "L");
Gui::DrawStringCentered(-32, 210, 0.50, BLACK, this->seasonName());
Gui::DrawString(192-32, 208, 0.65, BLACK, "R");
Gui::DrawString(120-32, 208, 0.65, WHITE, "L");
Gui::DrawStringCentered(-32, 210, 0.50, WHITE, this->seasonName());
Gui::DrawString(192-32, 208, 0.65, WHITE, "R");
}
Gui::DrawString(192, 208, 0.65, BLUE, "SELECT: Robz");
@ -280,23 +275,23 @@ void PhotoStudio::Draw(void) const {
if (i >= numberOfExportedCharacters) break;
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
GFX::DrawSprite((getExportedCharacterGender(i) ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8);
Gui::DrawString(64, i2, 0.65, BLACK, getExportedCharacterName(i));
Gui::DrawString(64, i2, 0.65, WHITE, getExportedCharacterName(i));
} else if (char_highlightedGame == 3) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
GFX::DrawSprite((import_ss4CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8);
Gui::DrawString(64, i2, 0.65, BLACK, import_ss4CharacterNames[i]);
Gui::DrawString(64, i2, 0.65, WHITE, import_ss4CharacterNames[i]);
} else if (char_highlightedGame == 2) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
GFX::DrawSprite((import_ss3CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8);
Gui::DrawString(64, i2, 0.65, BLACK, import_ss3CharacterNames[i]);
Gui::DrawString(64, i2, 0.65, WHITE, import_ss3CharacterNames[i]);
} else if (char_highlightedGame == 1) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
GFX::DrawSprite((import_ss2CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx)/*+import_ss2CharacterTieColors[i]*/, 12, i2-8);
Gui::DrawString(64, i2, 0.65, BLACK, import_SS2CharacterNames(i));
Gui::DrawString(64, i2, 0.65, WHITE, import_SS2CharacterNames(i));
} else if (char_highlightedGame == 0) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
GFX::DrawSprite((import_ss1CharacterGenders[i] ? sprites_icon_male_idx : sprites_icon_female_idx), 12, i2-8);
Gui::DrawString(64, i2, 0.65, BLACK, import_ss1CharacterNames[i]);
Gui::DrawString(64, i2, 0.65, WHITE, import_ss1CharacterNames[i]);
}
i2 += 48;
}
@ -307,23 +302,23 @@ void PhotoStudio::Draw(void) const {
// Game name
switch (this->photo_highlightedGame) {
case 4:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, "Your character files");
Gui::DrawStringCentered(0, 8, 0.50, WHITE, "Your character files");
break;
case 3:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss4Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss4Title());
break;
case 2:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss3Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss3Title());
break;
case 1:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss2Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss2Title());
break;
case 0:
Gui::DrawStringCentered(0, 8, 0.50, BLACK, ss1Title());
Gui::DrawStringCentered(0, 8, 0.50, WHITE, ss1Title());
break;
}
Gui::DrawString(8, 8, 0.50, BLACK, "<");
Gui::DrawString(304, 8, 0.50, BLACK, ">");
Gui::DrawString(8, 8, 0.50, WHITE, "<");
Gui::DrawString(304, 8, 0.50, WHITE, ">");
/*if (photo_highlightedGame != 4) {
// Selected season
@ -337,16 +332,16 @@ void PhotoStudio::Draw(void) const {
for (int i = import_bgShownFirst; i < import_bgShownFirst+3; i++) {
if (photo_highlightedGame == 3) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, import_ss4BgNames[i]);
Gui::DrawString(32, i2, 0.65, WHITE, import_ss4BgNames[i]);
} else if (photo_highlightedGame == 2) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, import_ss3BgNames[i]);
Gui::DrawString(32, i2, 0.65, WHITE, import_ss3BgNames[i]);
} else if (photo_highlightedGame == 1) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, import_ss2BgNames[i]);
Gui::DrawString(32, i2, 0.65, WHITE, import_ss2BgNames[i]);
} else if (photo_highlightedGame == 0) {
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, import_ss1BgNames[i]);
Gui::DrawString(32, i2, 0.65, WHITE, import_ss1BgNames[i]);
}
i2 += 48;
}
@ -354,17 +349,17 @@ void PhotoStudio::Draw(void) const {
} else {
this->cursorY = 64+(48*this->characterChangeMenu_cursorPositionOnScreen);
Gui::DrawString(8, 8, 0.50, BLACK, "What do you want to do?");
Gui::DrawString(8, 8, 0.50, WHITE, "What do you want to do?");
Gui::DrawString(192, 206, 0.65, BLACK, ": Take photo");
Gui::DrawString(192, 206, 0.65, WHITE, ": Take photo");
int i2 = 0;
i2 += 48;
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, "Change location");
Gui::DrawString(32, i2, 0.65, WHITE, "Change location");
i2 += 48;
GFX::DrawSprite(sprites_item_button_idx, 16, i2-20);
Gui::DrawString(32, i2, 0.65, BLACK, "Change character");
Gui::DrawString(32, i2, 0.65, WHITE, "Change character");
}
if (this->subScreenMode != 0) {

20
source/screens/settings.cpp
View File

@ -8,12 +8,7 @@ char txt_frameRate[24];
void Settings::Draw(void) const {
Gui::ScreenDraw(Top);
Gui::Draw_Rect(0, 0, 400, 240, WHITE); // Fill gaps of BG
for(int w = 0; w < 7; w++) {
for(int h = 0; h < 3; h++) {
GFX::DrawSprite(sprites_phone_bg_idx, -72+bg_xPos+w*72, bg_yPos+h*136);
}
}
GFX::DrawSprite(sprites_title_idx, 0, 0, 0.5);
if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(fadecolor, fadecolor, fadecolor, fadealpha)); // Fade in/out effect
@ -24,17 +19,12 @@ void Settings::Draw(void) const {
if (shiftBySubPixel) return;
Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, WHITE); // Fill gaps of BG
for(int w = 0; w < 7; w++) {
for(int h = 0; h < 3; h++) {
GFX::DrawSprite(sprites_phone_bg_idx, -76+bg_xPos+w*72, bg_yPos+h*136);
}
}
GFX::DrawSprite(sprites_photo_bg_idx, 0, 0);
this->cursorX = 248;
this->cursorY = 64+(48*cursorPositionOnScreen);
Gui::DrawStringCentered(0, 8, 0.55, BLACK, "Settings");
Gui::DrawStringCentered(0, 8, 0.55, WHITE, "Settings");
int i2 = 48;
for (int i = settingShownFirst; i < settingShownFirst+3; i++) {
@ -44,11 +34,11 @@ void Settings::Draw(void) const {
switch (i) {
case 0:
sprintf(txt_cinemaWide, "Aspect Ratio: %s", cinemaWide ? "Cinema" : "Normal");
Gui::DrawString(32, i2, 0.65, BLACK, txt_cinemaWide);
Gui::DrawString(32, i2, 0.65, WHITE, txt_cinemaWide);
break;
case 1:
sprintf(txt_frameRate, "Frame Rate: %iFPS", iFps);
Gui::DrawString(32, i2, 0.65, BLACK, txt_frameRate);
Gui::DrawString(32, i2, 0.65, WHITE, txt_frameRate);
break;
default:
break;