diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2021-09-24 18:54:22 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2021-09-24 18:54:22 -0400 |
commit | bad7b20434cebca369c6bf71fdbae9ed5a157119 (patch) | |
tree | 54adb230d60ee38ecfa4ef4b447c4ec366f291dc /Source/Memory.h | |
parent | 92461067047993a828b43afe4eb79208aaae4862 (diff) | |
download | witness-tutorializer-bad7b20434cebca369c6bf71fdbae9ed5a157119.tar.gz witness-tutorializer-bad7b20434cebca369c6bf71fdbae9ed5a157119.tar.bz2 witness-tutorializer-bad7b20434cebca369c6bf71fdbae9ed5a157119.zip |
Reverted the Sigma backport memory stuff
Diffstat (limited to 'Source/Memory.h')
-rw-r--r-- | Source/Memory.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Memory.h b/Source/Memory.h index fc67b4f..601b233 100644 --- a/Source/Memory.h +++ b/Source/Memory.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | 2 | ||
3 | //extern int GLOBALS, POSITION, ORIENTATION, PATH_COLOR, REFLECTION_PATH_COLOR, DOT_COLOR, ACTIVE_COLOR, BACKGROUND_REGION_COLOR, SUCCESS_COLOR_A, SUCCESS_COLOR_B, STROBE_COLOR_A, STROBE_COLOR_B, ERROR_COLOR, PATTERN_POINT_COLOR, PATTERN_POINT_COLOR_A, PATTERN_POINT_COLOR_B, SYMBOL_A, SYMBOL_B, SYMBOL_C, SYMBOL_D, SYMBOL_E, PUSH_SYMBOL_COLORS, OUTER_BACKGROUND, OUTER_BACKGROUND_MODE, TRACED_EDGES, AUDIO_PREFIX, POWER, TARGET, POWER_OFF_ON_FAIL, IS_CYLINDER, CYLINDER_Z0, CYLINDER_Z1, CYLINDER_RADIUS, CURSOR_SPEED_SCALE, NEEDS_REDRAW, SPECULAR_ADD, SPECULAR_POWER, PATH_WIDTH_SCALE, STARTPOINT_SCALE, NUM_DOTS, NUM_CONNECTIONS, MAX_BROADCAST_DISTANCE, DOT_POSITIONS, DOT_FLAGS, DOT_CONNECTION_A, DOT_CONNECTION_B, DECORATIONS, DECORATION_FLAGS, DECORATION_COLORS, NUM_DECORATIONS, REFLECTION_DATA, GRID_SIZE_X, GRID_SIZE_Y, STYLE_FLAGS, SEQUENCE_LEN, SEQUENCE, DOT_SEQUENCE_LEN, DOT_SEQUENCE, DOT_SEQUENCE_LEN_REFLECTION, DOT_SEQUENCE_REFLECTION, NUM_COLORED_REGIONS, COLORED_REGIONS, PANEL_TARGET, SPECULAR_TEXTURE, CABLE_TARGET_2, AUDIO_LOG_NAME, OPEN_RATE, METADATA, HOTEL_EP_NAME; | 3 | extern int GLOBALS, POSITION, ORIENTATION, PATH_COLOR, REFLECTION_PATH_COLOR, DOT_COLOR, ACTIVE_COLOR, BACKGROUND_REGION_COLOR, SUCCESS_COLOR_A, SUCCESS_COLOR_B, STROBE_COLOR_A, STROBE_COLOR_B, ERROR_COLOR, PATTERN_POINT_COLOR, PATTERN_POINT_COLOR_A, PATTERN_POINT_COLOR_B, SYMBOL_A, SYMBOL_B, SYMBOL_C, SYMBOL_D, SYMBOL_E, PUSH_SYMBOL_COLORS, OUTER_BACKGROUND, OUTER_BACKGROUND_MODE, TRACED_EDGES, AUDIO_PREFIX, POWER, TARGET, POWER_OFF_ON_FAIL, IS_CYLINDER, CYLINDER_Z0, CYLINDER_Z1, CYLINDER_RADIUS, CURSOR_SPEED_SCALE, NEEDS_REDRAW, SPECULAR_ADD, SPECULAR_POWER, PATH_WIDTH_SCALE, STARTPOINT_SCALE, NUM_DOTS, NUM_CONNECTIONS, MAX_BROADCAST_DISTANCE, DOT_POSITIONS, DOT_FLAGS, DOT_CONNECTION_A, DOT_CONNECTION_B, DECORATIONS, DECORATION_FLAGS, DECORATION_COLORS, NUM_DECORATIONS, REFLECTION_DATA, GRID_SIZE_X, GRID_SIZE_Y, STYLE_FLAGS, SEQUENCE_LEN, SEQUENCE, DOT_SEQUENCE_LEN, DOT_SEQUENCE, DOT_SEQUENCE_LEN_REFLECTION, DOT_SEQUENCE_REFLECTION, NUM_COLORED_REGIONS, COLORED_REGIONS, PANEL_TARGET, SPECULAR_TEXTURE, CABLE_TARGET_2, AUDIO_LOG_NAME, OPEN_RATE, METADATA, HOTEL_EP_NAME, RANDOMISE_ON_POWER_ON; |
4 | 4 | ||
5 | enum class ProcStatus { | 5 | enum class ProcStatus { |
6 | NotRunning, | 6 | NotRunning, |
@@ -92,8 +92,6 @@ public: | |||
92 | } | 92 | } |
93 | 93 | ||
94 | static int GLOBALS; | 94 | static int GLOBALS; |
95 | static int globalsTests[3]; | ||
96 | |||
97 | private: | 95 | private: |
98 | template<class T> | 96 | template<class T> |
99 | std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) { | 97 | std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) { |
@@ -117,6 +115,7 @@ private: | |||
117 | void Heartbeat(HWND window, WPARAM wParam); | 115 | void Heartbeat(HWND window, WPARAM wParam); |
118 | bool Initialize(); | 116 | bool Initialize(); |
119 | void* ComputeOffset(std::vector<int> offsets); | 117 | void* ComputeOffset(std::vector<int> offsets); |
118 | void LoadPanelOffsets(); | ||
120 | 119 | ||
121 | int _previousFrame = 0; | 120 | int _previousFrame = 0; |
122 | bool _threadActive = false; | 121 | bool _threadActive = false; |