tentatives d'opti

lib/Agents/Agent.hpp

@@ -15,7 +15,8 @@ public:
 	int fMoveSize;
 	int fXPos;
 	int fYPos;
-
+	int fEnvWidth;
+	int fEnvHeight;
 	Agent();
 	Agent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize);
 	virtual void loop();

src/Agents/Agent.cpp

@@ -20,8 +20,11 @@ Agent::Agent(PictureEnvironment* iEnvironment, int iDotSize, int iMoveSize)
 
 	fColor = sf::Color(vRand);
 	//fColor = sf::Color(((rand() % fColor.Red.toInteger())));
-	fXPos = iEnvironment->getWidth() / 2;
-	fYPos = iEnvironment->getHeight() / 2;
+	fEnvWidth = iEnvironment->getWidth();
+	fEnvHeight = iEnvironment->getHeight();
+
+	fXPos = fEnvWidth / 2;
+	fYPos = fEnvHeight / 2;
 }
 
 void Agent::loop()

src/Agents/PullPaintAgent.cpp

@@ -15,10 +15,20 @@ PullPaintAgent::PullPaintAgent(PictureEnvironment* iEnvironment, int iDotSize, i
 
 void PullPaintAgent::move()
 {
-	double vRand = rand() % (fMoveSize + 1);
-	fXPos += vRand - fMoveSize / 2;
-	vRand = rand() % (fMoveSize + 1);
-	fYPos += vRand - fMoveSize / 2;
+	int vNewPosX = -1;
+	int vNewPosY = -1;
+	int vMoveIndex = ((((double)rand() / RAND_MAX) * (fMovements.size() - 1)));
+	vNewPosX = fXPos + fMovements.at(vMoveIndex).at(0);
+	vNewPosY = fYPos + fMovements.at(vMoveIndex).at(1);
+	while (vNewPosX < 0 || vNewPosX > fEnvWidth || vNewPosX < 0 || vNewPosY > fEnvHeight)
+	{
+		vMoveIndex = ((((double)rand() / RAND_MAX) * (fMovements.size() - 1)));
+		vNewPosX = fXPos + fMovements.at(vMoveIndex).at(0);
+		vNewPosY = fYPos + fMovements.at(vMoveIndex).at(1);
+	}
+
+	fXPos = vNewPosX;
+	fYPos = vNewPosY;
 }
 
 void PullPaintAgent::loop()

src/Agents/RepaintAgent.cpp

@@ -31,14 +31,17 @@ void RepaintAgent::init()
 
 void RepaintAgent::move()
 {
+	int vXMove;
+	int vYMove;
+	int fMovementsCount = fMovements.size();
 	//Only move on cells having a sufficiently close color
 	fValidMovementIndexes.clear();
-	for (int i = 0; i < static_cast<int>(fMovements.size()); i++)
+	for (int i = 0; i < static_cast<int>(fMovementsCount); i++)
 	{
-		int vXMove = fMovements.at(i).at(0);
-		int vYMove = fMovements.at(i).at(1);
+		vXMove = fXPos + fMovements.at(i).at(0);
+		vYMove = fYPos + fMovements.at(i).at(1);
 		if (
-			colorCloseEnough(fEnvironment->getCellOriginal(fXPos + vXMove, fYPos + vYMove)) && fEnvironment->getCell(fXPos + vXMove, fYPos + vYMove) != fColor.toInteger())
+			vXMove > 0 && vYMove > 0 && vXMove < fEnvWidth && vYMove < fEnvHeight && fEnvironment->getCell(vXMove, vYMove) != fColor.toInteger() && colorCloseEnough(fEnvironment->getCellOriginal(vXMove, vYMove)))
 		{
 			fValidMovementIndexes.push_back(i);
 		}
@@ -49,6 +52,7 @@ void RepaintAgent::move()
 		fCurrentMovement = fMovements.at(fValidMovementIndexes.at(vRandIndex));
 		fXPos += fCurrentMovement.at(0);
 		fYPos += fCurrentMovement.at(1);
+		// std::cout << "moved " << fXPos << ":" << fYPos;
 	}
 	else
 	{
@@ -70,11 +74,14 @@ void RepaintAgent::paint()
 	int vHalfBrush = fDotSize / 2;
 	int vXLoopIndex = fXPos - vHalfBrush;
 	int vYLoopIndex = fYPos - vHalfBrush;
-	while (vXLoopIndex < (fXPos + vHalfBrush))
+	int vXMaxIndex = fXPos + vHalfBrush;
+	int vYMaxIndex = fYPos + vHalfBrush;
+	while (vXLoopIndex < (vXMaxIndex))
 	{
-		while (vYLoopIndex < fYPos + vHalfBrush)
+		while (vYLoopIndex < (vYMaxIndex))
 		{
 			fEnvironment->paint(vXLoopIndex, vYLoopIndex, fColor);
+			// fEnvironment->paint(vXLoopIndex, vYLoopIndex, fColor);
 			vYLoopIndex++;
 		}
 		vYLoopIndex = fYPos - vHalfBrush;

src/Main.cpp

@@ -12,7 +12,10 @@ int main()
 	//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\\14.jpg";
+	// std::string filepath = "C:\\Users\\VroumVroumMachine\\Pictures\\RepAgents\\14.jpg";
+	// std::string filepath = "C:\\Users\\cash\\Pictures\\Capture.PNG";
+	// std::string filepath = "E:\\Fichiers\\Images\\PRE2020\\Photos\\Voyage\\Maroc\\P8253306.png";
+	std::string filepath = "E:\\Fichiers\\Images\\PRE2020\\Photos\\Voyage\\Maroc\\P8253294.png";
 	//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";
@@ -32,9 +35,14 @@ int main()
 	//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);
+	vEnvironment.makeRepaintAgents(20, 100, 100, 15);
+	// vEnvironment.makeRepaintAgents(200, 40, 40, 15);
+	// vEnvironment.makeStraightRepaintAgents(20, 80, 80, 100);
+	// vEnvironment.makeRepaintAgents(1, 50, 50, 15);
+	// vEnvironment.makeStraightRepaintAgents(1000, 2, 8, 50);
+	// vEnvironment.makeStraightRepaintAgents(1000, 15, 8, 50);
+	// vEnvironment.makePullPaintAgents(4, 80, 80);
+	// vEnvironment.makePullPaintAgents(100, 50, 50);
 	//int i = 0;
 	while (vEnvironment.loop())
 	{