sigonasr2/Meteos
1
0
Fork 0
generated from sigonasr2/CPlusPlusProjectTemplate
Code Issues Pull Requests Projects Releases Wiki Activity

Block Clump merging

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2 2022-11-18 13:48:20 -07:00
parent 9ada6ed0e0
commit 61354a8497
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
C++ProjectTemplate
View File

Binary file not shown.

10
main.cpp
View File

@ -20,6 +20,7 @@ bool Meteos::OnUserCreate()
bool Meteos::OnUserUpdate(float fElapsedTime) bool Meteos::OnUserUpdate(float fElapsedTime)
{ {
fElapsedTime=std::min(fElapsedTime,1/60.f);
lastBlockSpawn+=fElapsedTime; lastBlockSpawn+=fElapsedTime;
if (lastBlockSpawn>=3.0f){ if (lastBlockSpawn>=3.0f){
lastBlockSpawn-=3.0f; lastBlockSpawn-=3.0f;
@ -52,12 +53,19 @@ bool Meteos::OnUserUpdate(float fElapsedTime)
float snapYPos=c.getBlockPosition(b3).y; float snapYPos=c.getBlockPosition(b3).y;
yDiff-=snapYPos; yDiff-=snapYPos;
c2.y+=yDiff; c2.y+=yDiff;
float influence=(float)c.getBlocks().size()/(c.getBlocks().size()+c2.getBlocks().size());
//Copy every block from one clump to the other //Copy every block from one clump to the other
for (int m=0;m<c2.getBlocks().size();m++) { for (int m=0;m<c2.getBlocks().size();m++) {
Block&b4=c2.getBlocks()[m]; Block&b4=c2.getBlocks()[m];
c.addBlock(b4.pos.x/12,(c2.getBlockPosition(b4).y-c.y)/12); c.addBlock(b4.pos.x/12,(c2.getBlockPosition(b4).y-c.y)/12);
} }
c.vspeed+=c2.vspeed; if (c.vspeed>0) {
c.vspeed/=4;
}
if (c2.vspeed>0) {
c2.vspeed/=4;
}
c.vspeed=c.vspeed*influence+c2.vspeed*(1-influence);
gameBoard.removeClump(j--); gameBoard.removeClump(j--);
goto nextClumpCollisionCheck; goto nextClumpCollisionCheck;
} }