From b8d472ff024ad5b13dfe0c33ae10d5fdf8a2c4cc Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Sun, 17 Jan 2021 16:24:25 -0800 Subject: hmmm --- App2/Main.cpp | 147 ++-------------------------------------------------------- 1 file changed, 4 insertions(+), 143 deletions(-) (limited to 'App2/Main.cpp') diff --git a/App2/Main.cpp b/App2/Main.cpp index 30deff2..554aab5 100644 --- a/App2/Main.cpp +++ b/App2/Main.cpp @@ -5,35 +5,12 @@ #include "Memory.h" #include "Random.h" #include "Randomizer.h" -#include "Randomizer2.h" #include "Panels_.h" #define HEARTBEAT 0x401 #define RANDOMIZE_READY 0x402 #define RANDOMIZING 0403 -#define RANDOMIZE_DONE 0x404 #define RANDOMIZE_CHALLENGE_DONE 0x405 -#define CHALLENGE_ONLY 0x406 -#define DISABLE_SNIPES 0x407 -#define SPEED_UP_AUTOSCROLLERS 0x408 - -/* ------- Temp ------- */ -#include "Solver.h" -#include "PuzzleSerializer.h" -#include -#include - -#define TMP1 0x501 -#define TMP2 0x502 -#define TMP3 0x503 -#define TMP4 0x504 - -HWND g_panelId; -Puzzle g_puzzle; - -HWND g_rngDebug; -#define TMP5 0x505 -/* ------- Temp ------- */ // Globals HWND g_hwnd; @@ -42,7 +19,6 @@ HWND g_randomizerStatus; HINSTANCE g_hInstance; auto g_witnessProc = std::make_shared(L"witness64_d3d11.exe"); std::shared_ptr g_randomizer; -std::shared_ptr g_randomizer2; void SetRandomSeed(); LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -64,14 +40,12 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) // Shut down randomizer, wait for startup if (g_randomizer) { g_randomizer = nullptr; - g_randomizer2 = nullptr; EnableWindow(g_randomizerStatus, FALSE); } break; case ProcStatus::Running: if (!g_randomizer) { g_randomizer = std::make_shared(g_witnessProc); - g_randomizer2 = std::make_shared(g_witnessProc); PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_READY, NULL); } break; @@ -83,11 +57,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case RANDOMIZE_READY: EnableWindow(g_randomizerStatus, TRUE); - if (IsDlgButtonChecked(hwnd, CHALLENGE_ONLY)) { - SetWindowText(g_randomizerStatus, L"Randomize Challenge"); - } else { - SetWindowText(g_randomizerStatus, L"Randomize"); - } + SetWindowText(g_randomizerStatus, L"Randomize Challenge"); break; case RANDOMIZING: if (!g_randomizer) break; // E.g. an enter press at the wrong time @@ -95,27 +65,11 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) SetRandomSeed(); std::thread([]{ - if (IsDlgButtonChecked(g_hwnd, DISABLE_SNIPES)) { - MEMORY_CATCH(g_randomizer->PreventSnipes()); - } - if (IsDlgButtonChecked(g_hwnd, SPEED_UP_AUTOSCROLLERS)) { - MEMORY_CATCH(g_randomizer->AdjustSpeed()); - } - if (IsDlgButtonChecked(g_hwnd, CHALLENGE_ONLY)) { - SetWindowText(g_randomizerStatus, L"Randomizing Challenge..."); - MEMORY_CATCH(g_randomizer->RandomizeChallenge()); - PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_CHALLENGE_DONE, NULL); - } else { - SetWindowText(g_randomizerStatus, L"Randomizing..."); - MEMORY_CATCH(g_randomizer->Randomize()); - PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_DONE, NULL); - } + SetWindowText(g_randomizerStatus, L"Randomizing Challenge..."); + MEMORY_CATCH(g_randomizer->RandomizeChallenge()); + PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_CHALLENGE_DONE, NULL); }).detach(); break; - case RANDOMIZE_DONE: - EnableWindow(g_randomizerStatus, FALSE); - SetWindowText(g_randomizerStatus, L"Randomized!"); - break; case RANDOMIZE_CHALLENGE_DONE: EnableWindow(g_randomizerStatus, FALSE); SetWindowText(g_randomizerStatus, L"Randomized Challenge!"); @@ -125,80 +79,6 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_READY, NULL); }).detach(); break; - case CHALLENGE_ONLY: - CheckDlgButton(hwnd, CHALLENGE_ONLY, !IsDlgButtonChecked(hwnd, CHALLENGE_ONLY)); - if (IsWindowEnabled(g_randomizerStatus)) { - PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_READY, NULL); - } - break; - case DISABLE_SNIPES: - CheckDlgButton(hwnd, DISABLE_SNIPES, !IsDlgButtonChecked(hwnd, DISABLE_SNIPES)); - break; - case SPEED_UP_AUTOSCROLLERS: - CheckDlgButton(hwnd, SPEED_UP_AUTOSCROLLERS, !IsDlgButtonChecked(hwnd, SPEED_UP_AUTOSCROLLERS)); - break; - case TMP1: - { - std::wstring text(128, L'\0'); - int length = GetWindowText(g_panelId, text.data(), static_cast(text.size())); - text.resize(length); - std::wstringstream s; - int panelId; - s << text; - s >> std::hex >> panelId; - g_puzzle = PuzzleSerializer(g_witnessProc).ReadPuzzle(panelId); - } - break; - case TMP2: - { - std::wstring text(128, L'\0'); - int length = GetWindowText(g_panelId, text.data(), static_cast(text.size())); - text.resize(length); - std::wstringstream s; - int panelId; - s << text; - s >> std::hex >> panelId; - PuzzleSerializer(g_witnessProc).WritePuzzle(g_puzzle, panelId); - } - break; - case TMP3: - { - for (auto [key, value] : PANELS) { - std::stringstream out; - std::string name(value); - out << " {'id': 0x" << std::hex << std::uppercase << std::setfill('0') << std::setw(5) << key << ", 'area':'"; - int k; - for (k=0; name[k] != ' '; k++) out << name[k]; - if (name[k+2] == ' ') { - out << name[k] << name[k+1]; - k += 2; - } - out << "', 'name':'"; - k++; - for (k; k < name.size(); k++) out << name[k]; - out << "', 'data':'"; - auto puzzle = PuzzleSerializer(g_witnessProc).ReadPuzzle(key); - out << puzzle.Serialize(); - out << "'},\r\n"; - DebugPrint(out.str()); - } - } - - // Solver::Solve(g_puzzle); - break; - case TMP4: - SetRandomSeed(); - g_randomizer2->Randomize(); - case TMP5: - { - std::wstring text; - for (int i=0; i<10; i++) { - Random::SetSeed(i); - int rng = Random::RandInt(0, 999999); - text += std::to_wstring(rng) + L"\n"; - } - SetWindowText(g_rngDebug, text.c_str()); - } } } return DefWindowProc(hwnd, message, wParam, lParam); @@ -278,25 +158,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance PostMessage(g_seed, EM_SETEVENTMASK, 0, ENM_KEYEVENTS); g_randomizerStatus = CreateButton(120, 10, 180, L"Randomize", RANDOMIZING); EnableWindow(g_randomizerStatus, FALSE); - CreateCheckbox(10, 300, CHALLENGE_ONLY); - CreateLabel(30, 300, 200, L"Randomize the challenge only"); - CreateCheckbox(10, 320, DISABLE_SNIPES); - CheckDlgButton(g_hwnd, DISABLE_SNIPES, TRUE); - CreateLabel(30, 320, 240, L"Disable Swamp and Shadows snipes"); - CreateCheckbox(10, 340, SPEED_UP_AUTOSCROLLERS); - CreateLabel(30, 340, 205, L"Speed up various autoscrollers"); - - // CreateButton(200, 50, 200, L"Test RNG", TMP5); - // g_rngDebug = CreateWindow(L"STATIC", L"", - // WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, - // 200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL); -//#ifndef NDEBUG -// g_panelId = CreateText(200, 100, 100, L"59"); -// CreateButton(200, 130, 100, L"Read", TMP1); -// CreateButton(200, 160, 100, L"Write", TMP2); - CreateButton(200, 190, 100, L"Solve", TMP3); -// CreateButton(200, 220, 100, L"Randomize2", TMP4); -//#endif g_witnessProc->StartHeartbeat(g_hwnd, HEARTBEAT); -- cgit 1.4.1