Mouvements et couleurs random

lib/Environment/PictureEnvironment.hpp

@@ -27,6 +27,8 @@ public: // Access specifier
 	void makeAgents(int iNumber);
 	void paint(int iX, int iY, const sf::Color Color);
 
+	int getWidth();
+	int getHeight();
 	bool loop();
 	void displayLockInput();
 

src/Agents/Agent.cpp

@@ -7,13 +7,16 @@ Agent::Agent()
 
 Agent::Agent(PictureEnvironment* iEnvironment)
 {
-	long WHITE = 0xFFFFFFFF;
+	//uint32_t WHITE = 0xFFFFFFFF;
 	fEnvironment = iEnvironment;
 
 	//fColor = sf::Color(rand() % 0xFFFFFFFFFFFF);
-	fColor = sf::Color(((rand() % WHITE) << 16) + 0xFF);
-	fXPos = 100;
-	fYPos = 100;
+	uint32_t vRand = (((double)rand() / RAND_MAX) * 0xFFFFFFFFU);
+
+	fColor = sf::Color(vRand);
+	//fColor = sf::Color(((rand() % fColor.Red.toInteger())));
+	fXPos = iEnvironment->getWidth() / 2;
+	fYPos = iEnvironment->getHeight() / 2;
 }
 
 void Agent::loop()
@@ -22,11 +25,11 @@ void Agent::loop()
 	move();
 }
 
-int MOVESIZE = 10;
+int MOVESIZE = 5;
 
 void Agent::move()
 {
-	fXPos += (fXPos > MOVESIZE) ? rand() % MOVESIZE - 5 : MOVESIZE;
-	fYPos += (fYPos > MOVESIZE) ? rand() % MOVESIZE - 5 : MOVESIZE;
+	fXPos += (fXPos > MOVESIZE) ? (rand() % MOVESIZE) - (MOVESIZE / 2) : MOVESIZE;
+	fYPos += (fYPos > MOVESIZE) ? (rand() % MOVESIZE) - (MOVESIZE / 2) : MOVESIZE;
 	fEnvironment->paint(fXPos, fYPos, fColor);
 }

src/Environment/PictureEnvironment.cpp

@@ -23,7 +23,6 @@ PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow*
 	fImage = fTextureImage.copyToImage();
 
 	//memccpy(&fFilePath, &iFilePath, *iFilePath., 10);
-	std::cout << "Environement pour " << fFilePath;
 	fPlatform = iPlatform;
 	fWindow = iWindow;
 	float screenScalingFactor = fPlatform->getScreenScalingFactor(fWindow->getSystemHandle());
@@ -47,19 +46,6 @@ Perception PictureEnvironment::getPerception(int iX, int iY)
 	return vPerception;
 }
 
-void PictureEnvironment::makeAgents(int iNumber)
-{
-	Agent vTmpAgent;
-	fAgents = std::list<Agent>(iNumber);
-	fAgentsIterator = fAgents.begin();
-
-	for (int i = 0; i < iNumber; i++)
-	{
-		vTmpAgent = Agent(this);
-		fAgents.insert(fAgentsIterator, vTmpAgent);
-	}
-}
-
 bool PictureEnvironment::loop()
 {
 	if (fWindow->isOpen())
@@ -69,13 +55,16 @@ bool PictureEnvironment::loop()
 			if (fEvent.type == sf::Event::Closed)
 				fWindow->close();
 		}
-
-		fAgentsIterator = fAgents.begin();
-		for (uint i = 0; i < fAgents.size(); i++)
+		// fAgentsIterator = fAgents.begin();
+		std::list<Agent>::iterator vAgentsIterator = fAgents.begin();
+		fAgents.begin();
+		while (vAgentsIterator != fAgents.end())
 		{
-			fAgentsIterator->loop();
-		}
 
+			//std::cout << "loop" << vAgentsIterator->fColor->toInteger() << " at " << &vAgentsIterator << "\n";
+			vAgentsIterator->loop();
+			vAgentsIterator++;
+		}
 		fTextureImage.loadFromImage(fImage);
 		fShape.setTexture(&fTextureImage);
 		fWindow->clear();
@@ -90,6 +79,37 @@ bool PictureEnvironment::loop()
 	return true;
 }
 
+int PictureEnvironment::getHeight()
+{
+	return fImage.getSize().y;
+}
+
+int PictureEnvironment::getWidth()
+{
+	return fImage.getSize().x;
+}
+
+void PictureEnvironment::makeAgents(int iNumber)
+{
+
+	fAgents = std::list<Agent>();
+
+	for (int i = 0; i < iNumber; i++)
+	{
+		Agent vTmpAgent = Agent(this);
+		fAgents.push_back(vTmpAgent);
+		//std::cout << "pushback" << vTmpAgent.fColor.toInteger() << " at " << &vTmpAgent << "\n"
+		//		  << " size : " << fAgents.size() << "\n";
+	}
+	std::list<Agent>::iterator vAgentsIterator = fAgents.begin();
+	while (vAgentsIterator != fAgents.end())
+	{
+
+		//std::cout << "loop" << vAgentsIterator->fColor->toInteger() << " at " << &vAgentsIterator << "\n";
+		vAgentsIterator++;
+	}
+}
+
 void PictureEnvironment::displayLockInput()
 {
 	fWindow->create(sf::VideoMode(fInitialSize.x, fInitialSize.y), "Last peek");

src/Main.cpp

@@ -22,11 +22,11 @@ int main()
 
 	PictureEnvironment vEnvironment(filepath, &window, &platform);
 
-	vEnvironment.makeAgents(100);
-	int i = 0;
-	while (i++ < 10000)
+	vEnvironment.makeAgents(1000);
+	//int i = 0;
+	while (vEnvironment.loop())
 	{
-		vEnvironment.loop();
+		;
 		usleep(30);
 	}