Detecção de cadeias de inputs

- Realocação das classes em arquivos exclusivos para elas
- Criação do .gitignore para os arquivos do python e do VIM

Author: Rafagd

.gitignore

@@ -1,54 +1,9 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
+*~
 
-# C extensions
-*.so
+*.pyc
+*.pyo
 
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
+*.swp
+*.swo
 
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/

Application.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+import json
+import sfml as sf
+
+class Application :
+    _instance = None
+
+    @classmethod
+    def instance(klass) :
+        print klass._instance
+        if klass._instance == None :
+            klass._instance = Application()
+        return klass._instance
+
+    def __init__(self):
+        self.state  = None
+        self.window = None
+
+        f = open("config.json")
+        self.config = json.load(f)
+        f.close()
+
+    def run(self) :
+        self.window = sf.RenderWindow(sf.VideoMode(800, 600), "Input Test")
+        self.state  = FightState()
+
+        self.window.framerate_limit    = 60
+        self.window.key_repeat_enabled = False
+
+        clock  = sf.Clock();
+        offset = clock.elapsed_time.seconds - int(clock.elapsed_time.seconds)
+
+        last_frame = -1
+
+        while self.window.is_open :
+            frame = int((clock.elapsed_time.seconds - offset) / (1.0 / 60.0))
+
+            for event in self.window.events :
+   
+                if type(event) == sf.CloseEvent :
+                    self.window.close()
+                    break
+
+                elif type(event) == sf.KeyEvent and event.pressed and event.code == sf.Keyboard.ESCAPE :
+                    self.window.close()
+                    break
+
+                elif type(event) == sf.KeyEvent :
+                    self.state.input(frame, event)
+
+            if frame != last_frame :
+                self.state.update(frame)
+                self.state.draw(frame, self.window)
+           
+            last_frame = frame
+       
+        f = open("log", "w+")
+        json.dump(self.state.p1.controller.buffer, f, indent=True)
+        f.close()
+
+from FightState import *

Character.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+import json
+import sfml as sf
+
+class Character :
+
+    def __init__(self, name) :
+        self.data   = None
+        self.path   = "chars/" + name + "/"
+        self.image  = None
+        self.sprite = None
+
+        self.state         = ""
+        self.current_frame = 0
+        self.frame_count   = 0
+
+        f = open(self.path + "data.json")
+        self.data = json.load(f)
+        f.close()
+
+        self.load_image()
+        self.load_sprite()
+
+        self.change_state("idle")
+
+    def load_image(self) :
+        self.image = sf.Image.from_file(self.path + self.data["image"])
+        self.image.create_mask_from_color(sf.Color(0x00, 0xFF, 0x00))
+
+    def load_sprite(self) :
+        self.sprite       = sf.Sprite(sf.Texture.from_image(self.image))
+        self.sprite.ratio = sf.Vector2(2, 2)
+
+    def change_state(self, state) :
+        self.state         = state
+        self.current_frame = 0
+        self.frame_count   = len(self.data[self.state]["frames"])
+
+    def draw(self, frame, window) :
+        current_frame = self.data[self.state]["frames"][self.current_frame]
+
+        self.sprite.texture_rectangle = sf.Rectangle(
+            sf.Vector2(current_frame["x"], current_frame["y"]),
+            sf.Vector2(current_frame["w"], current_frame["h"])
+        )
+
+        window.draw(self.sprite)
+
+        self.current_frame = (self.current_frame + 1) % self.frame_count

FightState.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+class FightState :
+
+    def __init__(self) :
+        self.p1 = Player("player1", "aoko")
+        self.p2 = Player("player2", "aoko")
+       
+    def input(self, frame, event) :
+        self.p1.input(frame, event)
+        self.p2.input(frame, event)
+
+    def update(self, frame) :
+        self.p1.update(frame)
+        self.p2.update(frame)
+        pass
+
+    def draw(self, frame, window) :
+        self.p1.draw(frame, window)
+        self.p2.draw(frame, window)
+
+from Player import *

Player.py

@@ -0,0 +1,21 @@
+# -*- conding: utf-8 -*-
+
+class Player :
+   
+    def __init__(self, player_id, character):
+        config          = Application.instance().config
+        self.controller = PlayerController(config[player_id])
+        self.character  = Character(character)
+
+    def input(self, frame, event) :
+        self.controller.check(frame, event)   
+       
+    def update(self, frame) :
+        pass
+
+    def draw(self, frame, window) :
+        self.character.draw(frame, window)
+
+from Application      import *
+from PlayerController import *
+from Character        import *

PlayerController.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+class PlayerController :
+
+    def __init__(self, keys) :
+        self.keys     = keys
+        self.repr     = {}
+
+        for k in keys :
+            if (k != "confirm") and (k != "cancel") :
+                self.repr[self.keys[k]] = k
+
+        self.buffer        = [] # (frame, key, hold)
+        self.buffer_offset = 0
+        self.buffer_limit  = 30 # 500ms
+
+    def check(self, frame, event) :
+        try :
+            key = self.repr[event.code]
+        except :
+            return
+
+        try :
+            last_frame = self.buffer[-1][0]
+            last_key   = self.buffer[-1][1]
+        except :
+            last_frame = -1
+            last_key   = -1
+
+        valid_frame = frame - self.buffer_limit
+
+        if event.pressed :
+            if last_frame > valid_frame and key == last_key :
+                return
+
+            self.buffer.append((frame, key, -1))
+
+        else :
+            i = -1
+
+            try :
+                while i >= -len(self.buffer) :
+                    current = self.buffer[i]
+
+                    if current[1] == key :
+                        self.buffer[i] = (
+                            self.buffer[i][0],
+                            self.buffer[i][1],
+                            frame - self.buffer[i][0]
+                        )
+                        break
+                    i -= 1
+            except :
+                pass
+

README.md

@@ -1,7 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-data = {
+{
+    "hp" : 1000,
+    "image": "aoko.png",
     "idle" : {
         "start" : [],
         "frames" : [
@@ -12,15 +11,15 @@
             { "x": 221, "y": 0,  "w": 58, "h": 109 },
             { "x": 271, "y": 0,  "w": 58, "h": 109 },
             { "x": 323, "y": 0,  "w": 58, "h": 109 },
-            { "x": 378, "y": 0,  "w": 58, "h": 109 },
+            { "x": 378, "y": 0,  "w": 58, "h": 109 }
         ],
-        "recover" : [],
+        "recover" : []
     },
     "walk" : {
         "start" : [
             { "x": -5,  "y": 235, "w": 58, "h": 109 },
             { "x": 50,  "y": 235, "w": 58, "h": 109 },
-            { "x": 102, "y": 235, "w": 58, "h": 109 },
+            { "x": 102, "y": 235, "w": 58, "h": 109 }
         ],
         "frames" : [
             { "x": 162, "y": 235, "w": 58, "h": 109 },
@@ -29,17 +28,12 @@
             { "x": 353, "y": 235, "w": 58, "h": 109 },
             { "x": 433, "y": 235, "w": 70, "h": 109 },
             { "x": 512, "y": 235, "w": 70, "h": 109 },
-            { "x": 595, "y": 235, "w": 70, "h": 109 },
+            { "x": 595, "y": 235, "w": 70, "h": 109 }
         ],
         "recover" : [
             { "x": 102, "y": 235, "w": 58, "h": 109 },
             { "x": 50,  "y": 235, "w": 58, "h": 109 },
-            { "x": -5,  "y": 235, "w": 58, "h": 109 },
-        ],
+            { "x": -5,  "y": 235, "w": 58, "h": 109 }
+        ]
     }
 }
-
-state = "idle"
-
-i = 0;
-m = len(data[state]["frames"])

aoko.png

@@ -0,0 +1,7 @@
+{
+    "player1" : {
+    },
+
+    "player2" : {
+    }
+}