jsais pu ca fait longtemps

lib/Agents/Agent.hpp

@@ -1,12 +1,14 @@
 #ifndef AGENT_H
 #define AGENT_H
 #include <Agents/Perception/Perception.hpp>
+
 #include <Environment/PictureEnvironment.hpp>
 
 class Agent
 {
 public:
 	Perception fCurrentPerception;
+
 	PictureEnvironment* fEnvironment;
 	sf::Color fColor;
 	int fDotSize;
@@ -29,12 +31,15 @@ public:
 	std::vector<std::vector<int>> fMovements;
 	std::vector<int> fValidMovementIndexes;
 	std::vector<int> fCurrentMovement;
+	int fTolerance;
 
-	RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize);
+	RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize, int iTolerance);
 	virtual void loop();
 	virtual void move();
 	virtual void paint();
 
+	bool colorCloseEnough(sf::Uint32 iColor);
+
 protected:
 	virtual void init();
 };
@@ -42,7 +47,7 @@ protected:
 class StraightPaintAgent : public RepaintAgent
 {
 public:
-	StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize);
+	StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize, int iTolerance);
 
 protected:
 	virtual void init();

lib/Control/EnvInputs.hpp

@@ -0,0 +1,12 @@
+
+#ifndef ENVINPUTS_H
+#define ENVINPUTS_H
+
+class EnvInputs
+{
+public:
+	EnvInputs();
+	void loop();
+};
+
+#endif //ENVINPUTS_H

lib/Environment/PictureEnvironment.hpp

@@ -2,6 +2,7 @@
 #define PICTURE_ENVIRONMENT_H
 #include "Platform/Platform.hpp"
 #include <Agents/Perception/Perception.hpp>
+#include <Control/EnvInputs.hpp>
 
 class Agent;
 
@@ -15,6 +16,7 @@ public: // Access specifier
 	sf::Vector2f fInitialSize;
 	sf::Event fEvent;
 	sf::RectangleShape fShape;
+	EnvInputs fInputs;
 
 	sf::Texture fTextureImage;
 	sf::Image fImage;
@@ -26,9 +28,9 @@ public: // Access specifier
 	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 makeRepaintAgents(int iNumber, int iDotSize, int iMoveSize, int iTolerance);
 	void makePullPaintAgents(int iNumber, int iDotSize, int iMoveSize);
-	void makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize);
+	void makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize, int iTolerance);
 	bool paint(int iX, int iY, const sf::Color Color);
 
 	sf::Uint32 getCell(int iX, int iY);

src/Agents/PullPaintAgent.cpp

@@ -2,7 +2,7 @@
 #include <Environment/PictureEnvironment.hpp>
 
 PullPaintAgent::PullPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize) :
-	RepaintAgent(iEnvironment, iDotSize, iMoveSize)
+	RepaintAgent(iEnvironment, iDotSize, iMoveSize, 0)
 {
 	int vWidth = fEnvironment->getWidth();
 	int vHeight = fEnvironment->getHeight();

src/Agents/RepaintAgent.cpp

@@ -1,11 +1,11 @@
 #include <Agents/Agent.hpp>
 #include <Environment/PictureEnvironment.hpp>
 
-RepaintAgent::RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize) :
+RepaintAgent::RepaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize, int iTolerance) :
 	Agent(iEnvironment, iDotSize, iMoveSize)
 {
 	init();
-
+	fTolerance = iTolerance;
 	//Initalize list of possible movement vectors
 	fMovements = std::vector<std::vector<int>>();
 	fValidMovementIndexes = std::vector<int>();
@@ -33,17 +33,12 @@ 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();
-		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 (vcomp)
+		int vXMove = fMovements.at(i).at(0);
+		int vYMove = fMovements.at(i).at(1);
+		if (
+			colorCloseEnough(fEnvironment->getCellOriginal(fXPos + vXMove, fYPos + vYMove)) && fEnvironment->getCell(fXPos + vXMove, fYPos + vYMove) != fColor.toInteger())
 		{
 			fValidMovementIndexes.push_back(i);
 		}
@@ -61,6 +56,15 @@ void RepaintAgent::move()
 	}
 }
 
+bool RepaintAgent::colorCloseEnough(sf::Uint32 iColor)
+{
+	sf::Uint32 va = iColor;
+	sf::Uint32 vb = (int)fColor.toInteger();
+	return abs((int)(va >> 24) - (int)(vb >> 24)) <= fTolerance &&		  //R
+		abs((int)(va << 8 >> 24) - (int)(vb << 8 >> 24)) <= fTolerance && //G
+		abs((int)(va << 16 >> 24) - (int)(vb << 16 >> 24)) <= fTolerance; //B
+}
+
 void RepaintAgent::paint()
 {
 	int vHalfBrush = fDotSize / 2;

src/Agents/StraightPaintAgent.cpp

@@ -1,8 +1,8 @@
 #include <Agents/Agent.hpp>
 #include <Environment/PictureEnvironment.hpp>
 
-StraightPaintAgent::StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize) :
-	RepaintAgent(iEnvironment, iDotSize, iMoveSize)
+StraightPaintAgent::StraightPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize, int iTolerance) :
+	RepaintAgent(iEnvironment, iDotSize, iMoveSize, iTolerance)
 {
 	init();
 }

src/Control/EnvInputs.cpp

@@ -0,0 +1,9 @@
+#include <Control/EnvInputs.hpp>
+
+EnvInputs::EnvInputs()
+{
+}
+
+void EnvInputs::loop()
+{
+}

src/Environment/PictureEnvironment.cpp

@@ -1,6 +1,7 @@
 #include "Platform/Platform.hpp"
 #include <Agents/Agent.hpp>
 #include <Agents/Perception/Perception.hpp>
+#include <Control/EnvInputs.hpp>
 #include <Environment/PictureEnvironment.hpp>
 
 const sf::Vector2f DEFAUMT_SIMZE = sf::Vector2f(800, 600);
@@ -53,6 +54,7 @@ PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow*
 	fPlatform->setIcon(fWindow->getSystemHandle());
 
 	//fShape = sf::RectangleShape(fSize);
+	fInputs = EnvInputs();
 	fShape = sf::RectangleShape(fInitialSize);
 	fAgents = std::vector<std::unique_ptr<Agent>>();
 	fShape.setFillColor(sf::Color::White);
@@ -92,6 +94,7 @@ bool PictureEnvironment::loop()
 			if (fEvent.type == sf::Event::Closed)
 				fWindow->close();
 		}
+		fInputs.loop();
 		// fAgentsIterator = fAgents.begin();
 		std::vector<std::unique_ptr<Agent>>::iterator vAgentsIterator = fAgents.begin();
 		while (vAgentsIterator != fAgents.end())
@@ -154,11 +157,11 @@ void PictureEnvironment::makeAgents(int iNumber, int iDotSize, int iMoveSize)
 	}
 }
 
-void PictureEnvironment::makeRepaintAgents(int iNumber, int iDotSize, int iMoveSize)
+void PictureEnvironment::makeRepaintAgents(int iNumber, int iDotSize, int iMoveSize, int iTolerance)
 {
 	for (int i = 0; i < iNumber; i++)
 	{
-		fAgents.push_back(std::make_unique<RepaintAgent>(this, iDotSize, iMoveSize));
+		fAgents.push_back(std::make_unique<RepaintAgent>(this, iDotSize, iMoveSize, iTolerance));
 	}
 }
 
@@ -170,11 +173,11 @@ void PictureEnvironment::makePullPaintAgents(int iNumber, int iDotSize, int iMov
 	}
 }
 
-void PictureEnvironment::makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize)
+void PictureEnvironment::makeStraightRepaintAgents(int iNumber, int iDotSize, int iMoveSize, int iTolerance)
 {
 	for (int i = 0; i < iNumber; i++)
 	{
-		fAgents.push_back(std::make_unique<StraightPaintAgent>(this, iDotSize, iMoveSize));
+		fAgents.push_back(std::make_unique<StraightPaintAgent>(this, iDotSize, iMoveSize, iTolerance));
 	}
 }
 

src/Main.cpp

@@ -11,7 +11,8 @@ int main()
 #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\\RepAgents\\PA315024.jpg";
+	std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\14.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";
@@ -26,9 +27,14 @@ int main()
 	PictureEnvironment vEnvironment(filepath, &window, &platform, vDisplayOriginal);
 
 	//vEnvironment.makeAgents(10000, 1, 10);
-	vEnvironment.makeRepaintAgents(50, 30, 10);
-	vEnvironment.makeStraightRepaintAgents(250, 20, 15);
-	vEnvironment.makePullPaintAgents(50, 20, 10);
+	//vEnvironment.makeRepaintAgents(50, 50, 25, 15);
+
+	//vEnvironment.makeRepaintAgents(50, 50, 25, 15);
+	//vEnvironment.makeStraightRepaintAgents(1000, 25, 15, 50);
+
+	vEnvironment.makeRepaintAgents(50, 15, 8, 15);
+	vEnvironment.makeStraightRepaintAgents(1000, 15, 8, 50);
+	//vEnvironment.makePullPaintAgents(50, 20, 10);
 	//int i = 0;
 	while (vEnvironment.loop())
 	{