Changeset 1163 for Daodan/src/Oni

Timestamp:

Oct 24, 2021, 4:50:48 AM (3 years ago)

Author:

rossy

Message:

Daodan: Add new local input system based on Raw Input

Location:

Daodan/src/Oni

Files:

• GameState.h (modified) (2 diffs)
• Input.h (added)
• Oni.h (modified) (3 diffs)
• Symbols_Func.h (modified) (2 diffs)
• Symbols_Var.h (modified) (1 diff)

Daodan/src/Oni/GameState.h

@@ -1353 +1353 @@
   int field_FC;
   int field_100;
-  char field_104;
+  char SlowMotion;
   char gap_105[3];
-  int SlowMotion;
+  int SlowMotionTimer;
   char gap_10c[4];
   int field_110;
@@ -1362 +1362 @@
   char field_138;
   char gap_139[7];
-  int field_140;
+  int LastSixtieths;
   int GameTime;
-  int field_148;
+  int TargetGameTime;
   int field_14C;
   OniLevel* Level;

Daodan/src/Oni/Oni.h

@@ -9 +9 @@
 #define ONICALL __fastcall
 
+typedef struct {
+        short x;
+        short y;
+} IMtPoint;
 
+// The following headers were written when Daodan used -fpack-struct, and
+// should be rewritten
+#pragma pack(push, 1)
 #include "stdtypes.h"
 #include "BFW_Motoko_Draw.h"
@@ -17 +24 @@
 #include "GL.h"
 #include "OBJt.h"
+#pragma pack(pop)
+
+#include "Input.h"
 
 #define DDmAssert(expr) assert(expr);
@@ -34 +44 @@
 } UUtRect;
 
-typedef struct {
-        uint32_t input;
-        float analog;
-} LItDeviceInput;
-
 #include "Symbols_Var.h"
 #include "Symbols_Func.h"

Daodan/src/Oni/Symbols_Func.h

@@ -57 +57 @@
 
 DefFunc(void, ONrGameState_Timer_Start, ONICALL, (char* function, int time), 0x004FD370);
-DefFunc(void, ONrGameState_HandleUtilityInput, ONICALL, (const void* inInput), 0x004f6200);
+DefFunc(void, ONrGameState_HandleUtilityInput, ONICALL, (GameInput *input), 0x004f6200);
 DefFunc(uint8_t, ONrDebugKey_WentDown, ONICALL, (uint32_t inKey), 0x005050d0);
 
@@ -177 +177 @@
 DefFunc(void, LIrActionBuffer_Add, ONICALL, (void* unknown, LItDeviceInput* input), 0x00403b30);
 
+// Called during the game loop to run the Windows message loop
+DefFunc(UUtBool, LIiPlatform_InputEvent_GetEvent, ONICALL, (void), 0x004036d0);
+
+// Called by the game loop to get the latest input frames
+DefFunc(void, LIrActionBuffer_Get, ONICALL, (short* count, LItActionBuffer **buffers), 0x00403be0);
+
+// Gets the mouse position
+DefFunc(void, LIrPlatform_InputEvent_GetMouse, ONICALL, (int active, LItInputEvent *info), 0x00402ca0);
+
+// Checks if a keyboard key is pressed
+DefFunc(UUtBool, LIrPlatform_TestKey, ONICALL, (int key, int active), 0x00403930);
+
+// Translates a key name (from key_config.txt) to a key code
+DefFunc(int, LIrTranslate_InputName, ONICALL, (char *name), 0x00403a90);
+
+// Updates TargetGameTime in the game state
+DefFunc(void, ONrGameState_UpdateServerTime, ONICALL, (GameState *game_state), 0x004fbeb0);
+
+// Basically stricmp, but it only ever does ASCII case folding
+DefFunc(int, UUrString_Compare_NoCase, ONICALL, (const char *str1, const char *str2), 0x004266d0);
+
+// A safe strcpy which lets you specify the size of the target buffer and always
+// NUL-terminates. Kind of like strlcpy. Just don't call it with dest_size = 0.
+DefFunc(void, UUrString_Copy, ONICALL, (char *dest, const char *src, size_t dest_size), 0x004265f0);
 
 #undef DefFunc

Daodan/src/Oni/Symbols_Var.h

@@ -84 +84 @@
 //#define OBJgFlag_DrawNameDistance     (*((void*)0x005ec634))
 
+// Oni's platform input system stores the window HWND in this global
+#define LIgPlatform_HWND (*((HWND *)0x0055cae8))
+
+// Is Oni's input system active? True in gameplay and false in menus.
+// LIrPlatform_Mode_Set gets called when this changes.
+#define LIgMode_Internal (*((UUtBool *)0x0055fd40))
+
+// List of bindings from Oni's internal key codes to LItActionDescriptions
+#define LIgBindingArray ((LItBinding *)0x0055fa20)
+
+// Is "Invert Mouse" checked in the Options menu? If so, platform specific input
+// code should invert the cursor's Y offset when building LItActionBuffers.
+#define LIgMode_InvertMouse (*((UUtBool *)0x0052ecf4))
+
+// This is a map from DirectInput scan codes to Oni's internal key codes, the
+// latter of which mostly match ASCII for a US keyboard layout. DirectInput scan
+// codes are mostly the same as the PS2 make codes that Windows uses in other
+// APIs except that extended keys are represented by bit 0x80 being set.
+#define LIgPlatform_ScanCodeToChar ((uint8_t *)0x005292b8)
+
+// Script variable to enable/disable centering the cursor in the window when
+// processing input. On by default.
+#define LIgCenterCursor (*((int *)0x0052d88d))
+
+// List of bindable input actions
+#define LIgActionDescriptions ((LItActionDescription*)0x0052db18)
+
 #endif