Skip to content

Commit

Permalink
Added mouse click functionality.
Browse files Browse the repository at this point in the history
  • Loading branch information
probably-nothing committed Mar 22, 2019
1 parent fab2721 commit 7a9f9ee
Showing 2 changed files with 33 additions and 1 deletion.
29 changes: 28 additions & 1 deletion Engine/Engine.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,15 @@ def __init__(self, engine):
def run(self):
while self.running:
start_time = time.time()


while len(self.engine.mouse_released) != 0:
self.engine.mouse_released.pop()

while len(self.engine.mouse_up_instant) != 0:
key = self.engine.mouse_up_instant.pop()
self.engine.mouse_keys.discard(key)
self.engine.mouse_released.add(key)

if self.engine.active_world is not None:
self.engine.active_world.runEntities()
self.engine.active_world.run()
@@ -49,6 +57,9 @@ def __init__(self):

self.active_world = None
self.pressed_keys = set()
self.mouse_keys = set()
self.mouse_released = set()
self.mouse_up_instant = set()

self.run_thread = self.RunThread(self)
self.run_thread.start()
@@ -68,6 +79,13 @@ def keyPressEvent(self, event):
def keyReleaseEvent(self, event):
self.pressed_keys.discard(event.key())

def mousePressEvent(self, event):
self.mouse_keys.add(event.button())

def mouseReleaseEvent(self, event):
self.mouse_up_instant.add(event.button())


@staticmethod
def start(main):
app = QApplication(sys.argv)
@@ -102,6 +120,15 @@ def key(keyName):
elif keyName == "backspace":
return 0x01000003

@staticmethod
def mouseKey(keyName):
if keyName == "left":
return 0x00000001
if keyName == "right":
return 0x00000002
if keyName == "middle":
return 0x00000004

if __name__ == '__main__':
app = QApplication(sys.argv)
ex = Engine()
5 changes: 5 additions & 0 deletions Engine/World.py
Original file line number Diff line number Diff line change
@@ -90,3 +90,8 @@ def isKeyPressed(self, key):
"""
return (key in self.engine.pressed_keys)

def mousePressed(self, key=0x00000001 ):
return (key in self.engine.mouse_keys)

def mouseReleased(self, key=0x00000001 ):
return (key in self.engine.mouse_released)

0 comments on commit 7a9f9ee

Please sign in to comment.