Tester

SFMLengine_alpha/modules/components/draw_component.h

@@ -2,13 +2,13 @@
 #include<SFML/Graphics.hpp>
 #include"component.h"
 
-class DrawComponent : public Component, public sf::Drawable
+class DrawComponent : public Component, public sf::Drawable, public sf::Transformable
 {
 protected:
 	sf::Drawable* object;
 
 public:
-	void draw(sf::RenderTarget& target, sf::RenderStates states) const;
+	virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
 
-	void set(sf::Drawable* obj);
+	void set(sf::Drawable& obj);
 };

SFMLengine_alpha/modules/components/soul_component.h

@@ -8,8 +8,12 @@ class SoulComponent :public Component
 	Object* obj;
 public:
 
+
 	template<class T>
-	void set(Game* game, Scence* scence, Entity* entity);
+	void set(Game* game, Scence* scence, Entity* entity) {
+		obj = new T();
+		obj->set(game, scence, entity);
+	}
 
 	void logic();
 };

SFMLengine_alpha/modules/main_srtuctures/Entity.h

@@ -12,14 +12,21 @@ class Entity:public sf::Drawable
 	sf::Vector2f pos;
 
 	template<class T>
-	void add_component();
+	void add_component() {
+		components.push_back(new T());
+	}
 
 	template<class T>
-	T& get_component() const;
+	T& get_component() const {
+		for (auto& comp : components)
+			if (typeid(*comp) == typeid(T))
+				return static_cast<T&>(*comp);
+	}
 	//���� - ������ �������� ��� ������
 	template<class T>
-	void set_soul(Game* game, Scence* scence);
-
+	void set_soul(Game* game, Scence* scence) {
+		get_component<SoulComponent>().set<T>(game, scence, this);
+	}
 
 	void logic();
 

SFMLengine_alpha/modules/main_srtuctures/Game.h

@@ -14,6 +14,8 @@ class Game
 	sf::Texture texture;
 	sf::Event event;
 
+private:
+	sf::CircleShape sh;
 public:
 	Game();
 

SFMLengine_alpha/modules/main_srtuctures/Scence.h

@@ -18,9 +18,9 @@ class Scence : public sf::Drawable
 	void logic();
 	//����� ���������� ��� ��������� ��� ������� ������������ ��������
 	template<class T>
-	void set(Game* game,int numb=0);
+	void set(Game* game, int numb) {
+		entities[numb].set_soul<T>(game, this);
+	}
 
 	//��������
-private:
-	sf::CircleShape sh;
 };

SFMLengine_alpha/src/components/draw_component.cpp

@@ -2,9 +2,7 @@
 
 void DrawComponent::draw(sf::RenderTarget& target, sf::RenderStates states)const {
 	target.draw(*object, states);
-
 }
-
-void DrawComponent::set(sf::Drawable* obj) {
-	this->object = obj; 
+void DrawComponent::set(sf::Drawable& obj) {
+	this->object = &obj; 
 }

SFMLengine_alpha/src/components/soul_component.cpp

@@ -3,12 +3,6 @@
 //#include"../../modules/main_srtuctures/Entity.h"
 //#include"../../modules/components/soul_component.h"
 
-template<class T>
-void SoulComponent::set(Game* game, Scence* scence, Entity* entity) {
-	obj = new T();
-	obj->set(game, scence, entity);
-}
-
 void SoulComponent::logic() {
 	obj->logic();
 }

SFMLengine_alpha/src/main_structures/Entity.cpp

@@ -1,23 +1,5 @@
 #include"../../modules/main_srtuctures/Game.h"
 
-
-template<class T>
-void Entity::add_component(){
-	components.push_back(new T());
-}
-
-template<class T>
-T& Entity::get_component() const {
-	for (auto& comp : components) 
-		if (typeid(*comp) == typeid(T))
-			return static_cast<T&>(*comp);
-}
-
-template<class T>
-void Entity::set_soul(Game* game, Scence* scence) {
-	get_component<SoulComponent>().set<T>(game, scence, this);
-}
-
 void Entity::logic() {
 	get_component<SoulComponent>().logic();
 }

SFMLengine_alpha/src/main_structures/Game.cpp

@@ -5,6 +5,10 @@ Game::Game() {
 	window.setFramerateLimit(60);
 
 	add_scence();
+	sh.setFillColor(sf::Color::Green);
+	sh.setPosition(sf::Vector2f(200, 200));
+	sh.setRadius(40);
+	scences[0].get()->get_component<DrawComponent>().set(sh);
 
 }
 
@@ -14,8 +18,9 @@ void Game::add_scence() {
 }
 
 void Game::draw() {
-
+	window.clear();
 		window.draw(*n_sc);
+		window.display();
 }
 
 void Game::logic() {
@@ -29,7 +34,9 @@ void Game::even() {
 }
 
 void Game::main_loop() {
-	even();
-	logic();
-	draw();
+	while (window.isOpen()) {
+		even();
+		logic();
+		draw();
+	}
 }

SFMLengine_alpha/src/main_structures/Scence.cpp

@@ -5,10 +5,7 @@ Scence::Scence(Game* game) {
 	entities[0].add_component<DrawComponent>();
 	entities[0].add_component<SoulComponent>();
 	entities[0].set_soul<Object>(game, this);
-	sh.setFillColor(sf::Color::Green);
-	sh.setPosition(sf::Vector2f(200, 200));
-	sh.setRadius(40);
-	entities[0].get_component<DrawComponent>().set(&sh);
+
 }
 
 void Scence::add_entity() {
@@ -25,7 +22,3 @@ void Scence::logic() {
 		ent.logic();
 }
 
-template<class T>
-void Scence::set(Game* game,int numb) {
-	entities[numb].set_soul<T>(game, this);
-}