Add loadable skin and correct some things

CMakeLists.txt

@@ -1,14 +1,30 @@
+#==================== PREPROCESSOR DEFINITION  ====================
+
+#Define which controller use.
+#Avalaible controllers are:
+#	- CONSOLECONTROLLER
+#	- SFMLCONTROLLER
+add_definitions(-DSFMLCONTROLLER)
+
+
+
+
+#==================== START CMAKE ====================
+
+
 #Defined project name
 project(2P11)
 
 #Assign Modules path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FGS} -std=c++11 -lpthread")
+
 #Defined project VERSION
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
 set(VERSION_REV 0)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 #Minimum cmake VERSION
 cmake_minimum_required(VERSION 2.6)

bin/skin/devil/skin.txt

@@ -0,0 +1,31 @@
+
+050 050 050   	#Background MainWindow
+100 100 100	#Background cells
+123 0 9 	#Background grid color
+19 110 101 	#2 and 4 font color
+143 122 102 	#Button color
+4 15 58 	#other number font Color
+238 228 218 186 		#Game over color bg
+
+#Skin 2 et le 4
+238 228 218 #2
+237 224 200 #4
+
+#Skin 8 à 64
+242 177 121 	#8
+245 149 99	#16
+246 124 95 	#32
+246 94 59 	#64
+
+      
+        
+#Skin 128 à 2048
+237 207 114 	#128
+237 204 97 	#256
+237 200 80 	#512
+237 197 63 	#1024
+238 194 46 	#2048
+
+#Skin for other number
+60 58 50 	#More than 2048
+

bin/skin/original/skin.txt

@@ -0,0 +1,31 @@
+
+250 248 239   	#Background MainWindow
+205 192 180	#Background cells
+187 173 160 	#Background grid color
+119 110 101 	#2 and 4 font color
+143 122 102 	#Button color
+249 246 242 	#other number font Color
+238 228 218 186 		#Game over color bg
+
+#Skin 2 et le 4
+238 228 218 #2
+237 224 200 #4
+
+#Skin 8 à 64
+242 177 121 	#8
+245 149 99	#16
+246 124 95 	#32
+246 94 59 	#64
+
+      
+        
+#Skin 128 à 2048
+237 207 114 	#128
+237 204 97 	#256
+237 200 80 	#512
+237 197 63 	#1024
+238 194 46 	#2048
+
+#Skin for other number
+60 58 50 	#More than 2048
+

src/CMakeLists.txt

@@ -17,3 +17,5 @@ target_link_libraries(2P11 ${SFML_LIBRARIES} Model ConsoleController View SFMLCo
 add_subdirectory(./Model)
 add_subdirectory(./Controllers/)
 add_subdirectory(./View/)
+add_subdirectory(./Helpers/)
+

src/Controllers/SFMLController/SFMLController.cpp

@@ -24,7 +24,6 @@ void SFMLController::run(){
 	//First pop
 	m_game.popRandomNumber();
 
-
 	//Start game
 	while(m_MainWindow.isOpen()){
 

src/Controllers/SFMLController/SFMLController.hpp

@@ -11,6 +11,7 @@
 #include "../../View/MainWindow.hpp"
 #include "../../Model/Game.hpp"
 #include "../../Helpers/Keyboard.hpp"
+#include "../../Helpers/Skin.hpp"
 
 
 

src/Helpers/CMakeLists.txt

@@ -0,0 +1,3 @@
+#Make Model lib
+
+add_subdirectory(./Skin/)

src/Helpers/Skin.hpp

@@ -0,0 +1,17 @@
+#include <SFML/Graphics/Color.hpp>
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iostream>
+
+
+namespace skin{
+
+	std::vector<sf::Color> loadSkin(std::string skinName);
+
+	std::vector<std::string> removeComments(std::vector<std::string> linesVector);
+
+	bool containOnlySpace(std::string line);
+
+	std::vector<int> extractRGBA(std::string line);
+}

src/Helpers/Skin/CMakeLists.txt

@@ -0,0 +1 @@
+add_library(Skin Skin.cpp)

src/Helpers/Skin/Skin.cpp

@@ -0,0 +1,118 @@
+#include "../Skin.hpp"
+
+
+
+std::vector<sf::Color> skin::loadSkin(std::string skinName){
+
+	std::vector<sf::Color> skinLoaded;
+
+	std::ifstream skinFile("./bin/skin/"+skinName+"/skin.txt");
+
+
+	try{
+		if(!skinFile.is_open())
+			throw 1;
+
+	}
+	catch(int code){
+
+		std::cout << "Failed to open skin " + skinName + "check the location and the permissions !";
+		exit(code);
+	}
+
+
+	std::string line;
+	std::vector<std::string> linesVector;
+
+	while (std::getline(skinFile, line))
+	{
+		if(!line.empty() && !skin::containOnlySpace(line))
+			linesVector.push_back(line);
+	}
+
+	linesVector=skin::removeComments(linesVector);
+
+	for(int i=0;i<linesVector.size();i++){
+
+		std::vector<int> rgba;
+		rgba=skin::extractRGBA(linesVector.at(i));
+		if(rgba.size()==3)
+			skinLoaded.push_back(sf::Color(rgba.at(0), rgba.at(1), rgba.at(2)));
+		else
+			skinLoaded.push_back(sf::Color(rgba.at(0), rgba.at(1), rgba.at(2),rgba.at(3)));
+	}
+
+	return skinLoaded;
+}
+
+std::vector<std::string> skin::removeComments(std::vector<std::string> linesVector){
+
+	std::vector<std::string> linesWitouthCom;
+	
+	for(int i=0;i<linesVector.size();i++){
+		std::string currentLine(linesVector.at(i));
+
+		if(currentLine[0]!='#'){
+			size_t posCom=currentLine.find("#");
+
+			if(posCom != std::string::npos)
+				linesWitouthCom.push_back(currentLine.erase(posCom,currentLine.size()));
+			else
+				linesWitouthCom.push_back(currentLine);
+
+		}
+	}
+
+	return linesWitouthCom;
+}
+
+
+
+bool skin::containOnlySpace(std::string line){
+	for(int i=0;i<line.size();i++){
+
+		if(line[i] != ' ')
+			return false;
+
+	}
+	return true;
+}
+
+
+std::vector<int> skin::extractRGBA(std::string line){
+	std::vector<int> rgba;
+
+	std::string numberFound;
+
+	int start=0;
+	try {
+		for(int j=0;j<3;j++){
+			for(int i=start;i<line.size();i++){
+				char ch=line.at(i);
+
+				if(ch>='0' && ch <='9'){
+					numberFound.push_back(ch);
+				}
+				else if(ch==' ' && numberFound.size() > 0){
+					start=i;
+					break;
+				}
+			}
+			rgba.push_back(std::stoi(numberFound));
+			numberFound.clear();
+		}
+
+
+		if(rgba.size()<3 || rgba.size()>4){
+			throw "Invalid thème format";
+			exit(1);
+		}
+	}
+	catch(std::string error){
+		std::cout << error;
+		exit(1);
+	}
+
+	return rgba;
+
+}

src/View/CMakeLists.txt

@@ -1,2 +1,4 @@
 #Make Model lib
 add_library(View ./MainWindow.cpp)
+
+target_link_libraries(View Skin)

src/View/MainWindow.cpp

@@ -13,18 +13,15 @@ MainWindow::MainWindow(int width, int height, std::string title):
 	m_gridSize(0,0),
 	m_gridPosition(),
 	m_spaceBetweenCell(15),
+	m_skinName("original"),
 	m_font()
 {
 	//Set windows size
 	m_windowSize=RenderWindow::getSize();
-	
+
+	//Set default grid position
 	m_gridPosition=sf::Vector2u(0,200);
 
-
-
-	//Load font
-	m_font.loadFromFile("./src/skin/original/Pragmatica-Medium.ttf");
-
 	//Define original skin:
 	m_skin.push_back(sf::Color(250,248,239));	//Background MainWindow
 	m_skin.push_back(sf::Color(205,192,180));	//Background cells
@@ -54,6 +51,9 @@ MainWindow::MainWindow(int width, int height, std::string title):
 	//Skin for other number
 	m_skin.push_back(sf::Color(60,58,50)); 	//More than 2048
 
+	//Load font
+	m_font.loadFromFile("./bin/fonts/Pragmatica-Medium.ttf");
+	m_skin=skin::loadSkin(m_skinName);
 }
 
 
@@ -140,7 +140,7 @@ void MainWindow::drawCell(int x, int y, int value){
 	text.setFont(m_font);
 	text.setStyle(sf::Text::Bold);
 	text.setCharacterSize(fontSize);
-	text.setString(valueString); 
+	text.setString(valueString);
 	if(value==2 || value==4)
 		text.setColor(m_skin.at(3));
 	else
@@ -173,7 +173,7 @@ sf::Color MainWindow::getCellColor(int value){
 }
 
 void MainWindow::drawGameOver(int gridX, int gridY){
-	
+
 	sf::RectangleShape gridShape(sf::Vector2f(m_gridSize.x,m_gridSize.y));
 	gridShape.setFillColor(m_skin.at(6));
 	gridShape.setPosition(gridX,gridY);
@@ -187,14 +187,14 @@ void MainWindow::drawATH(Stats stats){
 	int titleY=m_gridPosition.y-190;
 
 
-	//==================== Draw title  ====================	
+	//==================== Draw title  ====================
 	sf::Text text;
 	text.setFont(m_font);
 	text.setStyle(sf::Text::Bold);
 	text.setCharacterSize(80);
 	text.setColor(m_skin.at(3));
 	text.setPosition(titleX,titleY);
-	text.setString("2048"); 
+	text.setString("2048");
 
 	RenderWindow::draw(text);
 
@@ -221,7 +221,7 @@ void MainWindow::drawATH(Stats stats){
 	RenderWindow::draw(text);
 
 	//==================== Draw score  ====================
-	
+
 	int scoreX=bestScoreX-bestScoreSizeX-5;
 	int scoreY=bestScoreY;
 	int scoreSizeX=bestScoreSizeX;
@@ -253,3 +253,4 @@ void MainWindow::drawGame(std::vector<std::vector<int> > grid, bool gameIsOver,
 	this->drawGrid(grid,gameIsOver);
 	this->drawATH(stats);
 }
+

src/View/MainWindow.hpp

@@ -6,10 +6,10 @@
 #include <string>
 #include <sstream>
 #include "../Model/Stats.hpp"
+#include "../Helpers/Skin.hpp"
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
 
-
 class MainWindow : public sf::RenderWindow{
 
 	private:
@@ -26,6 +26,8 @@ class MainWindow : public sf::RenderWindow{
 		sf::Vector2u m_gridPosition;
 		int m_spaceBetweenCell;
 
+		std::string m_skinName;
+
 	public:
 		MainWindow(int width, int height, std::string title);
 		~MainWindow();
@@ -39,5 +41,6 @@ class MainWindow : public sf::RenderWindow{
 
 		void drawATH(Stats stats);
 
+		void MoveCell();
 		void drawGame(std::vector<std::vector<int> > grid, bool gameIsOver, Stats stats);
 };

src/main.cpp

@@ -13,7 +13,6 @@
 
 
 
-
 //----- Start -----
 int main()
 {
@@ -21,10 +20,13 @@ int main()
 	srand(time(NULL));
 
 	//Init controller
+#if defined(CONSOLECONTROLLER)
+	ConsoleController controller;
+#elif defined(SFMLCONTROLLER)
 	SFMLController controller;
-
+#else
-	//ConsoleController controller;
+#error Please defined which controller to use in CMakeList.txt
-
+#endif
 	//Run the game
 	controller.run();