diff --git a/VaporWaveWars/commons.hpp b/VaporWaveWars/commons.hpp index 370d6fb..9e82ae6 100644 --- a/VaporWaveWars/commons.hpp +++ b/VaporWaveWars/commons.hpp @@ -10,6 +10,9 @@ const int SCENE_NUM = 4; +#define MARGEERR 0.30f +#define BLACKVALUE 0.00025f + #define ASSERT(expression) do \ { \ if(!(expression)) { \ diff --git a/VaporWaveWars/compas.cpp b/VaporWaveWars/compas.cpp index 33b3fca..e6de97c 100644 --- a/VaporWaveWars/compas.cpp +++ b/VaporWaveWars/compas.cpp @@ -1,7 +1,7 @@ #include "compas.hpp" Compas::Compas() { - spaceTime = 0; + spaceTime = 1; isPress = false; } @@ -9,7 +9,7 @@ void Compas::start() { if (not isPress) { std::cout << "start" << std::endl; isPress = true; - spaceTime = 0; + spaceTime = 1; notes = std::vector(); } } @@ -17,7 +17,7 @@ void Compas::start() { void Compas::add() { if (isPress) { notes.push_back(spaceTime); - spaceTime = 0; + spaceTime = 1; std::cout << "add" << std::endl; } } @@ -32,7 +32,7 @@ void Compas::end() { } } -void Compas::incriseTime() { +void Compas::incraeseTime() { ++spaceTime; } @@ -40,11 +40,16 @@ int Compas::get (int i) const { return notes[i]; } +int Compas::size() const { + return notes.size(); +} + bool Compas::operator ==(const Compas& d) const{ int n = notes.size(); + if (n != d.size()) return false; for (int i = 0; i < n; ++i) { float diff = ((float) (std::abs(notes[i] - d.get(i))))/((float) (notes[i])); - if (diff > margeErr) return false; + if (diff > MARGEERR) return false; } return true; } diff --git a/VaporWaveWars/compas.hpp b/VaporWaveWars/compas.hpp index 2b4b3e9..a73a400 100644 --- a/VaporWaveWars/compas.hpp +++ b/VaporWaveWars/compas.hpp @@ -4,23 +4,22 @@ #include #include #include +#include -static const float margeErr = 0.80f; - -class Compas{ - +class Compas { private: bool isPress; int spaceTime; std::vector notes; + int get(int i) const; + int size() const; public: Compas(); void start(); void add(); void end(); - void incriseTime(); - int get(int i) const; + void incraeseTime(); bool operator ==(const Compas& d) const; }; diff --git a/VaporWaveWars/mygame.cpp b/VaporWaveWars/mygame.cpp index ecbb645..29df3e6 100644 --- a/VaporWaveWars/mygame.cpp +++ b/VaporWaveWars/mygame.cpp @@ -5,7 +5,6 @@ MyGame::MyGame() { _scenes = std::vector(SCENE_NUM); _scenes[GameScene::menu] = &_menu; std::cout << "in menu" << std::endl; - } MyGame::~MyGame() { @@ -21,6 +20,7 @@ void MyGame::changeScene(GameScene::gameScene n){ // Main game loop void MyGame::update(float deltaTime, sf::RenderWindow*window) { +// std::cout << deltaTime << std::endl; sf::Event event; while(window->pollEvent(event)){ switch (event.type) { diff --git a/VaporWaveWars/mygame.hpp b/VaporWaveWars/mygame.hpp index c6c9236..9562e48 100644 --- a/VaporWaveWars/mygame.hpp +++ b/VaporWaveWars/mygame.hpp @@ -1,6 +1,7 @@ #ifndef MYGAME_HPP #define MYGAME_HPP #include "game.hpp" + #include "menu.hpp" class MyGame : public Game{