fixed a performance issue

Author: Ligh7bringer

engine/src/engine.cpp

@@ -175,9 +175,6 @@ void Engine::Start(unsigned int width, unsigned int height,
       //capture the pressed keys in order to figure out what key has been pressed for the key bindings menu
       //only happens in the options scene
       if((event.type == Event::TextEntered || event.type == Event::KeyPressed) && _activeScene->_sceneID.compare("options") == 0) {
-          if(event.text.unicode < 128) {
-            _keysText.push_back(static_cast<char>(event.text.unicode));
-          }
           _keys.push_back(event.key.code);
           //LOG(DEBUG) << "IN OPTIONS SCENE";
       }

res/lang/bg.txt

@@ -1,12 +1,20 @@
-title=ЗАГЛАВИЕ
+title=Spell Knight
 play=Нова игра
 options=Опции
 exit=Изход
-hp=Живот
+hp=ТЖ
 time=Време
 score=Точки
 game_over=Край на играта!
 next_level=следващо ниво
-main_menu=меню
-restart=рестартиране
-language=Bulgarian
+main_menu=Меню
+restart=Рестартиране
+language=Език:
+resolution=Резолюция:
+winmode=Цял екран:
+bindings=Контроли:
+toggle=Промяна
+walkl=Ляво
+walkr=Дясно
+jump=Скачане
+shoot=Стреляне

res/lang/en.txt

@@ -6,7 +6,15 @@ hp=HP
 time=Time
 score=Score
 game_over=Game оver!
-next_level=next level
-main_menu=main menu
-restart=restart
-language=English
+next_level=Next level
+main_menu=Main menu
+restart=Restart
+language=Language:
+resolution=Resolution:
+winmode=Window mode:
+bindings=Key bindings:
+toggle=Toggle
+walkl=Walk left
+walkr=Walk right
+jump=Jump
+shoot=Shoot

res/settings.txt

@@ -31,3 +31,17 @@ void OptionButton::addOptions(const std::vector<std::string> &options) {
 const std::string& OptionButton::getSelection() const {
     return _options[_currentOption];
 }
+
+void OptionButton::setSelection(const std::string &sel) {
+    auto index = -1;
+    for(int i = 0; i < _options.size(); ++i) {
+        if(_options[i] == sel) {
+            index = i;
+            break;
+        }
+    }
+
+    if(index != -1) {
+        _panel.setTextLocalised(_options[index]);
+    }
+}

src/GUI/option_button.cpp

@@ -16,6 +16,7 @@ class OptionButton : public Button {
     void addOption(const std::string& option);
     void addOptions(const std::vector<std::string>& options);
     const std::string& getSelection() const override;
+    void setSelection(const std::string& sel);
 };
 
 

src/GUI/option_button.h

@@ -6,31 +6,30 @@ using namespace std;
 
 //constructor, initialises default sprite size and default animation speed
 AnimatedSpriteComponent::AnimatedSpriteComponent(Entity* p, Vector2f size) : Component(p), _size(size), _rotation(0) {
-        //total accumulated time, used to tell when to switch to the next frame
-        _totalTime = 0.0f;
-        //the texture rect's width and height
-        _currentFrame.width = _size.x;
-        _currentFrame.height = _size.y;
-        //current frame, default 0, 0
-        _currentImage = Vector2u(0, 0);
-        //default animation speed
-        _frameTime = 0.2f;
-        //this boolean is used to decide whether to flip the sprite or not
-        _facingRight = true;
-        //set this to the padding between rows in the spritesheet!!
-        //all online spritesheet packers seem to add padding for some reason
-        _spriteSheetPadding = 0;
-		    _currentRow = 0;
-        _hurt = false;
-        _hurtTimer = 1.0f;
-        _numOfFrames = 1;
-        _done = false;
-        _frameDecline = _numOfFrames;
-        //set origin
-        auto origin = _size / 2.f;
-        origin.x = floor(origin.x);
-        origin.y = floor(origin.y);
-        _sprite.setOrigin(origin);
+    //total accumulated time, used to tell when to switch to the next frame
+    _totalTime = 0.0f;
+    //the texture rect's width and height
+    _currentFrame.width = _size.x;
+    _currentFrame.height = _size.y;
+    //current frame, default 0, 0
+    _currentImage = Vector2u(0, 0);
+    //default animation speed
+    _frameTime = 0.2f;
+    //this boolean is used to decide whether to flip the sprite or not
+    _facingRight = true;
+    //set this to the padding between rows in the spritesheet!!
+    //all online spritesheet packers seem to add padding for some reason
+    _spriteSheetPadding = 0;
+    _currentRow = 0;
+    _hurt = false;
+    _hurtTimer = 1.0f;
+    _numOfFrames = 1;
+    _done = false;
+    //set origin
+    auto origin = _size / 2.f;
+    origin.x = floor(origin.x);
+    origin.y = floor(origin.y);
+    _sprite.setOrigin(origin);
 }
 
 void AnimatedSpriteComponent::update(double dt) {
@@ -54,18 +53,8 @@ void AnimatedSpriteComponent::update(double dt) {
             //unlock
             _locked = false;
             _done = true;
-          if(!_stalled){
             //restart from the first frame
             _currentImage.x = 0;
-          }
-//          else{
-//            if(_frameDecline ==_numOfFrames-1){
-//              _currentImage.x= _numOfFrames-_frameDecline--;
-//              _currentImage.x=_numOfFrames-_frameDecline--;
-//            }
-
-//          }
-
         }
 
     }
@@ -81,7 +70,7 @@ void AnimatedSpriteComponent::update(double dt) {
         _currentFrame.left = (_currentImage.x + 1) * abs(_currentFrame.width);
         _currentFrame.width = -abs(_currentFrame.width);
     }
-    
+
     //calculate spritesheet y coordinate, don't forget padding
     _currentFrame.top = _currentImage.y * _size.y + _spriteSheetPadding;
 
@@ -122,15 +111,6 @@ void AnimatedSpriteComponent::lockInAnimation(unsigned int row) {
     _locked = true;
 }
 
-void AnimatedSpriteComponent::stallAnimation(int row){
-  _stalled = true;
-    if(isDone()){
-        _currentImage.y = row;
-        _currentImage.x = _numOfFrames-1;
-    }
-
-}
-
 //sets the spritesheet, using the passed reference to a spritesheet
 void AnimatedSpriteComponent::setSpritesheet(const sf::Texture& sh) {
     _spritesheet = sh;
@@ -153,7 +133,7 @@ void AnimatedSpriteComponent::setNumberOfFrames(int num) {
 void AnimatedSpriteComponent::setCurrentRow(int r) {
     //if changing to a new animation
     if(_currentRow != r) {
-        _currentRow = r;    
+        _currentRow = r;
         //reset to first frame
         _currentImage.x = 0;
     }

src/components/cmp_animated_sprite.cpp

@@ -1,10 +1,6 @@
 #include "cmp_bullet.h"
 #include "cmp_player_attack.h"
-#include "cmp_physics.h"
 #include "cmp_animated_sprite.h"
-#include "cmp_enemy_physics.h"
-#include "texture_manager.h"
-#include "system_physics.h"
 #include "../../engine/src/engine.h"
 #include "cmp_score.h"
 #include "cmp_enemy_health.h"
@@ -81,8 +77,8 @@ void BulletComponent::checkCollisions(const std::vector<const b2Contact*>& conta
                         _enemies = _parent->scene->ents.find("enemy");
                         break;
                     }
-                  else{
-                      parentPhysics->setMass(0.f);
+                    else {
+                        parentPhysics->setMass(0.f);
                     }
                 }
             }

src/components/cmp_bullet.cpp

@@ -30,11 +30,12 @@ EnemyHealthComponent::EnemyHealthComponent(Entity* p, int health) : Component(p)
     _offset.x = _offset.x / 2.f;
     _offset.y += anim->getSize().y / 2.f;
     _panelAlpha = 180;
+
+    TEXT = Config::getLocalisedString("hp") + " ";
+    _panel.setTextLocalised(TEXT + to_string(_health));
 }
 
 void EnemyHealthComponent::update(double dt) {
-    //update text to current health
-    _panel.setText(Config::getLocalisedString("hp") + " " + std::to_string(_health));
     //update position
     _panel.setPosition(_parent->getPosition() - _offset);
     //update panel
@@ -69,9 +70,15 @@ void EnemyHealthComponent::decreaseHealth(int num) {
     if(_health <= (int)(1.f/4.f * (float)_maxHealth)) {
         _panel.setPanelColour(COL_25_PERCENT);
     }
+
+    //update text to current health
+    _panel.setTextLocalised(TEXT + std::to_string(_health));
 }
 
 //increases health by num
 void EnemyHealthComponent::increaseHealth(int num) {
     _health += num;
+
+    //update text to current health
+    _panel.setTextLocalised(TEXT + std::to_string(_health));
 }

src/components/cmp_enemy_health.cpp

@@ -8,6 +8,8 @@ class EnemyHealthComponent : public Component {
     int _health, _maxHealth;
     sf::Vector2f _offset;
     int _panelAlpha;
+    std::string TEXT;
+
 public:
     EnemyHealthComponent() = delete;
     explicit EnemyHealthComponent(Entity *p, int health);