vylion/WaveGGJ17
vylion/WaveGGJ17
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

magic sync for waves, not in center tho

Browse source
This commit is contained in:
Ralusama19 2017-01-22 00:06:14 +01:00
parent a1d2df2034
commit e2e36835a7
7 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Resources/Sounds/Notes/1.wav
View file

Binary file not shown.

BIN
Resources/Sounds/Notes/2.wav
View file

Binary file not shown.

BIN
Resources/Sounds/Notes/3.wav
View file

Binary file not shown.

BIN
Resources/Sounds/Notes/4.wav
View file

Binary file not shown.

56
VaporWaveWars/combat.cpp
View file

@ -16,9 +16,9 @@ Combat::Combat() {
} }
Combat::~Combat(){ Combat::~Combat(){
for(std::vector<Wave*>::iterator w = waves.begin(); w != waves.end();){ for(std::vector<Wave*>::iterator w = waves.begin(); w != waves.end();){
w=waves.erase(w); w=waves.erase(w);
} }
} }
@ -39,9 +39,9 @@ void Combat::initShader() {
_shader.setParameter("resolution", sf::Vector2f(W_WIDTH, W_HEIGHT)); _shader.setParameter("resolution", sf::Vector2f(W_WIDTH, W_HEIGHT));
_shader.setParameter("time", time); _shader.setParameter("time", time);
ASSERT(_haloT.loadFromFile(WORK_DIR+"Resources/platform-halo.png")); ASSERT(_haloT.loadFromFile(WORK_DIR+"Resources/platform-halo.png"));
_halo.setTexture(_haloT); _halo.setTexture(_haloT);
_halo.setPosition(W_WIDTH*0.05f, W_HEIGHT*0.5f); _halo.setPosition(W_WIDTH*0.05f, W_HEIGHT*0.5f);
_shaderHalo.loadFromFile(WORK_DIR+"Resources/halo.frag", sf::Shader::Fragment); _shaderHalo.loadFromFile(WORK_DIR+"Resources/halo.frag", sf::Shader::Fragment);
_shaderHalo.setParameter("blue", attacking); _shaderHalo.setParameter("blue", attacking);
_shaderHalo.setParameter("time", time); _shaderHalo.setParameter("time", time);
@ -127,20 +127,36 @@ void Combat::doMahWaves(bool p){
notes = player->getAttack().getNotes(); notes = player->getAttack().getNotes();
} }
else notes = enemy->getAttack().getNotes(); else notes = enemy->getAttack().getNotes();
if (notes.size() > 0){
int anterior = notes[0]; int anterior = notes[0];
if(!p) anterior = 512+512*anterior; if(!p) anterior = 512+256*anterior;
else anterior = 512-512*anterior; else anterior = 512-256*anterior;
for(int i = 0; i < notes.size(); ++i){ for(int i = 0; i < notes.size(); ++i){
std::cout << notes[i] << std::endl; std::cout << notes[i] << std::endl;
Wave* w = new Wave(p); Wave* w = new Wave(p);
//if(!p) w->setPosition(anterior,500); //if(!p) w->setPosition(anterior,500);
//else w->setPosition(512-512*anterior,500); //else w->setPosition(512-512*anterior,500);
w->setPosition(anterior,500); w->setPosition(anterior,200);
if(i<notes.size()) { if(i<notes.size()) {
if(!p) anterior += 256*notes[i+1]; if(!p) anterior += 176*notes[i+1];
else anterior -= 256*notes[i+1]; else anterior -= 176*notes[i+1];
}
waves.push_back(w);
}
// int anterior = 1;
// if(!p) anterior = 512+256*anterior;
// else anterior = 512-256*anterior;
// for(int i = 0; i < 20; ++i){
// //std::cout << 0 << std::endl;
// Wave* w = new Wave(p);
// //if(!p) w->setPosition(anterior,500);
// //else w->setPosition(512-512*anterior,500);
// w->setPosition(anterior,200);
// if(i<20) {
// if(!p) anterior += 128*4;
// else anterior -= 128*4;
// }
// waves.push_back(w);
} }
waves.push_back(w);
}
} }

1
VaporWaveWars/mygame.cpp
View file

@ -10,6 +10,7 @@ MyGame::MyGame() {
_scenes[GameScene::credits] = _menu; _scenes[GameScene::credits] = _menu;
std::cout << "in menu" << std::endl; std::cout << "in menu" << std::endl;
SoundManager::load(); SoundManager::load();
SoundManager::setGlobalSoundVolumen(50);
SoundManager::setLoop(true, "intro"); SoundManager::setLoop(true, "intro");
SoundManager::playMusic("intro"); SoundManager::playMusic("intro");
} }

5
VaporWaveWars/wave.cpp
View file

@ -11,6 +11,7 @@ Wave::Wave(bool dir){
direction = dir; direction = dir;
ASSERT(texture.loadFromFile(spriteFile)); ASSERT(texture.loadFromFile(spriteFile));
setTexture(texture); setTexture(texture);
setOrigin(texture.getSize().x/2,0);
// sf::IntRect rect = sf::IntRect(0, 0, texture.getSize().x, texture.getSize().y); // sf::IntRect rect = sf::IntRect(0, 0, texture.getSize().x, texture.getSize().y);
// setTextureRect(rect); // setTextureRect(rect);
} }
@ -18,10 +19,10 @@ Wave::Wave(bool dir){
void Wave::update(float deltaTime){ void Wave::update(float deltaTime){
float pos = getPosition().x; float pos = getPosition().x;
if (direction){ if (direction){
pos += 1280*deltaTime; // AMOUNT?? pos += 640*deltaTime; // AMOUNT??
} }
else{ else{
pos -= 1280*deltaTime; // "" pos -= 640*deltaTime; // ""
} }
setPosition(pos, getPosition().y); setPosition(pos, getPosition().y);
} }