modify files with the new nomenclator

9 files changed, 54 insertions, 41 deletions

diff --git a/src/Main.py b/src/Main.py
index e0e82c3..a23e015 100755
--- a/src/Main.py
+++ b/src/Main.py
@@ -1,7 +1,9 @@
-import CMenuState

-from CMenuState import *

-import CGame

-from CGame import *

+import api

+import states

+import states.MenuState

+from states.MenuState import CMenuState

+import api.Game

+from api.Game import CGame

 

 def main():

     

diff --git a/src/api/Button.py b/src/api/Button.py
index f45ca15..65fa133 100755
--- a/src/api/Button.py
+++ b/src/api/Button.py
@@ -1,6 +1,6 @@
 import pygame

-import CLabel

-from CLabel import *

+import api.Label

+from api.Label import CLabel

 

 class CButton(CLabel):

     """ a button based on the label 

diff --git a/src/api/Game.py b/src/api/Game.py
index 40c3179..d5ff8da 100755
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -3,13 +3,14 @@ import pygame
 import pygame.font

 import pygame.display

 import pygame.sprite

-import CSuperSprite

-from CSuperSprite import *

-import CSprite

-from CSprite import *

 from pygame.locals import *

-import CMultiLabel

-from CMultiLabel import *

+

+import api.SuperSprite

+from SuperSprite import CSuperSprite

+import api.Sprite

+from api.Sprite import CSprite

+import api.MultiLabel

+from api.MultiLabel import CMultiLabel

 import gc

 

 class CGame(object):

diff --git a/src/api/MultiLabel.py b/src/api/MultiLabel.py
index 3371a7c..122ee13 100755
--- a/src/api/MultiLabel.py
+++ b/src/api/MultiLabel.py
@@ -18,7 +18,7 @@ class CMultiLabel(pygame.sprite.Sprite):
         #pygame.font.init()

         #print "CMultilabel"

         #print pygame.font.get_init()

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.fgColor = ((0x00, 0x00, 0x00))

         self.bgColor = ((0xFF, 0xFF, 0xFF))

         self.center = (100, 100)

diff --git a/src/api/Sprite.py b/src/api/Sprite.py
index aa746c6..0e933c8 100755
--- a/src/api/Sprite.py
+++ b/src/api/Sprite.py
@@ -3,10 +3,10 @@
 

 import pygame

 import math

-import CImage

-import CMath

-import CVector

-from CVector import *

+import api.Image

+import api.Math as CMath

+import api.Vector

+from api.Vector import CVector

 

 # TODO: Cambiar las conversiones de grados a radianes y viceversa usando las funciones.

 

@@ -55,7 +55,7 @@ class CSprite(pygame.sprite.Sprite):
         #create a default text image as a placeholder

         #This will usually be changed by a setImage call

         #self.font = pygame.font.Font("freesansbold.ttf", 30)

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.mImageMaster = self.font.render(">sprite>", True, (0, 0,0), (0xFF, 0xFF, 0xFF))

         

         # Set the image of the sprite.

diff --git a/src/api/SuperSprite.py b/src/api/SuperSprite.py
index 6105541..e8730d6 100755
--- a/src/api/SuperSprite.py
+++ b/src/api/SuperSprite.py
@@ -27,7 +27,7 @@ class CSuperSprite(pygame.sprite.Sprite):
         #This will usually be changed by a setImage call

         print "Csupersprite"

         print pygame.font.get_init()

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.imageMaster = self.font.render(">sprite>", True, (0, 0,0), (0xFF, 0xFF, 0xFF))

         self.image = self.imageMaster

         self.rect = self.image.get_rect()

diff --git a/src/states/CreditsState.py b/src/states/CreditsState.py
index 5061dea..4382fa5 100755
--- a/src/states/CreditsState.py
+++ b/src/states/CreditsState.py
@@ -1,12 +1,16 @@
-import CMenuState

-from CMenuState import *

+import MenuState

+from MenuState import *

+import GameState

+from GameState import CGameState

+import api.MultiLabel

+from api.MultiLabel import CMultiLabel

+import api.Game

+from api.Game import CGame

+import api.Button

+from api.Button import CButton

+import api.Image as CImage

 

-from CGameState import *

-import CMultiLabel

-from CMultiLabel import *

-from CGame import *

-import CButton

-from CButton import *

+import pygame

 

 class CCreditsState(CGameState):

 

@@ -23,13 +27,13 @@ class CCreditsState(CGameState):
         

         self.mButtonPlay = CButton()

         self.mButtonPlay.bgColor = (0x99, 0x99, 0x66)

-        self.mButtonPlay.font = pygame.font.Font("fipps.ttf", 20)

+        self.mButtonPlay.font = pygame.font.Font('assets/fonts/fipps.ttf', 20)

         self.mButtonPlay.center = (400, 600)

         self.mButtonPlay.size = (200, 40)  

         self.mButtonPlay.text = "BACK Credits"

         CGame().addChild(self.mButtonPlay)

         

-        self.mBackground = CImage.loadImage("assets/images/back_credits.png", False)

+        self.mBackground = CImage.loadImage('assets/images/back_credits.png', False)

         CGame().setBackground(self.mBackground)

         

     def update(self):

@@ -38,7 +42,7 @@ class CCreditsState(CGameState):
        

         if self.mButtonPlay.clicked:

             print "clicked credits"

-            ms = CMenuState.CMenuState()

+            ms = MenuState.CMenuState()

             CGame().setState(ms)

         

     #def render(self):

diff --git a/src/states/MenuState.py b/src/states/MenuState.py
index 7c7616f..3ca33e3 100755
--- a/src/states/MenuState.py
+++ b/src/states/MenuState.py
@@ -1,11 +1,16 @@
-from CGameState import *

-import CMultiLabel

-from CMultiLabel import *

-from CGame import *

-import CButton

-from CButton import *

-import CCreditsState

-from CCreditsState import *

+import states.GameState

+from states.GameState import CGameState

+import api.MultiLabel

+from api.MultiLabel import CMultiLabel

+import api.Game

+from api.Game import CGame

+import api.Button

+from api.Button import CButton

+import states.CreditsState

+from CreditsState import *

+import api.Image as Image

+

+import pygame

 

 class CMenuState(CGameState):

     

@@ -28,13 +33,13 @@ class CMenuState(CGameState):
         self.mButtonPlay = CButton()

         #TODO: Create a function to create image.

         self.mButtonPlay.bgColor = (0x99, 0x99, 0x66)

-        self.mButtonPlay.font = pygame.font.Font("fipps.ttf", 20)

+        self.mButtonPlay.font = pygame.font.Font('assets/fonts/fipps.ttf', 20)

         self.mButtonPlay.center = (110, 420)

         self.mButtonPlay.size = (200, 40)  

         self.mButtonPlay.text = "JUGAR"

         CGame().addChild(self.mButtonPlay)

         

-        self.mBackground = CImage.loadImage("assets/images/back_menu.png", False)

+        self.mBackground = Image.loadImage('assets/images/back_menu.png', False)

         CGame().setBackground(self.mBackground)

         

     def update(self):

diff --git a/src/states/juego1.py b/src/states/juego1.py
index 20afbb9..f00b409 100755
--- a/src/states/juego1.py
+++ b/src/states/juego1.py
@@ -1,5 +1,6 @@
 
-import CSPrite
+import api.Sprite
+from api.Sprite import CSprite
 
 #Piece class hereda de CSprite
 class Piece(CSprite):