generated from sigonasr2/CPlusPlusProjectTemplate
HYPE!
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
parent
876dba04ba
commit
d090c24aeb
@ -17,6 +17,7 @@ Board::Board(vi2d boardSize,float gravity,float maxGravity,float launchSpd,float
|
|||||||
void Board::spawnBlock(int col){
|
void Board::spawnBlock(int col){
|
||||||
BlockClump c=BlockClump();
|
BlockClump c=BlockClump();
|
||||||
c.y-=128;
|
c.y-=128;
|
||||||
|
c.vspeed=maxGravity;
|
||||||
c.addBlock(col,0,colorHandler.getRandomColor());
|
c.addBlock(col,0,colorHandler.getRandomColor());
|
||||||
clumps.push_back(c);
|
clumps.push_back(c);
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
25
main.cpp
25
main.cpp
@ -16,20 +16,7 @@ bool Meteos::OnUserCreate()
|
|||||||
randBlockPos=std::uniform_int_distribution<>(0, 9);
|
randBlockPos=std::uniform_int_distribution<>(0, 9);
|
||||||
coinFlip=std::uniform_int_distribution<>(0, 1);
|
coinFlip=std::uniform_int_distribution<>(0, 1);
|
||||||
|
|
||||||
gameBoard=Board({10,14},20.f,100.f,-20.f,1.0f,{3,0,0,0,0,0,0,0,0,0},SPRITES["blocks_test.png"]);
|
gameBoard=Board({10,14},20.f,100.f,-60.f,1.0f,{3,0,0,0,0,0,0,0,0,0},SPRITES["blocks_test.png"]);
|
||||||
|
|
||||||
BlockClump c;
|
|
||||||
c.addBlock(0,2,BlockColor::RED);
|
|
||||||
c.addBlock(0,1,BlockColor::RED);
|
|
||||||
c.addBlock(1,0,BlockColor::RED);
|
|
||||||
c.addBlock(2,0,BlockColor::RED);
|
|
||||||
c.addBlock(0,0,BlockColor::RED);
|
|
||||||
c.y=120;
|
|
||||||
gameBoard.addClump(c);
|
|
||||||
|
|
||||||
gameBoard.spawnBlock(4);
|
|
||||||
gameBoard.spawnBlock(4);
|
|
||||||
gameBoard.spawnBlock(4);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -245,12 +232,11 @@ bool Meteos::OnUserUpdate(float fElapsedTime)
|
|||||||
if (i+checkX<gameBoard.boardSize.x) {
|
if (i+checkX<gameBoard.boardSize.x) {
|
||||||
for (int k=0;k<gameBoard.getBlocks(i+checkX).size();k++){
|
for (int k=0;k<gameBoard.getBlocks(i+checkX).size();k++){
|
||||||
Block&b2=gameBoard.getBlocks(i+checkX)[k];
|
Block&b2=gameBoard.getBlocks(i+checkX)[k];
|
||||||
if (j==k)continue;
|
if (b.col==b2.col&&b2.col!=BlockColor::LAUNCHED&&b2.pos.x==b.pos.x+checkX*12&&b2.pos.y==checkY) {
|
||||||
if (b.col==b2.col&&b2.col!=BlockColor::LAUNCHED&&b2.pos.x==checkX*12&&b2.pos.y==checkY) {
|
|
||||||
found=true;
|
found=true;
|
||||||
std::cout<<"Found match @ ("<<checkX*12<<","<<checkY<<") Block ("<<b2.pos<<")"<<b2.addedToLaunchList<<std::endl;
|
std::cout<<"Found match @ ("<<checkX*12<<","<<checkY<<") Block ("<<b2.pos<<")"<<b2.addedToLaunchList<<std::endl;
|
||||||
checkX+=12;
|
|
||||||
tempMatchIDsX.push_back({i+checkX,k});
|
tempMatchIDsX.push_back({i+checkX,k});
|
||||||
|
checkX++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -263,12 +249,11 @@ bool Meteos::OnUserUpdate(float fElapsedTime)
|
|||||||
if (i+checkX>=0) {
|
if (i+checkX>=0) {
|
||||||
for (int k=0;k<gameBoard.getBlocks(i+checkX).size();k++){
|
for (int k=0;k<gameBoard.getBlocks(i+checkX).size();k++){
|
||||||
Block&b2=gameBoard.getBlocks(i+checkX)[k];
|
Block&b2=gameBoard.getBlocks(i+checkX)[k];
|
||||||
if (j==k)continue;
|
if (b.col==b2.col&&b2.col!=BlockColor::LAUNCHED&&b2.pos.x==b.pos.x+checkX*12&&b2.pos.y==checkY) {
|
||||||
if (b.col==b2.col&&b2.col!=BlockColor::LAUNCHED&&b2.pos.x==checkX*12&&b2.pos.y==checkY) {
|
|
||||||
found=true;
|
found=true;
|
||||||
std::cout<<"Found match @ ("<<checkX*12<<","<<checkY<<") Block ("<<b2.pos<<")"<<b2.addedToLaunchList<<std::endl;
|
std::cout<<"Found match @ ("<<checkX*12<<","<<checkY<<") Block ("<<b2.pos<<")"<<b2.addedToLaunchList<<std::endl;
|
||||||
checkX-=12;
|
|
||||||
tempMatchIDsX.push_back({i+checkX,k});
|
tempMatchIDsX.push_back({i+checkX,k});
|
||||||
|
checkX--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user