From 7bd03350d20578e16e4e6d0a9490cc23bb6dd6a4 Mon Sep 17 00:00:00 2001
From: imuny <92868641+imuny0@users.noreply.github.com>
Date: Mon, 3 Jan 2022 17:32:50 +0100
Subject: [PATCH] =?UTF-8?q?vecteur=20de=20draw=20player=20pass=C3=A9=20en?=
 =?UTF-8?q?=20simple=20demande=20de=20x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TODO_LUCAS.txt         |  4 ++++
 config.yml             | 10 +++++-----
 headers/pixelManager.h |  2 +-
 src/gameBasics.cpp     |  2 +-
 src/pixelManager.cpp   | 17 +++++++++--------
 5 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 TODO_LUCAS.txt

diff --git a/TODO_LUCAS.txt b/TODO_LUCAS.txt
new file mode 100644
index 0000000..c9ffcca
--- /dev/null
+++ b/TODO_LUCAS.txt
@@ -0,0 +1,4 @@
+nom du joueur ecran 100*100 sans efacé le reste
+le joueur est gros 
+basevector a change en variable x
+projectile style fusée 
diff --git a/config.yml b/config.yml
index 3e7d7a8..52a856c 100644
--- a/config.yml
+++ b/config.yml
@@ -2,8 +2,8 @@
 players:
  width: 250
  startXPosition: 50
- fireCooldown: 50
- speed: 2
+ fireCooldown: 10
+ speed: 10
  user1:
   color: red
   keys:
@@ -19,8 +19,8 @@ players:
 
 # Enemies config
 invaders:
- fireCooldown: 20
- size: 15
+ fireCooldown: 0
+ size: 50
  speed: 10
  distance: 10 # distance in pixels between invaders
 
@@ -39,7 +39,7 @@ invaders:
 projectiles:
  missiles:
   color: yellow
-  speed: 2
+  speed: 100
   width: 10
  torpedos:
   color: green
diff --git a/headers/pixelManager.h b/headers/pixelManager.h
index 571270b..40f4425 100644
--- a/headers/pixelManager.h
+++ b/headers/pixelManager.h
@@ -21,7 +21,7 @@ public:
 	void drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size);
 	void drawInvader2(const nsGraphics::Vec2D& baseVector, unsigned size);
 	void drawInvader3(const nsGraphics::Vec2D& baseVector, unsigned size);
-	void drawPlayer(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor &color);
+	void drawPlayer(const unsigned x, unsigned width, const nsGraphics::RGBAcolor &color);
 	void drawTorpedo(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
 	void drawMissile(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
 	void drawBackground();
diff --git a/src/gameBasics.cpp b/src/gameBasics.cpp
index 0cb8a8b..1c20488 100644
--- a/src/gameBasics.cpp
+++ b/src/gameBasics.cpp
@@ -164,6 +164,6 @@ void Game::display() {
 	}
 
 	for(size_t i=0;i<players.size();++i){
-		pm.drawPlayer(Position(players[i].x, 0), confData.playersWidth, confData.playerDefs[i].color);
+		pm.drawPlayer(players[i].x, confData.playersWidth, confData.playerDefs[i].color);
 	}
 }
\ No newline at end of file
diff --git a/src/pixelManager.cpp b/src/pixelManager.cpp
index b557465..7ba01c0 100644
--- a/src/pixelManager.cpp
+++ b/src/pixelManager.cpp
@@ -5,6 +5,7 @@ PixelManager::PixelManager(MinGL& a) : window(a) {
 	window.initGlut();
 	window.initGraphic();
 }
+
 void PixelManager::drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size){
 	float scale = size/(float)100;
 	window << nsShape::Circle(nsGraphics::Vec2D(50*scale, 50*scale)+baseVector, 50*scale, nsGraphics::KGray);
@@ -32,16 +33,16 @@ void PixelManager::drawInvader3(const nsGraphics::Vec2D& baseVector, unsigned si
 	window << nsShape::Rectangle(nsGraphics::Vec2D(35*scale, 65*scale)+baseVector, nsGraphics::Vec2D(65*scale, 72*scale)+baseVector, nsGraphics::KBlack);
 }
 
-void PixelManager::drawPlayer(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color){
+void PixelManager::drawPlayer(const unsigned x, unsigned width, const nsGraphics::RGBAcolor& color){
 	width = width-10-10;
 	width = width/2;
-	window << nsShape::Triangle(nsGraphics::Vec2D(0, 720)+baseVector, nsGraphics::Vec2D(5, 720)+baseVector, nsGraphics::Vec2D(5, 720-PLAYER_HEIGHT/2)+baseVector, color);
-	window << nsShape::Rectangle(nsGraphics::Vec2D(5, 720)+baseVector, nsGraphics::Vec2D(5+width, 720-PLAYER_HEIGHT/2)+baseVector, color);
-	window << nsShape::Rectangle(nsGraphics::Vec2D(5+width, 720)+baseVector, nsGraphics::Vec2D(15+width, 720-PLAYER_HEIGHT)+baseVector, color);
-	window << nsShape::Rectangle(nsGraphics::Vec2D(15+width, 720)+baseVector, nsGraphics::Vec2D(15+width*2, 720-PLAYER_HEIGHT/2)+baseVector, color);
-	window << nsShape::Triangle(nsGraphics::Vec2D(15+width*2, 720)+baseVector, nsGraphics::Vec2D(15+width*2, 720-PLAYER_HEIGHT/2)+baseVector, nsGraphics::Vec2D(20+width*2, 720)+baseVector, color);
-	window << nsShape::Triangle(nsGraphics::Vec2D(5,720-PLAYER_HEIGHT/2)+baseVector, nsGraphics::Vec2D(5+width,720-PLAYER_HEIGHT/2)+baseVector, nsGraphics::Vec2D(5+width,720-PLAYER_HEIGHT*0.9)+baseVector, color);
-	window << nsShape::Triangle(nsGraphics::Vec2D(15+width,720-PLAYER_HEIGHT/2)+baseVector, nsGraphics::Vec2D(15+width*2,720-PLAYER_HEIGHT/2)+baseVector, nsGraphics::Vec2D(15+width,720-PLAYER_HEIGHT*0.9)+baseVector, color);
+	window << nsShape::Triangle(nsGraphics::Vec2D(0+x, 720), nsGraphics::Vec2D(5+x, 720), nsGraphics::Vec2D(5+x, 720-PLAYER_HEIGHT/2), color);
+	window << nsShape::Rectangle(nsGraphics::Vec2D(5+x, 720), nsGraphics::Vec2D(5+width+x, 720-PLAYER_HEIGHT/2), color);
+	window << nsShape::Rectangle(nsGraphics::Vec2D(5+width+x, 720), nsGraphics::Vec2D(15+width+x, 720-PLAYER_HEIGHT), color);
+	window << nsShape::Rectangle(nsGraphics::Vec2D(15+width+x, 720), nsGraphics::Vec2D(15+width*2+x, 720-PLAYER_HEIGHT/2), color);
+	window << nsShape::Triangle(nsGraphics::Vec2D(15+width*2+x, 720), nsGraphics::Vec2D(15+width*2+x, 720-PLAYER_HEIGHT/2), nsGraphics::Vec2D(20+width*2+x, 720), color);
+	window << nsShape::Triangle(nsGraphics::Vec2D(5+x,720-PLAYER_HEIGHT/2), nsGraphics::Vec2D(5+width+x,720-PLAYER_HEIGHT/2), nsGraphics::Vec2D(5+width+x,720-PLAYER_HEIGHT*0.9), color);
+	window << nsShape::Triangle(nsGraphics::Vec2D(15+width+x,720-PLAYER_HEIGHT/2), nsGraphics::Vec2D(15+width*2+x,720-PLAYER_HEIGHT/2), nsGraphics::Vec2D(15+width+x,720-PLAYER_HEIGHT*0.9), color);
 }
 
 void PixelManager::askPlayerNameMenu(string& name){