create orchestrable xSpriteGroup (no more xSprite alone)

also fix mutexes

include/xSDL.h

@@ -4,7 +4,8 @@
 	#include "../xSDL/xOrchestrable.h"
 	#include "../xSDL/xApplication.h"
 	#include "../xSDL/xController.h"
-	#include "../xSDL/xElement.h"
+	#include "../xSDL/xDrawable.h"
 	#include "../xSDL/xSprite.h"
+	#include "../xSDL/xSpriteGroup.h"
 
 #endif

xSDL/xApplication.cpp

@@ -139,7 +139,7 @@ bool xApplication::setImage(const char *url){
 
 
 // 	// Anti conflit inter-thread
-// 	_mutex_hit.try_lock();
+// 	_mutex_hit.lock();
 
 // 	/* (1) On recupere le SDL_Rect destination du sprite courant */
 // 	int xIndex = -1;
@@ -224,7 +224,7 @@ bool xApplication::setImage(const char *url){
 // bool xApplication::hit(string current, int movex, int movey){
 // 	if( !this->status() ) return true;
 
-// 	_mutex_hit.try_lock();
+// 	_mutex_hit.lock();
 
 // 	/* (1) On recupere le SDL_Rect destination du sprite courant */
 // 	xSprite *sprite = NULL;
@@ -245,29 +245,29 @@ bool xApplication::setImage(const char *url){
 
 
 /** adds new sprite to draw */
-void xApplication::push(xElement* sprite){
-	_mutex_draw.try_lock();
+void xApplication::push(xDrawable* sprite){
+	_mutex_draw.lock();
 	_sprites.insert(sprite);
 	_mutex_draw.unlock();
 }
 
 /** removes a sprite to draw (from its address) */
-void xApplication::pull(xElement* sprite){
-	_mutex_draw.try_lock();
+void xApplication::pull(xDrawable* sprite){
+	_mutex_draw.lock();
 	_sprites.erase(sprite);
 	_mutex_draw.unlock();
 }
 
 /** clears the scene */
 void xApplication::clear(){
-	_mutex_draw.try_lock();
+	_mutex_draw.lock();
 	_sprites.clear();
 	_mutex_draw.unlock();
 }
 
 /** Update the scene */
 void xApplication::render(){
-	_mutex_draw.try_lock();
+	_mutex_draw.lock();
 
 	/* 1. clear scene */
 	SDL_RenderClear(_renderer);
@@ -281,9 +281,9 @@ void xApplication::render(){
 
 
 	/* 4. draw every sprite */
-	set<xElement*>::iterator it;
+	set<xDrawable*>::iterator it;
 	for( it = _sprites.begin() ; it != _sprites.end() ; it++ ){
-		xElement* sprite = *it;
+		xDrawable* sprite = *it;
 		sprite->draw(_renderer);
 	}
 
@@ -308,7 +308,7 @@ void xApplication::schedule(){
 	const uint32_t ticks = SDL_GetTicks();
 
 	// trigger tick() on registered orchestrables
-	_mutex_orchestrate.try_lock();
+	_mutex_orchestrate.lock();
 	set<xOrchestrable*>::iterator it;
 	for( it = _orchestrables.begin() ; it != _orchestrables.end() ; it++ ){
 		xOrchestrable* orchestrable = *it;
@@ -324,13 +324,13 @@ void xApplication::schedule(){
 }
 
 void xApplication::addOrchestrable(xOrchestrable* o){
-	_mutex_orchestrate.try_lock();
+	_mutex_orchestrate.lock();
 	_orchestrables.insert(o);
 	_mutex_orchestrate.unlock();
 }
 
 void xApplication::removeOrchestrable(xOrchestrable* o){
-	_mutex_orchestrate.try_lock();
+	_mutex_orchestrate.lock();
 	_orchestrables.erase(o);
 	_mutex_orchestrate.unlock();
 }

xSDL/xApplication.h

@@ -9,7 +9,7 @@
 	#include <mutex>
 	#include <thread>
 	#include <stdexcept>
-	#include "xElement.h"
+	#include "xDrawable.h"
 	#include "xController.h"
 	#include "xOrchestrable.h"
 	using namespace std;
@@ -41,8 +41,8 @@
 			// bool hit(string current, int movex=0, int movey=0);  // Gestion des collisions
 
 			/** scene */
-			void push(xElement* sprite);
-			void pull(xElement *sprite);
+			void push(xDrawable* sprite);
+			void pull(xDrawable *sprite);
 			void clear();
 
 			void render();
@@ -71,7 +71,7 @@
 			xController _controller;
 
 			// sprites
-			set<xElement*> _sprites;
+			set<xDrawable*> _sprites;
 
 			// execution pool
 			set<xOrchestrable*> _orchestrables;

xSDL/xDrawable.cpp

@@ -0,0 +1 @@
+#include "xDrawable.h"

xSDL/xDrawable.h

@@ -3,7 +3,7 @@
 
 	#include "SDL.h"
 
-	struct xElement {
+	struct xDrawable {
 		virtual void draw(SDL_Renderer* renderer) = 0;
 	};
 

xSDL/xElement.cpp

@@ -1 +0,0 @@
-#include "xElement.h"

xSDL/xSprite.cpp

@@ -2,7 +2,7 @@
 
 /** clean SDL objects */
 xSprite::~xSprite(){
-	_mutex.try_lock();
+	_mutex.lock();
 	SDL_FreeSurface( _surface );
 	_mutex.unlock();
 }
@@ -24,7 +24,7 @@ xSprite::xSprite(const char *url, SDL_Rect clip){
 
 /** update sprite to rhb color */
 void xSprite::setSurface(const int rgba[]){
-	_mutex.try_lock();
+	_mutex.lock();
 	if( _surface != NULL ){
 		SDL_FreeSurface( _surface );
 		_surface = NULL;
@@ -42,7 +42,7 @@ void xSprite::setSurface(const int rgba[]){
 
 /** update sprite to image */
 void xSprite::setSurface(const char *url){
-	_mutex.try_lock();
+	_mutex.lock();
 	if( _surface != NULL ){
 		SDL_FreeSurface( _surface );
 		_surface = NULL;
@@ -58,7 +58,7 @@ void xSprite::setSurface(const char *url){
 
 /** copies an existing surface */
 void xSprite::setSurface(SDL_Surface *s){
-	_mutex.try_lock();
+	_mutex.lock();
 	if( _surface != NULL ){
 		SDL_FreeSurface( _surface );
 		_surface = NULL;
@@ -73,72 +73,29 @@ void xSprite::setSurface(SDL_Surface *s){
 	_mutex.unlock();
 }
 
-/** add new animation frame with new clip */
-void xSprite::addFrame(SDL_Rect clip){
-	_mutex.try_lock();
-	_frames.push_back(clip);
-	_mutex.unlock();
-}
-
-/** clear every animation frames */
-void xSprite::clearFrames(){
-	_mutex.try_lock();
-	_frames.clear();
-	_mutex.unlock();
-}
-/** set sprite clip and clears animation frames */
+/** set sprite clip */
 void xSprite::setClip(SDL_Rect clip){
-	_mutex.try_lock();
-	_frames.clear();
-	_frames.push_back(clip);
+	_mutex.lock();
+	_clip = clip;
 	_mutex.unlock();
 }
 
 /** set sprite projection */
 void xSprite::project(SDL_Rect dest){
-	_mutex.try_lock();
+	_mutex.lock();
 	_projection = dest;
 	_mutex.unlock();
 }
 
 /** draws to renderer */
 void xSprite::draw(SDL_Renderer* renderer){
-	_mutex.try_lock();
-
-	// no clip -> use surface dimensions
-	if( _frames.size() <= 0 ){
-		setClip( (SDL_Rect){0, 0, _surface->w, _surface->h} );
-	}
-
-	// only 1 clip -> use it
-	if( _frames.size() == 1 ){
-		_active_clip = 0;
-	}
+	_mutex.lock();
 
 	SDL_RenderCopy(
 		renderer,
 		SDL_CreateTextureFromSurface(renderer, _surface),
-		&_frames.at(_active_clip),
+		&_clip,
 		&_projection
 	);
 	_mutex.unlock();
 }
-
-/** animation process */
-void xSprite::tick(const uint32_t ticks){
-	_mutex.try_lock();
-	uint32_t time_index  = ticks / _animation_interval;
-	_active_clip = time_index % _frames.size();
-	_mutex.unlock();
-}
-
-/** orchestrate the animation */
-void xSprite::animate(uint32_t interval){
-	_animation_interval = interval;
-	xApplication::get()->addOrchestrable(this);
-}
-
-/** stops orchestrating the animation */
-void xSprite::freeze(){
-	xApplication::get()->removeOrchestrable(this);
-}

xSDL/xSprite.h

@@ -6,12 +6,11 @@
 	#include <mutex>
 	#include "SDL.h"
 	#include "SDL_image.h"
-	#include "xElement.h"
-	#include "xOrchestrable.h"
+	#include "xDrawable.h"
 	#include "xApplication.h"
 	using namespace std;
 
-	class xSprite : public xElement, public xOrchestrable {
+	class xSprite : public xDrawable{
 
 		public:
 			// color sprite
@@ -27,41 +26,19 @@
 			void setSurface(const char *url);  // image sprite
 			void setSurface(SDL_Surface *t);   // copy surface
 
-			// animation
-			void addFrame(SDL_Rect clip);
-			void clearFrames();
-
 			// sets the sprite clip
-			// + clears animation frames
 			void setClip(SDL_Rect clip);
 
 			// set projection into scene
 			void project(SDL_Rect dest);
 
-			// implement xElement
+			// implement xDrawable
 			virtual void draw(SDL_Renderer* renderer) override;
-
-			// orchestrable process
-			void tick(const uint32_t ticks);
-
-			// animation handles
-			void animate(uint32_t interval);
-			void freeze();
-
-		protected:
+		private:
 			SDL_Surface*      _surface = NULL;
+			SDL_Rect          _clip;
 			SDL_Rect          _projection;
 
-			// surface clips
-			// [0] : no clip, use default surface dimensions
-			// [1] : global clip, use it every time
-			// [2+]: clips are used for animation
-			vector<SDL_Rect>  _frames;
-
-			// active clip for animation ; equal to 0 if not an animated sprite
-			size_t            _active_clip = 0;
-			uint32_t          _animation_interval;
-
 			mutex             _mutex;
 
 	};

xSDL/xSpriteGroup.cpp

@@ -0,0 +1,64 @@
+#include "xSpriteGroup.h"
+
+/** clean SDL objects */
+xSpriteGroup::~xSpriteGroup(){
+	_mutex.lock();
+	_sprites.clear();
+	_mutex.unlock();
+}
+
+/** default constructor */
+xSpriteGroup::xSpriteGroup(){
+}
+
+/** adds a sprite to the group */
+void xSpriteGroup::add(xSprite* sprite){
+	_mutex.lock();
+	_sprites.insert(sprite);
+	_mutex.unlock();
+}
+
+/** removes a sprite from the group */
+void xSpriteGroup::remove(xSprite* sprite){
+	_mutex.lock();
+	_sprites.erase(sprite);
+	_mutex.unlock();
+}
+
+/** set absolute move for each sprite */
+void xSpriteGroup::moveTo(int x, int y){
+	_mutex.lock();
+	_move.x = x;
+	_move.y = y;
+	_mutex.unlock();
+}
+
+/** draws to renderer */
+void xSpriteGroup::draw(SDL_Renderer* renderer){
+	_mutex.lock();
+
+	set<xSprite*>::iterator it;
+	for( it = _sprites.begin() ; it != _sprites.end() ; it++ ){
+		(*it)->draw(renderer);
+	}
+	_mutex.unlock();
+}
+
+/** animation process */
+void xSpriteGroup::tick(const uint32_t ticks){
+	_mutex.lock();
+	uint32_t time_index  = ticks / _animation_interval;
+	_active_sprite = time_index % _sprites.size();
+	_mutex.unlock();
+}
+
+/** orchestrate the animation */
+void xSpriteGroup::animate(uint32_t interval){
+	_animation_interval = interval;
+	xApplication::get()->addOrchestrable(this);
+}
+
+/** stops orchestrating the animation */
+void xSpriteGroup::freeze(){
+	xApplication::get()->removeOrchestrable(this);
+}

xSDL/xSpriteGroup.h

@@ -0,0 +1,52 @@
+#ifndef DEF_XSPRITEGROUP_H
+	#define DEF_XSPRITEGROUP_H
+
+	#include <string>
+	#include <vector>
+	#include <mutex>
+	#include "SDL.h"
+	#include "SDL_image.h"
+	#include "xDrawable.h"
+	#include "xOrchestrable.h"
+	#include "xApplication.h"
+	#include "xSprite.h"
+	using namespace std;
+
+	class xSpriteGroup : public xDrawable, public xOrchestrable {
+
+		public:
+			xSpriteGroup();
+			virtual ~xSpriteGroup();
+
+			// manage sprite list
+			void add(xSprite* sprite);
+			void remove(xSprite* sprite);
+			void clear();
+
+			// set absolute move for each sprite
+			void moveTo(int x, int y);
+
+			// implement xDrawable
+			virtual void draw(SDL_Renderer* renderer) override;
+
+			// implement xOrchestrable
+			void tick(const uint32_t ticks);
+
+			// animation handles
+			void animate(uint32_t interval);
+			void freeze();
+
+		protected:
+			SDL_Rect      _move;
+
+			set<xSprite*> _sprites;
+
+			// active sprite for animation ; equal to 0 if not an animated sprite
+			size_t        _active_sprite = 0;
+			uint32_t      _animation_interval;
+
+			mutex         _mutex;
+
+	};
+
+#endif