Skip to content

Update Robot for league of legends compat #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dohinkus wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update Robot for league of legends compat #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb8324
Add minor refactoring
Dohinkus Jul 27, 2021
ee6fe87
Fix seg fault on negative positions
Dohinkus Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions EventWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ namespace EventWriter {
namespace Mouse
{
// Private Members
inline UINT MouseEvent(DWORD flag) { return InputEvent(INPUT_MOUSE, flag); }
UINT MouseEvent(DWORD flag) { return InputEvent(INPUT_MOUSE, flag); }

inline BOOL MoveCursorLinear(DOUBLE x, DOUBLE y, DWORD steps, DWORD milliseconds) {
BOOL MoveCursorLinear(DOUBLE x, DOUBLE y, DWORD steps, DWORD milliseconds) {
BOOL success = true;
POINT cursor_pos;
GetCursorPos(&cursor_pos);
Expand All @@ -58,7 +58,7 @@ namespace EventWriter {
return success;
}

inline BOOL MoveCursorPolar(DOUBLE r, DOUBLE t, DWORD steps, DWORD milliseconds, PolarParams const& origin) {
BOOL MoveCursorPolar(DOUBLE r, DOUBLE t, DWORD steps, DWORD milliseconds, PolarParams const& origin) {
t *= -1;
BOOL success = true;
POINT cursor_pos;
Expand All @@ -81,7 +81,7 @@ namespace EventWriter {
}

// Public Members
inline BOOL MoveCursor(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
BOOL MoveCursor(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
{
if (steps == 0 || type == MoveType::INSTANT) {
return SetCursorPos(roundl(x), roundl(y));
Expand All @@ -94,15 +94,15 @@ namespace EventWriter {
}
}

inline UINT LeftDown() { return MouseEvent(MOUSEEVENTF_LEFTDOWN); }
UINT LeftDown() { return MouseEvent(MOUSEEVENTF_LEFTDOWN); }

inline UINT LeftUp() { return MouseEvent(MOUSEEVENTF_LEFTUP); }
UINT LeftUp() { return MouseEvent(MOUSEEVENTF_LEFTUP); }

inline UINT RightDown() { return MouseEvent(MOUSEEVENTF_RIGHTDOWN); }
UINT RightDown() { return MouseEvent(MOUSEEVENTF_RIGHTDOWN); }

inline UINT RightUp() { return MouseEvent(MOUSEEVENTF_RIGHTUP); }
UINT RightUp() { return MouseEvent(MOUSEEVENTF_RIGHTUP); }

inline UINT LeftClick(DWORD milliseconds)
UINT leftClick(DWORD milliseconds)
{
UINT down = LeftDown();
if (milliseconds != 0)
Expand All @@ -112,7 +112,7 @@ namespace EventWriter {
return down & LeftUp();
}

inline UINT RightClick(DWORD milliseconds)
UINT RightClick(DWORD milliseconds)
{
UINT down = RightDown();
if (milliseconds != 0)
Expand All @@ -122,14 +122,14 @@ namespace EventWriter {
return down & RightUp();
}

inline UINT LeftDrag(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
UINT LeftDrag(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
{
UINT down = LeftDown();
MoveCursor(x, y, steps, type, params, milliseconds);
return down & LeftUp();
}

inline UINT RightDrag(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
UINT RightDrag(DOUBLE x, DOUBLE y, DWORD steps, MoveType type, const MoveParams* params, DWORD milliseconds)
{
UINT down = RightDown();
MoveCursor(x, y, steps, type, params, milliseconds);
Expand All @@ -144,30 +144,30 @@ namespace EventWriter {
namespace Keyboard
{
// Private Members
inline UINT KeyboardEvent(WORD VK, DWORD flag) { return InputEvent(INPUT_KEYBOARD, VK, flag); }
UINT KeyboardEvent(WORD VK, DWORD flag) { return InputEvent(INPUT_KEYBOARD, VK, flag); }

inline UINT KeyboardEvent(WORD VK) { return InputEvent(INPUT_KEYBOARD, VK); }
UINT KeyboardEvent(WORD VK) { return InputEvent(INPUT_KEYBOARD, VK); }

// Public Members
inline UINT KeyDown(WORD VK) {
UINT KeyDownVK(WORD VK) {
return KeyboardEvent(VK);
}

inline UINT KeyUp(WORD VK) {
UINT KeyUpVK(WORD VK) {
return KeyboardEvent(VK, KEYEVENTF_KEYUP);
}

inline UINT KeyDown(char key) {
UINT KeyDown(char key) {
key = (char)toupper(key);
return KeyDown((WORD)key);
}

inline UINT KeyUp(char key) {
UINT KeyUp(char key) {
key = (char)toupper(key);
return KeyUp((WORD)key);
}

inline UINT KeyDown(const char* keys, DWORD milliseconds) {
UINT KeyDown(const char* keys, DWORD milliseconds) {
UINT down = KeyDown(keys[0]);
for (UINT i = 1; keys[i]; ++i) {
if (milliseconds) { Sleep(milliseconds); }
Expand All @@ -176,7 +176,7 @@ namespace EventWriter {
return down;
}

inline UINT KeyUp(const char* keys, DWORD milliseconds) {
UINT KeyUp(const char* keys, DWORD milliseconds) {
UINT up = KeyUp(keys[0]);
for (UINT i = 1; keys[i]; ++i) {
if (milliseconds) { Sleep(milliseconds); }
Expand All @@ -185,13 +185,19 @@ namespace EventWriter {
return up;
}

inline UINT KeyType(char key, DWORD milliseconds) {
UINT KeyTypeVK(WORD VK, DWORD milliseconds) {
UINT down = KeyDown(VK);
if (milliseconds) { Sleep(milliseconds); }
return down & KeyUp(VK);
}

UINT KeyType(char key, DWORD milliseconds) {
UINT down = KeyDown(key);
if (milliseconds) { Sleep(milliseconds); }
return down & KeyUp(key);
}

inline UINT KeyType(const char* word, DWORD milliseconds) {
UINT KeyType(const char* word, DWORD milliseconds) {
UINT typed = KeyType(word[0], milliseconds);
for (UINT i = 1; word[i]; ++i) {
if (milliseconds) { Sleep(milliseconds); }
Expand Down
8 changes: 5 additions & 3 deletions EventWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace EventWriter {

UINT RightUp();

UINT LeftClick(DWORD milliseconds = 0);
UINT leftClick(DWORD milliseconds = 0);

UINT RightClick(DWORD milliseconds = 0);

Expand All @@ -51,9 +51,9 @@ namespace EventWriter {

namespace Keyboard
{
UINT KeyDown(WORD VK);
UINT KeyDownVK(WORD VK);

UINT KeyUp(WORD VK);
UINT KeyUpVK(WORD VK);

UINT KeyDown(char key);

Expand All @@ -63,6 +63,8 @@ namespace EventWriter {

UINT KeyUp(const char* keys, DWORD milliseconds = 0);

UINT KeyTypeVK(WORD VK, DWORD milliseconds = 0);

UINT KeyType(char key, DWORD milliseconds = 0);

UINT KeyType(const char* word, DWORD milliseconds = 0);
Expand Down
2 changes: 1 addition & 1 deletion Robot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ UINT Robot::leftClick(POINT p, DWORD milliseconds)

UINT Robot::leftClick(DWORD milliseconds)
{
return EventWriter::Mouse::LeftClick(milliseconds);
return EventWriter::Mouse::leftClick(milliseconds);
}

UINT Robot::rightClick(LONG x, LONG y, DWORD milliseconds)
Expand Down
5 changes: 4 additions & 1 deletion ScreenReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ ScreenReader::~ScreenReader() { destroy(); }

int ScreenReader::updatePixels()
{
BitBlt(m_CaptureDC, 0, 0, getWidth(), getHeight(), m_WindowDC, 0, 0, SRCCOPY | CAPTUREBLT);

return GetDIBits(
m_CaptureDC,
m_CaptureBitmap,
Expand All @@ -98,7 +100,8 @@ int ScreenReader::updatePixels()

RGBQUAD ScreenReader::getPixel(LONG x, LONG y) const
{
return m_Pixels[coordToIndex(x, y)];
LONG index = coordToIndex(x, y);
return m_Pixels[clamp<LONG>(index, 0, getWidth() * getHeight() - 1)];
}

BYTE ScreenReader::getRed(LONG x, LONG y) const
Expand Down
3 changes: 2 additions & 1 deletion ScreenReader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#pragma once

#include <string>
#include <Windows.h>
#include <string>


class ScreenReader
{
Expand Down