6 Commits

Author SHA1 Message Date
5e4f4e27f6 Merge pull request 'Fixed Button dll input/output.' (#21) from NetChannels into main
Some checks failed
Build & Release / Windows-AMD64-Build (push) Failing after 2m8s
Build & Release / Linux-AARCH64-Build (push) Failing after 13s
Build & Release / Linux-AMD64-Build (push) Successful in 7m37s
Reviewed-on: #21
2025-08-13 21:35:56 -07:00
a6eb7f6e97 Merge pull request 'NetChannels' (#20) from NetChannels into main
Reviewed-on: #20
2025-08-13 19:32:54 -07:00
fd452f6643 Merge pull request 'NetChannels' (#19) from NetChannels into main
Reviewed-on: #19
2025-03-28 23:11:54 -07:00
389fa61fba Merge pull request 'Fixed gitea workflow.' (#18) from NetChannels into main
Some checks failed
Build & Release / Windows-AMD64-Build (push) Failing after 21s
Build & Release / Linux-AARCH64-Build (push) Successful in 43m31s
Build & Release / Linux-AMD64-Build (push) Successful in 15m15s
Reviewed-on: #18
2025-03-25 18:43:47 -07:00
a67197766e Merge pull request 'Fixed gitea workflow.' (#17) from NetChannels into main
Some checks failed
Build & Release / Windows-AMD64-Build (push) Failing after 25s
Build & Release / Linux-AMD64-Build (push) Failing after 11m42s
Build & Release / Linux-AARCH64-Build (push) Successful in 43m39s
Reviewed-on: #17
2025-03-25 18:37:27 -07:00
ae414c5c99 Merge pull request 'Added CPU::GetCacheLineSize() definition for Windows.' (#16) from NetChannels into main
Reviewed-on: #16
2025-03-25 16:50:40 -07:00
3 changed files with 21 additions and 21 deletions

View File

@@ -10,7 +10,7 @@ namespace ehs
{
private:
Array<InputHandler*> handlers;
bool initialized;
bool initalized;
public:
~Input();
@@ -31,13 +31,13 @@ namespace ehs
void Poll();
bool HasHandler(UInt_64 hashId) const;
bool HasHandler(const UInt_64 hashId) const;
bool HasHandler(const Str_8& id) const;
bool AddHandler(InputHandler* handler);
const InputHandler* GetHandler(UInt_64 hashId) const;
const InputHandler* GetHandler(const UInt_64 hashId) const;
const InputHandler* GetHandler(const Str_8& id) const;

View File

@@ -31,9 +31,9 @@ namespace ehs
InputHandler& operator=(const InputHandler& ih);
bool operator==(UInt_64 otherHashId) const;
bool operator==(const UInt_64 otherHashId) const;
bool operator!=(UInt_64 otherHashId) const;
bool operator!=(const UInt_64 otherHashId) const;
virtual bool Initialize();
@@ -47,13 +47,13 @@ namespace ehs
void ResetAllStates();
bool HasDevice(UInt_64 id) const;
bool HasDevice(const UInt_64 id) const;
bool AddDevice(HID* device);
HID* GetDevice(UInt_64 id) const;
HID* GetDevice(const UInt_64 id) const;
HID* GetDeviceByType(UInt_8 type) const;
HID* GetDeviceByType(const UInt_8 type) const;
virtual bool IsInitialized() const;
};

View File

@@ -9,18 +9,18 @@ namespace ehs
}
Input::Input()
: initialized(false)
: initalized(false)
{
}
Input::Input(Input&& input) noexcept
: handlers((Array<InputHandler*>&&)input.handlers), initialized(input.initialized)
: handlers((Array<InputHandler*>&&)input.handlers), initalized(input.initalized)
{
input.initialized = false;
input.initalized = false;
}
Input::Input(const Input& input)
: initialized(false)
: initalized(false)
{
}
@@ -30,9 +30,9 @@ namespace ehs
return *this;
handlers = (Array<InputHandler*>&&)input.handlers;
initialized = input.initialized;
initalized = input.initalized;
input.initialized = false;
input.initalized = false;
return *this;
}
@@ -46,14 +46,14 @@ namespace ehs
delete handlers;
handlers = Array<InputHandler*>();
initialized = false;
initalized = false;
return *this;
}
void Input::Initialize()
{
if (initialized)
if (initalized)
return;
UInt_64 i = 0;
@@ -72,12 +72,12 @@ namespace ehs
i++;
}
initialized = true;
initalized = true;
}
void Input::Release()
{
if (!initialized)
if (!initalized)
return;
UInt_64 i = 0;
@@ -96,7 +96,7 @@ namespace ehs
i++;
}
initialized = false;
initalized = false;
}
void Input::Poll()
@@ -124,7 +124,7 @@ namespace ehs
if (HasHandler(handler->GetHashId()))
return false;
if (initialized)
if (initalized)
{
bool hInitialized = handler->Initialize();
if (!hInitialized)
@@ -155,6 +155,6 @@ namespace ehs
bool Input::IsInitialized() const
{
return initialized;
return initalized;
}
}