ça commence a se déplacer

lib/Agents/Agent.hpp

@@ -8,11 +8,16 @@ class Agent
 public:
 	Perception fCurrentPerception;
 	PictureEnvironment* fEnvironment;
+	sf::Color fColor;
 	int fXPos;
 	int fYPos;
 
+	Agent();
 	Agent(PictureEnvironment* iEnvironment);
 	void loop();
+
+private:
+	void move();
 };
 
 #endif // AGENT_H

lib/Agents/Perception/Perception.hpp

@@ -6,7 +6,7 @@ class Perception
 public:			 // Access specifier
 	int fWidth;	 // Attribute (int variable)
 	int fHeight; // Attribute
-	std::vector<bool> fPercept;
+	std::vector<bool> fMovements;
 
 	Perception();
 	Perception(int iWidth, int iHeight);

lib/Environment/PictureEnvironment.hpp

@@ -1,21 +1,34 @@
 #ifndef PICTURE_ENVIRONMENT_H
 #define PICTURE_ENVIRONMENT_H
+#include "Platform/Platform.hpp"
 #include <Agents/Perception/Perception.hpp>
 
+class Agent;
+
 class PictureEnvironment
-{				 // The class
-public:			 // Access specifier
-	int fWidth;	 // Attribute (int variable)
-	int fHeight; // Attribute
+{		// The class
+public: // Access specifier
 	std::string fFilePath;
 	sf::RenderWindow* fWindow;
+	util::Platform* fPlatform;
+	const sf::Vector2f fSize;
+	sf::Vector2f fInitialSize;
 	sf::Event fEvent;
-	sf::CircleShape fShape;
+	sf::RectangleShape fShape;
+
+	sf::Texture fTextureImage;
+	sf::Image fImage;
+
+	std::list<Agent> fAgents;
+	std::list<Agent>::iterator fAgentsIterator;
 
-	PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow);
+	PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform);
 	Perception getPerception(int iX, int iY);
+	void makeAgents(int iNumber);
+	void paint(int iX, int iY, const sf::Color Color);
 
 	bool loop();
+	void displayLockInput();
 
 private:
 	PictureEnvironment();

src/Agents/Agent.cpp

@@ -1,11 +1,32 @@
 #include <Agents/Agent.hpp>
 #include <Environment/PictureEnvironment.hpp>
 
+Agent::Agent()
+{
+}
+
 Agent::Agent(PictureEnvironment* iEnvironment)
 {
+	long WHITE = 0xFFFFFFFF;
 	fEnvironment = iEnvironment;
+
+	//fColor = sf::Color(rand() % 0xFFFFFFFFFFFF);
+	fColor = sf::Color(((rand() % WHITE) << 16) + 0xFF);
+	fXPos = 100;
+	fYPos = 100;
 }
 
 void Agent::loop()
 {
-}
+	fEnvironment->getPerception(fXPos, fYPos);
+	move();
+}
+
+int MOVESIZE = 10;
+
+void Agent::move()
+{
+	fXPos += (fXPos > MOVESIZE) ? rand() % MOVESIZE - 5 : MOVESIZE;
+	fYPos += (fYPos > MOVESIZE) ? rand() % MOVESIZE - 5 : MOVESIZE;
+	fEnvironment->paint(fXPos, fYPos, fColor);
+}

src/Agents/Perception/Perception.cpp

@@ -6,7 +6,7 @@ Perception::Perception()
 
 Perception::Perception(int iX, int iY)
 {
-	fPercept = std::vector<bool>(iX * iY);
+	fMovements = std::vector<bool>(iX * iY);
 	fWidth = iX;
 	fHeight = iY;
 }

src/Environment/PictureEnvironment.cpp

@@ -1,30 +1,42 @@
+#include "Platform/Platform.hpp"
+#include <Agents/Agent.hpp>
 #include <Agents/Perception/Perception.hpp>
 #include <Environment/PictureEnvironment.hpp>
 
+const sf::Vector2f DEFAUMT_SIMZE = sf::Vector2f(800, 600);
 int PERCEPTION_SIZE = 4;
 
 PictureEnvironment::PictureEnvironment()
 {
 }
 
-PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow)
+PictureEnvironment::PictureEnvironment(std::string& iFilePath, sf::RenderWindow* iWindow, util::Platform* iPlatform) :
+	fSize(iWindow->getSize())
 {
+
 	fFilePath = iFilePath;
+	//sf::Texture fLoadedImage;
+	if (!fTextureImage.loadFromFile(fFilePath))
+	{
+		std::cout << "\n COULDNT LOAD PICTURE\n";
+	}
+	fImage = fTextureImage.copyToImage();
 
 	//memccpy(&fFilePath, &iFilePath, *iFilePath., 10);
 	std::cout << "Environement pour " << fFilePath;
-
+	fPlatform = iPlatform;
 	fWindow = iWindow;
+	float screenScalingFactor = fPlatform->getScreenScalingFactor(fWindow->getSystemHandle());
+	fWindow->create(sf::VideoMode(800.0f * screenScalingFactor, 600.0f * screenScalingFactor), "SFML works!");
+	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::CircleShape(fWindow->getSize().x / 2);
 	fShape.setFillColor(sf::Color::White);
 
-	sf::Texture shapeTexture;
-	if (!shapeTexture.loadFromFile(fFilePath))
-	{
-		std::cout << "\n COULDNT LOAD PICTURE\n";
-	}
-	fShape.setTexture(&shapeTexture);
+	fShape.setTexture(&fTextureImage);
 }
 
 Perception PictureEnvironment::getPerception(int iX, int iY)
@@ -35,6 +47,19 @@ 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())
@@ -44,16 +69,15 @@ bool PictureEnvironment::loop()
 			if (fEvent.type == sf::Event::Closed)
 				fWindow->close();
 		}
-		fShape = sf::CircleShape(fWindow->getSize().x / 2);
-		fShape.setFillColor(sf::Color::White);
 
-		sf::Texture shapeTexture;
-		if (!shapeTexture.loadFromFile(fFilePath))
+		fAgentsIterator = fAgents.begin();
+		for (uint i = 0; i < fAgents.size(); i++)
 		{
-			std::cout << "\n COULDNT LOAD PICTURE\n";
+			fAgentsIterator->loop();
 		}
-		fShape.setTexture(&shapeTexture);
 
+		fTextureImage.loadFromImage(fImage);
+		fShape.setTexture(&fTextureImage);
 		fWindow->clear();
 		fWindow->draw(fShape);
 		fWindow->display();
@@ -64,4 +88,20 @@ bool PictureEnvironment::loop()
 		return false;
 	}
 	return true;
+}
+
+void PictureEnvironment::displayLockInput()
+{
+	fWindow->create(sf::VideoMode(fInitialSize.x, fInitialSize.y), "Last peek");
+	fWindow->clear();
+	fWindow->draw(fShape);
+	fWindow->display();
+	int i;
+	std::cin >> i;
+}
+
+void PictureEnvironment::paint(int iX, int iY, const sf::Color iColour)
+{
+	//std::cout << "juste avant : " << iX << " et " << iY;
+	fImage.setPixel(iX, iY, iColour);
 }

src/Main.cpp

@@ -1,6 +1,7 @@
 
-#include "Platform/Platform.hpp"
+#include <Agents/Agent.hpp>
 #include <Environment/PictureEnvironment.hpp>
+#include <unistd.h>
 
 int main()
 {
@@ -14,16 +15,22 @@ int main()
 	sf::RenderWindow window;
 
 	// in Windows at least, this must be called before creating the window
-	float screenScalingFactor = platform.getScreenScalingFactor(window.getSystemHandle());
+
 	// Use the screenScalingFactor
-	window.create(sf::VideoMode(800.0f * screenScalingFactor, 600.0f * screenScalingFactor), "SFML works!");
-	platform.setIcon(window.getSystemHandle());
 
-	PictureEnvironment vEnvironment(filepath, &window);
+	//
+
+	PictureEnvironment vEnvironment(filepath, &window, &platform);
 
-	while (vEnvironment.loop())
+	vEnvironment.makeAgents(100);
+	int i = 0;
+	while (i++ < 10000)
 	{
+		vEnvironment.loop();
+		usleep(30);
 	}
 
+	//vEnvironment.displayLockInput();
+
 	return 0;
 }