sm64-mirrors/Saturn
1
0
Fork 0
mirror of https://github.com/Llennpie/Saturn.git synced 2025-01-22 07:32:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

starrable animations + bugfix

Browse source
This commit is contained in:
Dominicentek 2023-11-24 15:48:58 +01:00
parent 76f012b1de
commit 86d7fbec35
5 changed files with 96 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dynos/anim_favorites.bin Normal file
View file

Binary file not shown.

33
src/saturn/filesystem/saturn_animfile.cpp Normal file
View file

@ -0,0 +1,33 @@
#include "saturn/filesystem/saturn_animfile.h"
#include "saturn/filesystem/saturn_format.h"
#include <vector>
const int curr_ver = 1;
std::vector<int> favorite_anims = {};
void saturn_favorite_anim_data_handler(SaturnFormatStream* stream, int version) {
int count = saturn_format_read_int32(stream);
for (int i = 0; i < count; i++) {
favorite_anims.push_back(saturn_format_read_int32(stream));
}
}
void saturn_load_favorite_anims() {
favorite_anims.clear();
saturn_format_input("dynos/anim_favorites.bin", "STFA", {
{ "DATA", saturn_favorite_anim_data_handler }
});
}
void saturn_save_favorite_anims() {
SaturnFormatStream stream = saturn_format_output("STFA", curr_ver);
saturn_format_new_section(&stream, "DATA");
saturn_format_write_int32(&stream, favorite_anims.size());
for (int anim : favorite_anims) {
saturn_format_write_int32(&stream, anim);
}
saturn_format_close_section(&stream);
saturn_format_write("dynos/anim_favorites.bin", &stream);
}

11
src/saturn/filesystem/saturn_animfile.h Normal file
View file

@ -0,0 +1,11 @@
#ifndef SaturnAnimFile
#define SaturnAnimFile
#include <vector>
extern std::vector<int> favorite_anims;
extern void saturn_load_favorite_anims();
extern void saturn_save_favorite_anims();
#endif

53
src/saturn/imgui/saturn_imgui_machinima.cpp
View file

@ -18,6 +18,7 @@
#include "saturn_imgui.h"
#include "saturn/imgui/saturn_imgui_chroma.h"
#include "saturn/filesystem/saturn_locationfile.h"
#include "saturn/filesystem/saturn_animfile.h"
#include "pc/controller/controller_keyboard.h"
#include <SDL2/SDL.h>
@ -383,7 +384,8 @@ void imgui_machinima_animation_player() {
ImGui::BeginDisabled();
const char* anim_groups[] = { "Movement (50)", "Actions (25)", "Automatic (27)", "Damage/Deaths (22)",
"Cutscenes (23)", "Water (16)", "Climbing (20)", "Object (24)", ICON_FK_FILE_O " CUSTOM...", "All (209)"};
"Cutscenes (23)", "Water (16)", "Climbing (20)", "Object (24)", ICON_FK_FILE_O " CUSTOM...", "All (209)",
(std::string("Favorites (") + std::to_string(favorite_anims.size()) + ")").c_str() };
int animArraySize = (canim_array.size() > 0) ? IM_ARRAYSIZE(anim_groups) : IM_ARRAYSIZE(anim_groups) - 1;
ImGui::PushItemWidth(290);
@ -405,14 +407,22 @@ void imgui_machinima_animation_player() {
current_anim_map = sanim_maps[9];
is_custom_anim = false;
current_anim_map.clear();
for (int i; i < 8; i++) {
current_anim_map.merge(sanim_maps[i]);
for (auto& anim : sanim_maps[i]) {
current_anim_map.insert(anim);
}
}
current_sanim_index = current_anim_map.begin()->first.first;
current_sanim_name = current_anim_map.begin()->first.second;
current_sanim_id = current_anim_map.begin()->second;
anim_preview_name = current_sanim_name;
} else if (current_sanim_group_index == 10) {
is_custom_anim = false;
current_sanim_id = favorite_anims.size() == 0 ? MARIO_ANIM_A_POSE : favorite_anims[0];
current_sanim_index = 0;
current_sanim_name = saturn_animations_list[current_sanim_id];
anim_preview_name = current_sanim_name;
} else {
current_anim_map = sanim_maps[current_sanim_group_index];
is_custom_anim = false;
@ -535,6 +545,14 @@ void imgui_machinima_animation_player() {
}
}
auto position = std::find(favorite_anims.begin(), favorite_anims.end(), i);
bool contains = position != favorite_anims.end();
if (ImGui::SmallButton((std::string(contains ? ICON_FK_STAR : ICON_FK_STAR_O) + "###" + std::to_string(i)).c_str())) {
if (contains) favorite_anims.erase(position);
else favorite_anims.push_back(i);
saturn_save_favorite_anims();
}
ImGui::SameLine();
if (ImGui::Selectable(current_sanim_name.c_str(), is_selected)) {
current_sanim_index = i;
current_sanim_name = saturn_animations_list[i];
@ -546,12 +564,41 @@ void imgui_machinima_animation_player() {
if (is_selected)
ImGui::SetItemDefaultFocus();
}
} else if (current_sanim_group_index == 10) {
int idx = 0;
for (int anim : favorite_anims) {
current_sanim_name = saturn_animations_list[anim];
const bool is_selected = (current_sanim_id == anim);
auto position = std::find(favorite_anims.begin(), favorite_anims.end(), anim);
if (ImGui::SmallButton((std::string(ICON_FK_STAR) + "###" + std::to_string(anim)).c_str())) {
favorite_anims.erase(position);
saturn_save_favorite_anims();
}
ImGui::SameLine();
if (ImGui::Selectable(current_sanim_name.c_str(), is_selected)) {
current_sanim_index = idx;
current_sanim_name = saturn_animations_list[anim];
current_sanim_id = anim;
k_current_anim = encode_animation();
place_keyframe_anim = true;
}
if (is_selected) ImGui::SetItemDefaultFocus();
idx++;
}
} else {
for (auto &[a,b]:current_anim_map) {
current_sanim_index = a.first;
current_sanim_name = a.second;
const bool is_selected = (current_sanim_id == b);
auto position = std::find(favorite_anims.begin(), favorite_anims.end(), b);
bool contains = position != favorite_anims.end();
if (ImGui::SmallButton((std::string(contains ? ICON_FK_STAR : ICON_FK_STAR_O) + "###" + std::to_string(b)).c_str())) {
if (contains) favorite_anims.erase(position);
else favorite_anims.push_back(b);
saturn_save_favorite_anims();
}
ImGui::SameLine();
if (ImGui::Selectable(current_sanim_name.c_str(), is_selected)) {
current_sanim_index = a.first;
current_sanim_name = a.second;

2
src/saturn/saturn.cpp
View file

@ -17,6 +17,7 @@
#include "saturn/filesystem/saturn_locationfile.h"
#include "data/dynos.cpp.h"
#include "saturn/filesystem/saturn_registerfile.h"
#include "saturn/filesystem/saturn_animfile.h"
#include "saturn/cmd/saturn_cmd.h"
#include "saturn/saturn_rom_extract.h"
@ -674,6 +675,7 @@ void saturn_do_load() {
saturn_load_locations();
saturn_launch_timer = 0;
saturn_cmd_registers_load();
saturn_load_favorite_anims();
saturn_extract_rom(EXTRACT_TYPE_ALL);
}
void saturn_on_splash_finish() {