optimizing and fixing

Author: maxnut

src/EffectGameObject.cpp

@@ -1,8 +1,8 @@
 #include "EffectGameObject.h"
-#include "GameLayer.h"
 #include "ActionEasing.h"
+#include "GameLayer.h"
 
-#define gameLayer GameLayer::instance //lol
+#define gameLayer GameLayer::instance // lol
 
 void EffectGameObject::triggerActivated()
 {
@@ -134,8 +134,30 @@ void EffectGameObject::moveAction()
 
 void EffectGameObject::toggleAction()
 {
+gameLayer->groups[targetGroupId]->enabled = activateGroup;
+
 for (GameObject* obj : gameLayer->groups[targetGroupId]->objects)
 {
+bool disabled = false;
+
+if (activateGroup)
+{
+for (int group : obj->groups)
+{
+if (group == targetGroupId)
+continue;
+
+if (!gameLayer->groups[group]->enabled)
+{
+disabled = true;
+break;
+}
+}
+}
+
+if (disabled)
+continue;
+
 obj->enabled = activateGroup;
 
 if (!activateGroup && obj->currentBatcher)
@@ -191,11 +213,12 @@ void EffectGameObject::stopAction()
 
 void EffectGameObject::followAction()
 {
-std::shared_ptr<FollowAction> followAction = FollowAction::create(duration, targetGroupId, secondaryTargetGroupId, xMod, yMod);
+std::shared_ptr<FollowAction> followAction =
+FollowAction::create(duration, targetGroupId, secondaryTargetGroupId, xMod, yMod);
 
-if(!followAction)
+if (!followAction)
 return;
-
+
 gameLayer->followActionsActive.push_back(followAction);
 
 this->triggerAction = followAction;

src/GameLayer.cpp

@@ -7,6 +7,8 @@
 #include "PlatformUtils.h"
 #include "SelectLevelLayer.h"
 
+#include <algorithm>
+#include <execution>
 #include <cpr/cpr.h>
 #include <deque>
 #include <imgui.h>
@@ -144,16 +146,16 @@ void GameLayer::update()
 if (canStart && audioEngine && !audioEngine->isPlaying)
 {
 audioEngine->setPosition(musicOffset);
-audioEngine->setVolume(0.55f);
+audioEngine->setVolume(0.15f);
 audioEngine->play();
 }
 
 if (audioEngine)
 audioEngine->update();
-
+
 frameTimer -= Application::instance->deltaTime;
 
-if(frameTimer <= 0)
+if (frameTimer <= 0)
 {
 frameTimer = 0.25f;
 framerate = (int)ImGui::GetIO().Framerate;
@@ -209,13 +211,15 @@ void GameLayer::draw()
 
 void GameLayer::GUI()
 {
- ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
- ImGui::SetNextWindowBgAlpha(0.35f); // Transparent background
- if (ImGui::Begin("Example: Simple overlay", (bool*)0, window_flags))
- {
- ImGui::Text(std::to_string(framerate).c_str());
- }
- ImGui::End();
+ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoDocking |
+ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings |
+ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
+ImGui::SetNextWindowBgAlpha(0.35f); // Transparent background
+if (ImGui::Begin("Example: Simple overlay", (bool*)0, window_flags))
+{
+ImGui::Text(std::to_string(framerate).c_str());
+}
+ImGui::End();
 
 /* ImGui::Begin("Proprieties");
 
@@ -833,7 +837,7 @@ void GameLayer::fillColorChannel(std::span<std::string_view> colorString, int id
 
 void GameLayer::updateTriggers()
 {
-float camPos = camera.cameraPos.x - 50.f;
+float camPos = camera.cameraPos.x;
 
 int curSection = Common::sectionForPos(camPos);
 
@@ -842,6 +846,7 @@ void GameLayer::updateTriggers()
 if (i < sectionObjects.size() && i >= 0)
 {
 auto& section = sectionObjects[i];
+
 for (auto& pair : section)
 {
 GameObject* obj = pair.second;

src/GameObject.cpp

@@ -405,12 +405,9 @@ void GameObject::tryUpdateSection()
 thisSectionMap.erase(this->uniqueID);
 
 int sectionSize = GameLayer::instance->sectionObjects.size();
-while (section >= sectionSize)
-{
-std::unordered_map<int, GameObject*> map;
-GameLayer::instance->sectionObjects.push_back(map);
-sectionSize++;
-}
+if(section >= sectionSize)
+GameLayer::instance->sectionObjects.resize(section + 1);
+
 GameLayer::instance->sectionObjects[section].insert({this->uniqueID, this});
 
 this->section = section;
@@ -422,11 +419,6 @@ void GameObject::tryUpdateSection()
 
 groupMap->erase(uniqueID);
 
-if (!group->objectsInSections.contains(section))
-{
-std::unordered_map<int, GameObject*> map;
-group->objectsInSections.insert({section, map});
-}
 group->objectsInSections[section].insert({static_cast<int>(uniqueID), this});
 }
 

src/Group.h

@@ -21,6 +21,8 @@ class Group
 std::vector<EffectGameObject*> spawnTriggered;
 
 std::shared_ptr <ActionInterval> rotateAction = nullptr;
+
+bool enabled = true;
 public:
 static std::shared_ptr<Group> create();
 };

src/HSV.cpp

@@ -69,7 +69,7 @@ glm::vec4 HSV::toRGB()
 case 5:
 return { v * 255.0f, p * 255.0f, q * 255.0f, 255.f };
 default:
-break;
+return {0, 255, 0, 0};
 }
 }
 

src/PulseAction.cpp

@@ -62,8 +62,11 @@ void PulseAction::applyToSpriteIn(Sprite* spr, float fadetime)
 float r1 = static_cast<float>(to.r - (float)(to.r - channelcolor.r) * (1.f - fadetime));
 float g1 = static_cast<float>(to.g - (float)(to.g - channelcolor.g) * (1.f - fadetime));
 float b1 = static_cast<float>(to.b - (float)(to.b - channelcolor.b) * (1.f - fadetime));
-if (spr->getColor() != to)
-spr->setColor({r1, g1, b1, 255.f});
+
+glm::vec4 col = {r1, g1, b1, 255.f};
+
+if (spr->getColor() != col)
+spr->setColor(col);
 }
 
 void PulseAction::applyToSpriteOut(Sprite* spr, float fadetime)
@@ -79,8 +82,11 @@ void PulseAction::applyToSpriteOut(Sprite* spr, float fadetime)
 float r1 = static_cast<float>(to.r - (float)(to.r - channelcolor.r) * (fadetime));
 float g1 = static_cast<float>(to.g - (float)(to.g - channelcolor.g) * (fadetime));
 float b1 = static_cast<float>(to.b - (float)(to.b - channelcolor.b) * (fadetime));
-if (spr->getColor() != to)
-spr->setColor({r1, g1, b1, 255.f});
+
+glm::vec4 col = {r1, g1, b1, 255.f};
+
+if (spr->getColor() != col)
+spr->setColor(col);
 }
 
 void PulseAction::update(float time)
@@ -141,6 +147,7 @@ void PulseAction::update(float time)
 else
 GameLayer::instance->pulsedGroups.insert(target);
 
+//fade in
 if (time <= fadein)
 {
 float fadetime = time / fadein;
@@ -161,7 +168,7 @@ void PulseAction::update(float time)
 applyToSpriteIn(spr.get(), fadetime);
 }
 }
-}
+} //fade out
 else if (time >= fadein + hold)
 {
 float fadetime = (time - hold - fadein) / fadeout;
@@ -181,7 +188,7 @@ void PulseAction::update(float time)
 applyToSpriteOut(spr.get(), fadetime);
 }
 }
-}
+} //hold
 else
 {
 std::shared_ptr<Group> group = GameLayer::instance->groups[target];

src/RotateAction.cpp

@@ -55,6 +55,9 @@ void RotateAction::update(float time)
 
 rotateLast = rotateAmount;
 
+if(deltaRotation == 0)
+return;
+
 glm::mat4 transform(1.0f);
 
 if(rotateAround)

src/Sprite.cpp

@@ -11,10 +11,7 @@
 void Sprite::updateVerticesPosition(bool send)
 {
 if (currentBatcher == nullptr)
-{
-// std::cout << "No batcher!";
 return;
-}
 
 if (isDirty())
 updateTransform();
@@ -50,10 +47,7 @@ void Sprite::updateVerticesPosition(bool send)
 void Sprite::sendVertices()
 {
 if (currentBatcher == nullptr)
-{
-// std::cout << "No batcher!";
 return;
-}
 
 for (int i = 0; i < 4; ++i)
 sendVertex(i);

src/Sprite.h

@@ -18,7 +18,7 @@ class Batcher;
 class Sprite : public Transformable
 {
 private:
- glm::vec4 hsvAppliedColor;
+ glm::vec4 hsvAppliedColor = {0, 0, 255, 255};
 public:
 Vertex vertices[4];
  glm::vec2 originalPositions[4];