Added windows support

DorianHawkmoon · Jan 25, 2016 · f55dfc4 · f55dfc4
1 parent 116c9ad
commit f55dfc4
Show file tree

Hide file tree

Showing 67 changed files with 99 additions and 179 deletions.
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
@@ -13,8 +13,6 @@
         <gdb_interceptlist>
           <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
         </gdb_interceptlist>
-        <gdb_signals>
-        </gdb_signals>
         <gdb_options>
           <DebugOptions>
           </DebugOptions>

diff --git a/nbproject/private/private (Copia en conflicto de Lyria 2014-10-30).xml b/nbproject/private/private (Copia en conflicto de Lyria 2014-10-30).xml
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -9,10 +9,22 @@
         <group name="Tetris"/>
         <group name="Tetris SDL"/>
         <group>
-            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Score.h</file>
-            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/main.cpp</file>
             <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Game.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/main.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Window.cpp</file>
             <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Score.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Score.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/mainTestShapes.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/SShape.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/TShape.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/ZShape.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/nbproject/private/private.xml</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/EmptySquare.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/EmptySquare.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Square.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/Square.h</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/TShape.cpp</file>
+            <file>file:/media/Datos/Proyectos/Codigo/C++/Tetris/src/ZShape.cpp</file>
         </group>
     </open-files>
 </project-private>
diff --git a/src/BombShape.cpp b/src/BombShape.cpp
diff --git a/src/Command.cpp b/src/Command.cpp
diff --git a/src/Command.h b/src/Command.h
diff --git a/src/EmptySquare.cpp b/src/EmptySquare.cpp
diff --git a/src/EmptySquare.h b/src/EmptySquare.h
@@ -9,7 +9,6 @@
 #define	EMPTYSQUARE_H
 
 #include "Square.h"
-#include <SDL2/SDL.h>
 
 
 class EmptySquare : public Square {
@@ -26,12 +25,11 @@ class EmptySquare : public Square {
         y=-10;
     }
     virtual ~EmptySquare(){}
-
-    inline void setGraphics(SDL_Texture &image){}
-
-    virtual inline void setImage(SDL_Texture &image) {
-
-    }
+
+	virtual void setImage(sf::Texture * image) {}
+
+
+	virtual void paint(sf::RenderWindow* pLienzo) {}
 
     virtual inline void setX(int x) {
 
@@ -57,8 +55,6 @@ class EmptySquare : public Square {
         return new EmptySquare(*this);
     }
 
-    void paint(SDL_Renderer* pLienzo){}
-
 private:
 
 };

diff --git a/src/EventManager.cpp b/src/EventManager.cpp
diff --git a/src/EventManager.h b/src/EventManager.h
diff --git a/src/Fall.cpp b/src/Fall.cpp
diff --git a/src/Fall.h b/src/Fall.h
diff --git a/src/FallEvent.cpp b/src/FallEvent.cpp
diff --git a/src/FallEvent.h b/src/FallEvent.h
diff --git a/src/FallToGround.cpp b/src/FallToGround.cpp
diff --git a/src/FallToGround.h b/src/FallToGround.h
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -3,7 +3,7 @@
 
 Game::Game() : title() {
     /* initialize random seed: */
-    srand(time(NULL));
+    srand(static_cast<unsigned int>(time(NULL)));
     score = nullptr;
     letsQuit = false;
     shapeFalling = nullptr;
@@ -51,7 +51,7 @@ void Game::loadSounds() {
 
 Game::Game(const Game &orig) {
     /* initialize random seed: */
-    srand(time(NULL));
+    srand(static_cast<unsigned int>(time(NULL)));
     letsQuit = orig.letsQuit;
     shapeFalling = orig.shapeFalling;
     nextShape = orig.nextShape;

diff --git a/src/Game.h b/src/Game.h
diff --git a/src/HashEnum.h b/src/HashEnum.h
diff --git a/src/IShape.cpp b/src/IShape.cpp
diff --git a/src/IShape.h b/src/IShape.h
@@ -8,7 +8,6 @@
 #ifndef ISHAPE_H
 #define	ISHAPE_H
 
-#include <SDL2/SDL_image.h>
 #include "Square.h"
 #include "EmptySquare.h"
 #include "Shape.h"

diff --git a/src/Images.h b/src/Images.h
diff --git a/src/ImagesManager.cpp b/src/ImagesManager.cpp
diff --git a/src/ImagesManager.h b/src/ImagesManager.h
diff --git a/src/ImportsShapes.h b/src/ImportsShapes.h
diff --git a/src/JShape.cpp b/src/JShape.cpp
diff --git a/src/JShape.h b/src/JShape.h
@@ -8,7 +8,6 @@
 #ifndef JSHAPE_H
 #define	JSHAPE_H
 
-#include <SDL2/SDL_image.h>
 #include "Square.h"
 #include "Shape.h"
 #include "EmptySquare.h"

diff --git a/src/LShape.cpp b/src/LShape.cpp
diff --git a/src/LShape.h b/src/LShape.h
@@ -8,7 +8,6 @@
 #ifndef LSHAPE_H
 #define	LSHAPE_H
 
-#include <SDL2/SDL_image.h>
 #include "Square.h"
 #include "EmptySquare.h"
 #include "Shape.h"
@@ -64,7 +63,6 @@ class LShape : public Shape {
      */
     static const int NUMBER_OF_SQUARES = 4;
 
-    SDL_Texture* image;
 
     /**
      * Coordinates to make the shape

diff --git a/src/LeftRight.cpp b/src/LeftRight.cpp
diff --git a/src/LeftRight.h b/src/LeftRight.h
diff --git a/src/MeassureBoard.h b/src/MeassureBoard.h
diff --git a/src/MeassureMargin.h b/src/MeassureMargin.h
diff --git a/src/OShape.cpp b/src/OShape.cpp
diff --git a/src/OShape.h b/src/OShape.h
@@ -8,7 +8,6 @@
 #ifndef OSHAPE_H
 #define	OSHAPE_H
 
-#include <SDL2/SDL_image.h>
 #include "Square.h"
 #include "EmptySquare.h"
 #include "Shape.h"
@@ -65,8 +64,6 @@ class OShape : public Shape {
      */
     static const int NUMBER_OF_SQUARES=4;
 
-    SDL_Texture* image;
-
     /**
      * Coordinates to make the shape
      * Just a matrix with ougths and ones where a one indicates a shape