GUIのフォントサイズ調整を軽量化

.gitignore

@@ -142,49 +142,6 @@
 /DxLib/libbulletcollision_vs2012_x64_d.lib
 /DxLib/libbulletcollision_vs2012_x64.lib
 
-/DxLib/DxUseCLib_vs2013_x86_ItrDbgLv0_d.lib
-/DxLib/DxUseCLib_vs2013_x86_d.lib
-/DxLib/DxUseCLib_vs2013_x86.lib
-/DxLib/DxUseCLib_vs2013_x64_ItrDbgLv0_d.lib
-/DxLib/DxUseCLib_vs2013_x64_d.lib
-/DxLib/DxUseCLib_vs2013_x64.lib
-/DxLib/DxUseCLib_vs2012_x86_ItrDbgLv0_d.lib
-/DxLib/DxUseCLib_vs2012_x86_d.lib
-/DxLib/DxUseCLib_vs2012_x86.lib
-/DxLib/DxUseCLib_vs2012_x64_ItrDbgLv0_d.lib
-/DxLib/DxUseCLib_vs2012_x64_d.lib
-/DxLib/DxUseCLib_vs2012_x64.lib
-
-/DxLib/DxUseCLibW_vs2013_x86_ItrDbgLv0_d.lib
-/DxLib/DxUseCLibW_vs2013_x86_d.lib
-/DxLib/DxUseCLibW_vs2013_x86.lib
-/DxLib/DxUseCLibW_vs2013_x64_ItrDbgLv0_d.lib
-/DxLib/DxUseCLibW_vs2013_x64_d.lib
-/DxLib/DxUseCLibW_vs2013_x64.lib
-/DxLib/DxUseCLibW_vs2012_x86_ItrDbgLv0_d.lib
-/DxLib/DxUseCLibW_vs2012_x86_d.lib
-/DxLib/DxUseCLibW_vs2012_x86.lib
-/DxLib/DxUseCLibW_vs2012_x64_ItrDbgLv0_d.lib
-/DxLib/DxUseCLibW_vs2012_x64_d.lib
-/DxLib/DxUseCLibW_vs2012_x64.lib
-
-/DxLib/DxLib_vs2012_x86_d.lib
-/DxLib/DxLib_vs2012_x86.lib
-/DxLib/DxLib_vs2012_x64_d.lib
-/DxLib/DxLib_vs2012_x64.lib
-
-/DxLib/DxLibW_vs2012_x86_d.lib
-/DxLib/DxLibW_vs2012_x86.lib
-/DxLib/DxLibW_vs2012_x64_d.lib
-/DxLib/DxLibW_vs2012_x64.lib
-/DxLib/DxLibW_d.lib
-/DxLib/DxLibW.lib
-
-/DxLib/DxDrawFunc_vs2012_x86_d.lib
-/DxLib/DxDrawFunc_vs2012_x86.lib
-/DxLib/DxDrawFunc_vs2012_x64_d.lib
-/DxLib/DxDrawFunc_vs2012_x64.lib
-
 /DxLib/celt_vs2013_x86_d.lib
 /DxLib/celt_vs2013_x86.lib
 /DxLib/celt_vs2013_x64_d.lib

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "EventSystem"]
+	path = EventSystem
+	url = https://github.com/NoixChou/EventSystem.git

Otoge/Game/Scenes/Title/TitleScene.cpp

@@ -25,6 +25,8 @@ TitleScene::TitleScene() : Scene("TitleScene")
     MenuOpener_->SetPriority(10.f);
     AddChildTask(std::static_pointer_cast<Task>(MenuOpener_));
 
+    MenuOpener_->testEvent += events::EventHandler<bool, events::Event&>(this, &TitleScene::TestHandler);
+
     //メニュー項目ボタン
     auto l_GroupScreen = ScreenData(20.f, 43.f, 60.f, 14.f);
     MenuGroup_ = std::make_shared<Scene>("MenuGroup", l_GroupScreen, DefaultScaler_);
@@ -203,4 +205,10 @@ void TitleScene::Draw()
             engine::CastToInt(fixed.posY),
             engine::CastToInt(fixed.width),
             engine::CastToInt(fixed.height), color_preset::BLACK, TRUE);
-}
+}
+
+bool TitleScene::TestHandler(events::Event& e) const
+{
+    Logger_->Warn("Called Event: " + e.name);
+    return true;
+}

Otoge/Game/Scenes/Title/TitleScene.hpp

@@ -1,9 +1,10 @@
 #pragma once
+#include "EventSystem/Include/EventSystem.hpp"
 #include "../../../System/Task/Scene.hpp"
 #include "../../../Util/Calculate/Screen/FlexibleScaler.hpp"
 #include "../../../System/GUI/Button.hpp"
 
-class TitleScene : public Scene
+class TitleScene : public Scene, events::ManagedEventListener
 {
 private:
     bool IsOpened_ = false;
@@ -30,4 +31,6 @@ class TitleScene : public Scene
 
     void SceneUpdate(float deltaTime) override;
     void Draw() override;
+
+    bool TestHandler(events::Event& e) const;
 };

Otoge/Otoge.vcxproj

@@ -87,24 +87,24 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)</OutDir>
+    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)</OutDir>
+    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)</OutDir>
+    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)</OutDir>
+    <OutDir>$(SolutionDir)Bin\$(Configuration)\$(PlatformTarget)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../DxLib; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../DxLib; ../EventSystem; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -128,7 +128,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../DxLib;$(BOOST_DIR);System/PrecompiledHeader</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../DxLib; ../EventSystem; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -154,7 +154,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../DxLib; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../DxLib; ../EventSystem; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -184,7 +184,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../DxLib; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../DxLib; ../EventSystem; $(BOOST_DIR) ;System/PrecompiledHeader</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>

Otoge/System/GUI/DropdownList.cpp

@@ -156,13 +156,11 @@ void DropdownList<V>::GUIUpdate(float deltaTime)
     {
         AddPanel();
         InvertOpening();
-        Logger_->Warn("ボタンクリックで切り替え");
     }
     else
     {
         if (MouseManager::GetInstance()->IsDownButton(MOUSE_INPUT_LEFT) && (!Panel_->IsOnMouse() && !IsOnMouse()) && IsListOpened_)
         {
-            Logger_->Warn("範囲外クリックで閉じる");
             CloseList();
         }
     }

Otoge/System/GUI/GUI.cpp

@@ -8,6 +8,7 @@
 #include "../../Util/Window/DxSettings.hpp"
 #include "../../Util/Encoding/CharacterType.hpp"
 #include "../../Util/Encoding/EncodingConverter.h"
+
 int GUI::GlobalGUICount_ = 0;
 int GUI::JapaneseFontCount_ = 0;
 char* GUI::JapaneseFonts_ = nullptr;
@@ -56,6 +57,13 @@ void GUI::SceneUpdate(float deltaTime)
     {
         AdjustFont();
     }
+    if(IsClickedMouse())
+    {
+        events::Event e;
+        e.name = "testClickEvent";
+        testEvent(e);
+    }
+
     GUIUpdate(deltaTime);
     IsChangedLabel_ = false;
 }
@@ -77,12 +85,17 @@ std::string GUI::GetLabel() const
 
 void GUI::AdjustFont()
 {
-    //if (((FontStringCalculator::GetStringWidth(FontHandle_, Label_) > GetRawScreenWidth()) &&
-    //    (FontStringCalculator::GetStringHeight(FontHandle_) > GetRawScreenHeight())) ||
-    //    (engine::CompareTolerance(FontStringCalculator::GetStringWidth(FontHandle_, Label_), GetRawScreenWidth(), 0.01f) != 0))
-    //ChangeFontSize(engine::CastToInt(GetRawScreenHeight()));
+    if (!IsFontSizeInit_)
     {
         ChangeFontSize(engine::CastToInt(GetRawScreenHeight()));
+        IsFontSizeInit_ = true;
+    }
+    //ChangeFontSize(engine::CastToInt(GetRawScreenHeight()));
+
+    if (((FontStringCalculator::GetStringWidth(FontHandle_, Label_) > GetRawScreenWidth()) &&
+        (FontStringCalculator::GetStringHeight(FontHandle_) > GetRawScreenHeight())) ||
+        (engine::CompareTolerance(FontStringCalculator::GetStringWidth(FontHandle_, Label_), GetRawScreenWidth(), 0.01f) != 0))
+    {
 
         while (FontStringCalculator::GetStringWidth(FontHandle_, Label_) > GetRawScreenWidth())
         {

Otoge/System/GUI/GUI.hpp

@@ -2,6 +2,8 @@
 #include "../Task/Scene.hpp"
 #include "../../Util/Calculate/ScreenData.h"
 
+#include "EventSystem/Include/EventSystem.hpp"
+
 class GUI : public Scene
 {
 private:
@@ -11,10 +13,12 @@ class GUI : public Scene
 protected:
     std::string Label_;
     bool IsChangedLabel_ = false;
+    bool IsFontSizeInit_ = false;
     bool IsUseFont_ = false;
     int FontHandle_ = -1;
 public:
-    bool adjustmentFontSize = true;
+    events::Delegate<bool, events::Event&> testEvent;
+    bool adjustmentFontSize = false;
     unsigned baseColor;
     GUI(const std::string& guiName, const ScreenData& layoutScreen,
         std::shared_ptr<FlexibleScaler> parentScaler = nullptr, bool isUseFont = false);

Otoge/Util/Calculate/Screen/FlexibleScaler.cpp

@@ -23,7 +23,7 @@ FlexibleScaler::~FlexibleScaler()
     auto result = std::find(Scalers_.begin(), Scalers_.end(), this);
     if(result == Scalers_.end())
     {
-        Logger::LowLevelLog("Broken scaler list!!!", "CRITICAL");
+        Logger::LowLevelLog("Broken scaler list!", "CRITICAL");
     }
     else
     {
@@ -44,6 +44,7 @@ void FlexibleScaler::ApplyWindowSizeChanges()
         s->SetScreenWidth(s->CalculateWidth(GlobalInstance_->CalculatePositionRateX(s->GetScreenWidth())));
         s->SetScreenHeight(s->CalculateHeight(GlobalInstance_->CalculatePositionRateY(s->GetScreenHeight())));
     }
+    Logger::LowLevelLog("Completed SizeChange", "FlexScaler");
 }
 
 std::shared_ptr<FlexibleScaler> FlexibleScaler::GetWindowBasedInstance()

Otoge/Util/Debug/DebugScene.cpp

@@ -30,13 +30,14 @@ DebugScene::DebugScene() : Scene("DebugScene")
         FpsLabel_->baseColor = color_preset::LEAF_GREEN;
         FpsLabel_->textAlign = Label::TextAlignment::middle | Label::TextAlignment::right;
         FpsLabel_->ChangeFontThickness(8);
+        FpsLabel_->adjustmentFontSize = true;
         l_FpsPanel->AddChildTask(std::static_pointer_cast<Task>(FpsLabel_));
         FpsDescLabel_ = std::make_shared<Label>("fps", ScreenData(70.f, 0.f, 30.f, 100.f),
                                                 l_FpsPanel->GetDefaultScaler());
         FpsDescLabel_->baseColor = color_preset::LEAF_GREEN;
         FpsDescLabel_->textAlign = Label::TextAlignment::bottom | Label::TextAlignment::center;
         FpsDescLabel_->ChangeFontThickness(2);
-        FpsDescLabel_->adjustmentFontSize = false;
+        FpsDescLabel_->adjustmentFontSize = true;
         FpsDescLabel_->ChangeFontSize(static_cast<int>(l_FpsPanel->GetDefaultScaler()->CalculateHeight(70.f)));
         l_FpsPanel->AddChildTask(std::static_pointer_cast<Task>(FpsDescLabel_));
     }
@@ -62,17 +63,19 @@ DebugScene::DebugScene() : Scene("DebugScene")
         DeltaTimeLabel_->baseColor = color_preset::LEMON_YELLOW;
         DeltaTimeLabel_->textAlign = Label::TextAlignment::middle | Label::TextAlignment::right;
         DeltaTimeLabel_->ChangeFontThickness(6);
+        DeltaTimeLabel_->adjustmentFontSize = true;
         l_DeltaTimePanel->AddChildTask(std::static_pointer_cast<Task>(DeltaTimeLabel_));
         DeltaTimeDescLabel_ = std::make_shared<Label>(" ms", ScreenData(70.f, 0.f, 30.f, 100.f),
                                                       l_DeltaTimePanel->GetDefaultScaler());
         DeltaTimeDescLabel_->baseColor = color_preset::LEMON_YELLOW;
         DeltaTimeDescLabel_->textAlign = Label::TextAlignment::bottom | Label::TextAlignment::center;
         DeltaTimeDescLabel_->ChangeFontThickness(6);
-        DeltaTimeDescLabel_->adjustmentFontSize = false;
+        DeltaTimeDescLabel_->adjustmentFontSize = true;
         DeltaTimeDescLabel_->ChangeFontSize(
             static_cast<int>(l_DeltaTimePanel->GetDefaultScaler()->CalculateHeight(80.f)));
         l_DeltaTimePanel->AddChildTask(std::static_pointer_cast<Task>(DeltaTimeDescLabel_));
     }
+
     SetTransparent(80.f);
     SetPriority(100.f);
 }

Otoge/Util/Debug/DebugScene.hpp

@@ -1,14 +1,17 @@
 #pragma once
+#include "EventSystem/Include/EventSystem.hpp"
 #include "../../System/Task/Scene.hpp"
 #include "../../System/GUI/Label.hpp"
+#include "../../System/GUI/Button.hpp"
 
-class DebugScene : public Scene
+class DebugScene : public Scene, public events::ManagedEventListener
 {
 private:
     std::shared_ptr<Label> FpsLabel_;
     std::shared_ptr<Label> FpsDescLabel_;
     std::shared_ptr<Label> DeltaTimeLabel_;
     std::shared_ptr<Label> DeltaTimeDescLabel_;
+
 public:
     DebugScene();
     ~DebugScene();

Otoge/Util/Debug/Logger.h

@@ -1,6 +1,7 @@
 #pragma once
+#include <EventSystem/Include/EventSystem.hpp>
 
-class Logger
+class Logger : public events::ManagedEventListener
 {
 private:
     std::string ModuleName_;