make more finest code in area1game1

1 files changed, 11 insertions, 26 deletions

diff --git a/src/states/Area1Game1.py b/src/states/Area1Game1.py
index 9cd7045..b12fffd 100755
--- a/src/states/Area1Game1.py
+++ b/src/states/Area1Game1.py
@@ -45,21 +45,20 @@ class Piece(CSprite):
     TIME_RETURN = 15
     TIME_ADJUST = 8
 
-    RADIUS_COLLISION = 20
+    RADIUS_COLLISION = 40
     
     mPos = CVector(0.0, 0.0)
     mOrigin = CVector(0.0, 0.0)
     mDest = CVector(0.0, 0.0)
-    center = (0.0, 0.0)
-    size = (0.0, 0.0)
+    #center = (0.0, 0.0)
+    #size = (0.0, 0.0)
     
-    active = False
-    clicked = False
+
 
     def init(self):
         CButton.__init__(self)
-        self.setMaxVel(40, 40)
-        setState(STATE_STALE)
+        self.setMaxVel(100, 100)
+        self.setState(STATE_STALE)
         #image = ....
     def set_origin(self, aOrigin):
         self.mOrigin = aOrigin
@@ -72,22 +71,7 @@ class Piece(CSprite):
     def update(self):
         CSprite.update(self)
         
-        self.clicked = False
-
-        #TODO: Make a CMouse class and check for isPressed() and click().
-
-        #check for mouse input
-        if Mouse.get_pressed() == (1, 0, 0):
-            if self.rect.collidepoint(Mouse.get_position()):
-                self.active = True
-        #check for mouse release
-        if self.active == True:
-            if Mouse.get_pressed() == (0, 0, 0):
-                self.active = False
-                if self.rect.collidepoint(Mouse.get_position()):
-                    self.clicked = True
-                    #print 'click'
-                    self.setState(STATE_DRAG)
+    
 
         if (self.mState == STATE_STALE):
             if self.mouseDown():
@@ -97,7 +81,7 @@ class Piece(CSprite):
         if (self.mState == STATE_DRAG):
             x, y = Mouse.get_position()
             self.setXY(x, y)
-            if self.clicked:
+            if self.clicked():
                 d = Math.dist(self.mPos.getX() , self.mPos.getY(), self.mDest.getX(), self.mDest.getY()) 
                 print 'drag-dist:', d
                 #print 'pos', self.mPos.getX()
@@ -144,8 +128,8 @@ class Piece(CSprite):
             (self.mDest.getY() - self.mPos.getY()) / self.TIME_ADJUST)
         if (aState == STATE_RETURN):
             print 'estado retorno'
-            print 'posx', self.mPos.getX()
-            print 'origx', self.mOrigin.getX()
+            print 'pos', self.mPos.getX(), self.mPos.getY()
+            print 'orig', self.mOrigin.getX(), self.mOrigin.getY()
             x = (self.mOrigin.getX() - self.mPos.getX()) / self.TIME_ADJUST
             y = (self.mOrigin.getY() - self.mPos.getY()) / self.TIME_ADJUST
             print 'vel', x, y
@@ -208,6 +192,7 @@ class CArea1Game1(CGameState):
         self.mPiece1.setImage('assets/images/piece1.png', False)
         self.mPiece1.set_origin(CVector(350.0, 600.0))
         self.mPiece1.set_destine(CVector(435.0, 283.0))
+        self.mPiece1.setState(STATE_STALE)
         #self.mPiece1.setXY(700, 200)
         
         CGame().addChild(self.mPiece1)