Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
632031cedb
4
TODO_LUCAS.txt
Normal file
4
TODO_LUCAS.txt
Normal file
@ -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
|
10
config.yml
10
config.yml
@ -2,8 +2,8 @@
|
|||||||
players:
|
players:
|
||||||
width: 250
|
width: 250
|
||||||
startXPosition: 50
|
startXPosition: 50
|
||||||
fireCooldown: 50
|
fireCooldown: 10
|
||||||
speed: 2
|
speed: 10
|
||||||
user1:
|
user1:
|
||||||
color: red
|
color: red
|
||||||
keys:
|
keys:
|
||||||
@ -19,8 +19,8 @@ players:
|
|||||||
|
|
||||||
# Enemies config
|
# Enemies config
|
||||||
invaders:
|
invaders:
|
||||||
fireCooldown: 20
|
fireCooldown: 0
|
||||||
size: 15
|
size: 50
|
||||||
speed: 10
|
speed: 10
|
||||||
distance: 10 # distance in pixels between invaders
|
distance: 10 # distance in pixels between invaders
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ invaders:
|
|||||||
projectiles:
|
projectiles:
|
||||||
missiles:
|
missiles:
|
||||||
color: yellow
|
color: yellow
|
||||||
speed: 2
|
speed: 100
|
||||||
width: 10
|
width: 10
|
||||||
torpedos:
|
torpedos:
|
||||||
color: green
|
color: green
|
||||||
|
@ -22,7 +22,7 @@ public:
|
|||||||
void drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size);
|
void drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size);
|
||||||
void drawInvader2(const nsGraphics::Vec2D& baseVector, unsigned size);
|
void drawInvader2(const nsGraphics::Vec2D& baseVector, unsigned size);
|
||||||
void drawInvader3(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 drawTorpedo(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
|
||||||
void drawMissile(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
|
void drawMissile(const nsGraphics::Vec2D& baseVector, unsigned width, const nsGraphics::RGBAcolor& color);
|
||||||
void drawBackground();
|
void drawBackground();
|
||||||
|
@ -169,6 +169,6 @@ void Game::display() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(size_t i=0;i<players.size();++i){
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -5,6 +5,7 @@ PixelManager::PixelManager(MinGL& a) : window(a) {
|
|||||||
window.initGlut();
|
window.initGlut();
|
||||||
window.initGraphic();
|
window.initGraphic();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PixelManager::drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size){
|
void PixelManager::drawInvader1(const nsGraphics::Vec2D& baseVector, unsigned size){
|
||||||
float scale = size/(float)100;
|
float scale = size/(float)100;
|
||||||
window << nsShape::Circle(nsGraphics::Vec2D(50*scale, 50*scale)+baseVector, 50*scale, nsGraphics::KGray);
|
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);
|
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-10-10;
|
||||||
width = width/2;
|
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::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, 720)+baseVector, nsGraphics::Vec2D(5+width, 720-PLAYER_HEIGHT/2)+baseVector, 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, 720)+baseVector, nsGraphics::Vec2D(15+width, 720-PLAYER_HEIGHT)+baseVector, 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, 720)+baseVector, nsGraphics::Vec2D(15+width*2, 720-PLAYER_HEIGHT/2)+baseVector, 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, 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(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,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(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,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(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(playerID pID, string& name){
|
void PixelManager::askPlayerNameMenu(playerID pID, string& name){
|
||||||
|
Loading…
Reference in New Issue
Block a user