vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add royalty free defaults

This commit is contained in:
Llennpie 2021-11-29 14:30:53 -05:00
parent 436bfbe49b
commit eeb8b8a202
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/saturn/assets/graphics/saturn/buttons/Toon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
addons/saturn/assets/graphics/saturn/emblems/Toon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
addons/saturn/assets/graphics/saturn/eyes/Squint.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1002 B

BIN
addons/saturn/assets/graphics/saturn/eyes/Toon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
addons/saturn/assets/graphics/saturn/sideburns/Toon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 707 B

BIN
addons/saturn/assets/graphics/saturn/staches/Toon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

16
src/moon/imgui/imgui_impl.cpp
View File

@ -593,7 +593,7 @@ namespace MoonInternal {
// Only do this once
if (current_emblem_item != 2) {
current_emblem_item = 2;
custom_emblem_name = "emblems/" + emblem_array[current_emblem_id];
custom_emblem_name = "saturn/emblems/" + emblem_array[current_emblem_id];
saturn_emblem_swap();
}
@ -615,7 +615,7 @@ namespace MoonInternal {
ImGui::EndCombo();
}
if (ImGui::Button("Set Emblem")) {
custom_emblem_name = "emblems/" + emblem_array[current_emblem_id];
custom_emblem_name = "saturn/emblems/" + emblem_array[current_emblem_id];
saturn_emblem_swap();
}
ImGui::Dummy(ImVec2(0, 5));
@ -638,7 +638,7 @@ namespace MoonInternal {
// Only do this once
if (current_stache_item != 2) {
current_stache_item = 2;
custom_stache_name = "staches/" + stache_array[current_stache_id];
custom_stache_name = "saturn/staches/" + stache_array[current_stache_id];
saturn_stache_swap();
}
@ -660,7 +660,7 @@ namespace MoonInternal {
ImGui::EndCombo();
}
if (ImGui::Button("Set Stache")) {
custom_stache_name = "staches/" + stache_array[current_stache_id];
custom_stache_name = "saturn/staches/" + stache_array[current_stache_id];
saturn_stache_swap();
}
ImGui::Dummy(ImVec2(0, 5));
@ -683,7 +683,7 @@ namespace MoonInternal {
// Only do this once
if (current_button_item != 2) {
current_button_item = 2;
custom_button_name = "buttons/" + button_array[current_button_id];
custom_button_name = "saturn/buttons/" + button_array[current_button_id];
saturn_button_swap();
}
@ -705,7 +705,7 @@ namespace MoonInternal {
ImGui::EndCombo();
}
if (ImGui::Button("Set Buttons")) {
custom_button_name = "buttons/" + button_array[current_button_id];
custom_button_name = "saturn/buttons/" + button_array[current_button_id];
saturn_button_swap();
}
ImGui::Dummy(ImVec2(0, 5));
@ -728,7 +728,7 @@ namespace MoonInternal {
// Only do this once
if (current_sideburn_item != 2) {
current_sideburn_item = 2;
custom_sideburn_name = "sideburns/" + sideburn_array[current_sideburn_id];
custom_sideburn_name = "saturn/sideburns/" + sideburn_array[current_sideburn_id];
saturn_sideburn_swap();
}
@ -750,7 +750,7 @@ namespace MoonInternal {
ImGui::EndCombo();
}
if (ImGui::Button("Set Sideburns")) {
custom_sideburn_name = "sideburns/" + sideburn_array[current_sideburn_id];
custom_sideburn_name = "saturn/sideburns/" + sideburn_array[current_sideburn_id];
saturn_sideburn_swap();
}
ImGui::Dummy(ImVec2(0, 5));

8
src/moon/saturn/saturn_textures.cpp
View File

@ -73,7 +73,7 @@ void saturn_emblem_swap() {
if (custom_emblem_name != "default") {
(*hookTexture) = const_cast<char*>(custom_emblem_name.c_str());
} else {
(*hookTexture) = const_cast<char*>("actors/mario/mario_logo.rgba16");
(*hookTexture) = const_cast<char*>(texName.c_str());
}
}
}});
@ -104,7 +104,7 @@ void saturn_stache_swap() {
if (custom_stache_name != "default") {
(*hookTexture) = const_cast<char*>(custom_stache_name.c_str());
} else {
(*hookTexture) = const_cast<char*>("actors/mario/mario_mustache.rgba16");
(*hookTexture) = const_cast<char*>(texName.c_str());
}
}
}});
@ -135,7 +135,7 @@ void saturn_button_swap() {
if (custom_button_name != "default") {
(*hookTexture) = const_cast<char*>(custom_button_name.c_str());
} else {
(*hookTexture) = const_cast<char*>("actors/mario/mario_overalls_button.rgba16");
(*hookTexture) = const_cast<char*>(texName.c_str());
}
}
}});
@ -166,7 +166,7 @@ void saturn_sideburn_swap() {
if (custom_sideburn_name != "default") {
(*hookTexture) = const_cast<char*>(custom_sideburn_name.c_str());
} else {
(*hookTexture) = const_cast<char*>("actors/mario/mario_sideburn.rgba16");
(*hookTexture) = const_cast<char*>(texName.c_str());
}
}
}});