des trucs

lib/Agents/Agent.hpp

@@ -34,6 +34,18 @@ public:
 	virtual void loop();
 	virtual void move();
 	virtual void paint();
+
+protected:
+	virtual void init();
+};
+
+class StraightPaintAgent : public RepaintAgent
+{
+public:
+	StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize);
+
+protected:
+	virtual void init();
 };
 
 class PullPaintAgent : public RepaintAgent

lib/Environment/PictureEnvironment.hpp

@@ -23,11 +23,12 @@ public: // Access specifier
 	std::vector<std::unique_ptr<Agent>> fAgents;
 	std::list<Agent>::iterator fAgentsIterator;
 
-	PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform);
+	PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform, bool iDisplayOriginal);
 	void getPerception(Perception* ioPercept, int iX, int iY);
 	void makeAgents(int iNumber, int iDotSize, int iMoveSize);
 	void makeRepaintAgents(int iNumber, int iDotSize, int iMoveSize);
 	void makePullPaintAgents(int iNumber, int iDotSize, int iMoveSize);
+	void makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize);
 	bool paint(int iX, int iY, const sf::Color Color);
 
 	sf::Uint32 getCell(int iX, int iY);
@@ -39,6 +40,7 @@ public: // Access specifier
 	void displayLockInput();
 
 private:
+	bool fDisplayOriginal;
 	PictureEnvironment();
 };
 

src/Agents/PullPaintAgent.cpp

@@ -10,7 +10,7 @@ PullPaintAgent::PullPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, i
 	fXPos = (((double)rand() / RAND_MAX) * vWidth);
 	fYPos = (((double)rand() / RAND_MAX) * vHeight);
 
-	fColor = sf::Color(fEnvironment->getCell(fXPos, fYPos));
+	fColor = sf::Color(fEnvironment->getCellOriginal(fXPos, fYPos));
 }
 
 void PullPaintAgent::move()

src/Agents/RepaintAgent.cpp

@@ -4,13 +4,7 @@
 RepaintAgent::RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize) :
 	Agent(iEnvironment, iDotSize, iMoveSize)
 {
-	int vWidth = fEnvironment->getWidth();
-	int vHeight = fEnvironment->getHeight();
-
-	fXPos = (((double)rand() / RAND_MAX) * vWidth);
-	fYPos = (((double)rand() / RAND_MAX) * vHeight);
-
-	fColor = sf::Color(fEnvironment->getCell(fXPos, fYPos));
+	init();
 
 	//Initalize list of possible movement vectors
 	fMovements = std::vector<std::vector<int>>();
@@ -25,28 +19,32 @@ RepaintAgent::RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int i
 	}
 }
 
+void RepaintAgent::init()
+{
+	int vWidth = fEnvironment->getWidth();
+	int vHeight = fEnvironment->getHeight();
+
+	fXPos = (((double)rand() / RAND_MAX) * vWidth);
+	fYPos = (((double)rand() / RAND_MAX) * vHeight);
+	fColor = sf::Color(fEnvironment->getCellOriginal(fXPos, fYPos));
+}
+
 void RepaintAgent::move()
 {
+	//Only move on cells having a sufficiently close color
 	fValidMovementIndexes.clear();
 	int tolerance = 5;
 	for (int i = 0; i < static_cast<int>(fMovements.size()); i++)
 	{
 		sf::Uint32 va = fEnvironment->getCellOriginal(fXPos + fMovements.at(i).at(0), fYPos + fMovements.at(i).at(1));
 		sf::Uint32 vb = (int)fColor.toInteger();
-		//std::cout << std::hex << va << " : " << std::hex << vb << "\n";
-		//std::cout << std::hex << (va << 8 >> 24) << " : " << (vb << 8 >> 24) << "\n";
-		//std::cout << abs((int)(va << 8 >> 24) - (int)(vb << 8 >> 24)) << "\n\n";
 		bool vcomp =
 			abs((int)(va >> 24) - (int)(vb >> 24)) <= tolerance &&			 //R
 			abs((int)(va << 8 >> 24) - (int)(vb << 8 >> 24)) <= tolerance && //G
 			abs((int)(va << 16 >> 24) - (int)(vb << 16 >> 24)) <= tolerance; //B
 
-		//if ((double)std::min(va, vb) / std::max(va, vb) > 0.7)
 		if (vcomp)
 		{
-			//std::cout << vcomp << "\n";
-			//std::string j;
-			//std::cin >> j;
 			fValidMovementIndexes.push_back(i);
 		}
 	}
@@ -57,6 +55,10 @@ void RepaintAgent::move()
 		fXPos += fCurrentMovement.at(0);
 		fYPos += fCurrentMovement.at(1);
 	}
+	else
+	{
+		init();
+	}
 }
 
 void RepaintAgent::paint()

src/Agents/StraightPaintAgent.cpp

@@ -0,0 +1,32 @@
+#include <Agents/Agent.hpp>
+#include <Environment/PictureEnvironment.hpp>
+
+StraightPaintAgent::StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize) :
+	RepaintAgent(iEnvironment, iDotSize, iMoveSize)
+{
+	init();
+}
+
+void StraightPaintAgent::init()
+{
+	RepaintAgent::init();
+
+	//Initalize list of possible movement vectors
+	fMovements = std::vector<std::vector<int>>();
+	if (rand() % 2)
+	{
+		for (int i = 0; i <= fMoveSize; i++)
+		{
+			fMovements.push_back({ i, 0 });
+			fMovements.push_back({ -i, 0 });
+		}
+	}
+	else
+	{
+		for (int j = 0; j <= fMoveSize; j++)
+		{
+			fMovements.push_back({ 0, j });
+			fMovements.push_back({ 0, -j });
+		}
+	}
+}

src/Environment/PictureEnvironment.cpp

@@ -9,9 +9,10 @@ PictureEnvironment::PictureEnvironment()
 {
 }
 
-PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform) :
+PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform, bool iDisplayOriginal) :
 	fSize(iWindow->getSize())
 {
+	fDisplayOriginal = iDisplayOriginal;
 
 	fFilePath = iFilePath;
 	//sf::Texture fLoadedImage;
@@ -22,19 +23,39 @@ PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow*
 	fImage = fTextureImage.copyToImage();
 	fOriginalImage = fTextureImage.copyToImage();
 
-	//memccpy(&fFilePath, &iFilePath, *iFilePath., 10);
+	if (!fDisplayOriginal)
+	{
+		fImage.create(fImage.getSize().x, fImage.getSize().y);
+	}
 	fPlatform = iPlatform;
 	fWindow = iWindow;
+
 	float screenScalingFactor = fPlatform->getScreenScalingFactor(fWindow->getSystemHandle());
-	fWindow->create(sf::VideoMode(800.0f * screenScalingFactor, 600.0f * screenScalingFactor), "SFML works!");
+
+	fInitialSize.x = fTextureImage.getSize().x * screenScalingFactor;
+	fInitialSize.y = fTextureImage.getSize().y * screenScalingFactor;
+
+	//fInitialSize.x = fTextureImage.getSize().x / 3 * screenScalingFactor;
+	if (fTextureImage.getSize().x > sf::VideoMode::getDesktopMode().width)
+	{
+		double vRapport = (double)sf::VideoMode::getDesktopMode().width / fTextureImage.getSize().x;
+		fInitialSize.x *= vRapport;
+		fInitialSize.y *= vRapport;
+	}
+	if (fTextureImage.getSize().y > sf::VideoMode::getDesktopMode().height)
+	{
+		double vRapport = (double)sf::VideoMode::getDesktopMode().height / fTextureImage.getSize().y;
+		fInitialSize.x *= vRapport;
+		fInitialSize.y *= vRapport;
+	}
+
+	fWindow->create(sf::VideoMode(fInitialSize.x, fInitialSize.y), "SMA");
 	fPlatform->setIcon(fWindow->getSystemHandle());
-	fInitialSize.x = 800.0f * screenScalingFactor;
-	fInitialSize.y = 600.0f * screenScalingFactor;
+
 	//fShape = sf::RectangleShape(fSize);
-	fShape = sf::RectangleShape(DEFAUMT_SIMZE);
+	fShape = sf::RectangleShape(fInitialSize);
 	fAgents = std::vector<std::unique_ptr<Agent>>();
 	fShape.setFillColor(sf::Color::White);
-
 	fShape.setTexture(&fTextureImage);
 }
 
@@ -149,6 +170,14 @@ void PictureEnvironment::makePullPaintAgents(int iNumber, int iDotSize, int iMov
 	}
 }
 
+void PictureEnvironment::makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize)
+{
+	for (int i = 0; i < iNumber; i++)
+	{
+		fAgents.push_back(std::make_unique<StraightPaintAgent>(this, iDotSize, iMoveSize));
+	}
+}
+
 void PictureEnvironment::displayLockInput()
 {
 	fWindow->create(sf::VideoMode(fInitialSize.x, fInitialSize.y), "Last peek");
@@ -161,7 +190,6 @@ void PictureEnvironment::displayLockInput()
 
 bool PictureEnvironment::paint(int iX, int iY, const sf::Color iColour)
 {
-
 	bool doable = iX > 0 && iX < getWidth() && iY > 0 && iY < getHeight();
 	if (doable)
 	{

src/Main.cpp

@@ -7,11 +7,13 @@ int main()
 {
 	util::Platform platform;
 #if defined(_DEBUG)
-	std::cout << "Hello World!" << std::endl;
+	std::cout << "Zé Parti" << std::endl;
 #endif
 	//std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\dickbutt.jpg";
-	std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\caisseenre.png";
-	//std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\PA315024.jpg";
+	//std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\caisseenre.png";
+	std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\PA315024.jpg";
+	//std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\PA304995.jpg";
+	//std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\P6224671.jpg";
 	//std::string filepath = "content/sfml.png";
 	sf::RenderWindow window;
 
@@ -20,12 +22,13 @@ int main()
 	// Use the screenScalingFactor
 
 	//
-
-	PictureEnvironment vEnvironment(filepath, &window, &platform);
+	bool vDisplayOriginal = false;
+	PictureEnvironment vEnvironment(filepath, &window, &platform, vDisplayOriginal);
 
 	//vEnvironment.makeAgents(10000, 1, 10);
-	vEnvironment.makeRepaintAgents(300, 20, 10);
-	vEnvironment.makePullPaintAgents(200, 20, 10);
+	vEnvironment.makeRepaintAgents(50, 30, 10);
+	vEnvironment.makeStraightRepaintAgents(250, 20, 15);
+	vEnvironment.makePullPaintAgents(50, 20, 10);
 	//int i = 0;
 	while (vEnvironment.loop())
 	{