backend-infra-engineer: Pre-0.2.2 2024 Q3 snapshot
This commit is contained in:
@@ -8,6 +8,7 @@ add_executable(
|
||||
app/core/labeling.cc
|
||||
app/gui/pipeline.cc
|
||||
app/editor/context/gfx_context.cc
|
||||
app/core/platform/file_dialog.mm
|
||||
${YAZE_APP_EMU_SRC}
|
||||
${YAZE_APP_GFX_SRC}
|
||||
${YAZE_APP_ZELDA3_SRC}
|
||||
@@ -19,7 +20,6 @@ target_include_directories(
|
||||
z3ed PUBLIC
|
||||
lib/
|
||||
app/
|
||||
lib/SDL_mixer/include/
|
||||
${CMAKE_SOURCE_DIR}/src/
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${SDL2_INCLUDE_DIR}
|
||||
@@ -34,6 +34,5 @@ target_link_libraries(
|
||||
${GLEW_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${CMAKE_DL_LIBS}
|
||||
SDL2_mixer
|
||||
ImGui
|
||||
)
|
||||
@@ -65,7 +65,8 @@ absl::Status Tile16Transfer::handle(const std::vector<std::string>& arg_vec) {
|
||||
|
||||
// Transfer if user confirms
|
||||
if (userChoice == 'y' || userChoice == 'Y') {
|
||||
dest_rom.WriteTile16(tile16_id_int, source_tile16_data);
|
||||
RETURN_IF_ERROR(
|
||||
dest_rom.WriteTile16(tile16_id_int, source_tile16_data));
|
||||
std::cout << "Transferred tile16 ID " << tile16_id_int
|
||||
<< " to dest rom." << std::endl;
|
||||
} else {
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#include "app/gfx/snes_palette.h"
|
||||
#include "app/gfx/snes_tile.h"
|
||||
#include "app/gui/canvas.h"
|
||||
#include "app/gui/pipeline.h"
|
||||
#include "app/rom.h" // for Rom
|
||||
#include "app/zelda3/overworld/overworld.h"
|
||||
#include "cli/patch.h" // for ApplyBpsPatch, CreateBpsPatch
|
||||
@@ -316,39 +315,6 @@ class Emulator : public CommandHandler {
|
||||
std::string filename = arg_vec[0];
|
||||
RETURN_IF_ERROR(rom_.LoadFromFile(filename))
|
||||
|
||||
bool step = false;
|
||||
if (arg_vec[1].empty()) {
|
||||
snes.SetCpuMode(0);
|
||||
} else {
|
||||
snes.SetCpuMode(1);
|
||||
step = true;
|
||||
}
|
||||
|
||||
snes.SetupMemory(rom_);
|
||||
snes.Init(rom_);
|
||||
|
||||
if (!step) {
|
||||
int i = 0;
|
||||
while (i < 80000) {
|
||||
snes.Run();
|
||||
i++;
|
||||
}
|
||||
} else {
|
||||
// This loop should take in input from the keyboard, such as pressing
|
||||
// space to step through the loop and pressing x to end the execution.
|
||||
bool stepping = true;
|
||||
std::cout << "Press space to step, x to exit" << std::endl;
|
||||
while (stepping) {
|
||||
char input;
|
||||
std::cin.get(input);
|
||||
if (input == 'x') {
|
||||
break;
|
||||
} else {
|
||||
snes.StepRun();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return absl::OkStatus();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user