General cleanup
This commit is contained in:
@@ -5,11 +5,9 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "absl/strings/str_format.h"
|
#include "absl/strings/str_format.h"
|
||||||
|
|
||||||
#include "app/core/constants.h"
|
|
||||||
#include "app/gui/icons.h"
|
#include "app/gui/icons.h"
|
||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
#include "imgui/misc/cpp/imgui_stdlib.h"
|
#include "imgui/misc/cpp/imgui_stdlib.h"
|
||||||
|
|||||||
@@ -2,16 +2,10 @@
|
|||||||
#define YAZE_APP_CORE_LABELING_H_
|
#define YAZE_APP_CORE_LABELING_H_
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <fstream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "absl/status/status.h"
|
#include "absl/strings/string_view.h"
|
||||||
#include "absl/status/statusor.h"
|
|
||||||
|
|
||||||
#include "app/core/constants.h"
|
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
namespace app {
|
namespace app {
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
#ifndef YAZE_APP_CORE_PROJECT_H
|
#ifndef YAZE_APP_CORE_PROJECT_H
|
||||||
#define YAZE_APP_CORE_PROJECT_H
|
#define YAZE_APP_CORE_PROJECT_H
|
||||||
|
|
||||||
#include <filesystem>
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "absl/status/status.h"
|
#include "absl/status/status.h"
|
||||||
#include "absl/strings/match.h"
|
|
||||||
#include "app/core/common.h"
|
#include "app/core/common.h"
|
||||||
#include "app/core/constants.h"
|
#include "app/core/constants.h"
|
||||||
|
|
||||||
@@ -26,7 +22,6 @@ constexpr char kEndOfProjectFile[] = "EndOfProjectFile";
|
|||||||
* user can have different rom file names for a single project and keep track of
|
* user can have different rom file names for a single project and keep track of
|
||||||
* backups.
|
* backups.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct Project : public core::ExperimentFlags {
|
struct Project : public core::ExperimentFlags {
|
||||||
/**
|
/**
|
||||||
* @brief Creates a new project.
|
* @brief Creates a new project.
|
||||||
@@ -109,7 +104,6 @@ struct Project : public core::ExperimentFlags {
|
|||||||
std::string rom_filename_ = "";
|
std::string rom_filename_ = "";
|
||||||
std::string code_folder_ = "";
|
std::string code_folder_ = "";
|
||||||
std::string labels_filename_ = "";
|
std::string labels_filename_ = "";
|
||||||
std::vector<std::string> previous_rom_filenames_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace app
|
} // namespace app
|
||||||
|
|||||||
@@ -1,20 +1,13 @@
|
|||||||
#include "gfx_group_editor.h"
|
#include "gfx_group_editor.h"
|
||||||
|
|
||||||
#include <cmath>
|
|
||||||
|
|
||||||
#include "absl/status/status.h"
|
#include "absl/status/status.h"
|
||||||
#include "absl/status/statusor.h"
|
#include "absl/status/statusor.h"
|
||||||
#include "app/editor/graphics/palette_editor.h"
|
|
||||||
#include "app/editor/utils/editor.h"
|
|
||||||
#include "app/gfx/bitmap.h"
|
#include "app/gfx/bitmap.h"
|
||||||
#include "app/gfx/snes_palette.h"
|
#include "app/gfx/snes_palette.h"
|
||||||
#include "app/gfx/snes_tile.h"
|
|
||||||
#include "app/gui/canvas.h"
|
#include "app/gui/canvas.h"
|
||||||
#include "app/gui/color.h"
|
#include "app/gui/color.h"
|
||||||
#include "app/gui/icons.h"
|
|
||||||
#include "app/gui/input.h"
|
#include "app/gui/input.h"
|
||||||
#include "app/rom.h"
|
#include "app/rom.h"
|
||||||
#include "app/zelda3/overworld/overworld.h"
|
|
||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
|
|
||||||
namespace yaze {
|
namespace yaze {
|
||||||
@@ -26,7 +19,6 @@ using ImGui::BeginGroup;
|
|||||||
using ImGui::BeginTabBar;
|
using ImGui::BeginTabBar;
|
||||||
using ImGui::BeginTabItem;
|
using ImGui::BeginTabItem;
|
||||||
using ImGui::BeginTable;
|
using ImGui::BeginTable;
|
||||||
using ImGui::ColorButton;
|
|
||||||
using ImGui::EndChild;
|
using ImGui::EndChild;
|
||||||
using ImGui::EndGroup;
|
using ImGui::EndGroup;
|
||||||
using ImGui::EndTabBar;
|
using ImGui::EndTabBar;
|
||||||
@@ -38,7 +30,6 @@ using ImGui::IsItemClicked;
|
|||||||
using ImGui::PopID;
|
using ImGui::PopID;
|
||||||
using ImGui::PushID;
|
using ImGui::PushID;
|
||||||
using ImGui::SameLine;
|
using ImGui::SameLine;
|
||||||
using ImGui::Selectable;
|
|
||||||
using ImGui::Separator;
|
using ImGui::Separator;
|
||||||
using ImGui::SetNextItemWidth;
|
using ImGui::SetNextItemWidth;
|
||||||
using ImGui::TableHeadersRow;
|
using ImGui::TableHeadersRow;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <future>
|
||||||
|
|
||||||
#include "absl/status/status.h"
|
#include "absl/status/status.h"
|
||||||
#include "absl/strings/str_format.h"
|
#include "absl/strings/str_format.h"
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
#ifndef YAZE_APP_DATA_OVERWORLD_H
|
#ifndef YAZE_APP_DATA_OVERWORLD_H
|
||||||
#define YAZE_APP_DATA_OVERWORLD_H
|
#define YAZE_APP_DATA_OVERWORLD_H
|
||||||
|
|
||||||
#include <future>
|
|
||||||
#include <memory>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "absl/container/flat_hash_map.h"
|
#include "absl/container/flat_hash_map.h"
|
||||||
@@ -330,6 +328,7 @@ constexpr int OWHoleArea = 0xDB826;
|
|||||||
constexpr int OWHoleEntrance = 0xDB84C;
|
constexpr int OWHoleEntrance = 0xDB84C;
|
||||||
|
|
||||||
class OverworldEntrance : public GameEntity {
|
class OverworldEntrance : public GameEntity {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
uint16_t map_pos_;
|
uint16_t map_pos_;
|
||||||
uchar entrance_id_;
|
uchar entrance_id_;
|
||||||
|
|||||||
Reference in New Issue
Block a user