オプションをいくつか追加

[mmo/main.git] / client / scene / MainLoop.cpp

diff --git a/client/scene/MainLoop.cpp b/client/scene/MainLoop.cpp
index bdfaecd..c20bdd3 100644 (file)
--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -3,12 +3,16 @@
 //
 
 #include "MainLoop.hpp"
+#include "Option.hpp"
+#include "Dashboard.hpp"
 #include <vector>
 #include <algorithm>
 #include "../ResourceManager.hpp"
+#include "../WindowManager.hpp"
 #include "../Core.hpp"
 #include <shlwapi.h>
 #include "ServerChange.hpp"
+#include "../Music.hpp"
 
 namespace scene {
 MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
@@ -19,16 +23,26 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
       world_manager_(std::make_shared<WorldManager>(manager_accessor_)),
       account_manager_(manager_accessor->account_manager().lock()),
       config_manager_(manager_accessor->config_manager().lock()),
-      inputbox_(manager_accessor_),
-         minimap_(manager_accessor_),
+      window_manager_(std::make_shared<WindowManager>(manager_accessor_)),
+      inputbox_(std::make_shared<InputBox>(manager_accessor_)),
+         minimap_(std::make_shared<MiniMap>(manager_accessor)),
          snapshot_number_(0)
 {
     manager_accessor_->set_player_manager(player_manager_);
     manager_accessor_->set_world_manager(world_manager_);
+    manager_accessor_->set_window_manager(window_manager_);
 
-    inputbox_.ReloadTabs();
+    inputbox_->ReloadTabs();
+       inputbox_->Activate();
+       inputbox_->set_icon_image_handle(
+               ResourceManager::LoadCachedGraph(_T("system/images/gui/gui_icon_input.png")));
+       card_manager_->AddNativeCard("inputbox", inputbox_);
+
+       minimap_->UIPlacement(config_manager_->screen_width() - MINIMAP_MINSIZE - 12, 12);
+       minimap_->set_icon_image_handle(
+               ResourceManager::LoadCachedGraph(_T("system/images/gui/gui_icon_map.png")));
+       card_manager_->AddNativeCard("rader", minimap_);
 
-       minimap_.UIPlacement(config_manager_->screen_width() - MINIMAP_MINSIZE - 12, 12);
     player_manager_->Init();
     world_manager_->Init();    
 
@@ -37,7 +51,7 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
 
 MainLoop::~MainLoop()
 {
-    account_manager_->Save("account.xml");
+    account_manager_->Save("./user/account.xml");
 }
 
 void MainLoop::Begin()
@@ -47,47 +61,26 @@ void MainLoop::Begin()
 
 void MainLoop::Update()
 {
+       if (auto window_manager = manager_accessor_->window_manager().lock()) {
+               window_manager->Update();
+       }
     command_manager_->Update();
-
-    InputManager input;
-
-    inputbox_.ProcessInput(&input);
-    inputbox_.Update();
-
-    player_manager_->ProcessInput(&input);
     player_manager_->Update();
-    
-    card_manager_->ProcessInput(&input);
     card_manager_->Update();
-
-       minimap_.ProcessInput(&input);
-       minimap_.Update();
-
-    world_manager_->ProcessInput(&input);
     world_manager_->Update();
-
-}
-
-void MainLoop::Draw()
-{
-    world_manager_->Draw();
-    player_manager_->Draw();
-    card_manager_->Draw();
-    inputbox_.Draw();
-       minimap_.Draw();
-
-    InputManager input;
-
-       ProcessInput(&input);
+       ResourceManager::music()->Update();
 }
 
-void MainLoop::End()
+void MainLoop::ProcessInput(InputManager* input)
 {
-}
+       if (auto window_manager = manager_accessor_->window_manager().lock()) {
+               window_manager->ProcessInput(input);
+       }
+    player_manager_->ProcessInput(input);
+    card_manager_->ProcessInput(input);
+    world_manager_->ProcessInput(input);
 
-void MainLoop::ProcessInput(InputManager *input)
-{
-       if(input->GetKeyCount(InputManager::KEYBIND_SCREEN_SHOT) > 0 && !inputbox_.IsActive())
+       if(input->GetKeyCount(InputManager::KEYBIND_SCREEN_SHOT) == 1)
        {
                TCHAR tmp_str[MAX_PATH];
                _stprintf( tmp_str , _T(".\\screenshot\\ss%03d.png") , snapshot_number_ );
@@ -102,20 +95,37 @@ void MainLoop::ProcessInput(InputManager *input)
                }
                SaveDrawScreenToPNG( 0, 0, config_manager_->screen_width(), config_manager_->screen_height(),tmp_str);
                snapshot_number_++;
-               while(input->GetKeyCount(InputManager::KEYBIND_SCREEN_SHOT) > 0)
-               {
-                       input->Update();
-               }
        }
 }
 
+void MainLoop::Draw()
+{
+    world_manager_->Draw();
+    player_manager_->Draw();
+    card_manager_->Draw();
+       if (auto window_manager = manager_accessor_->window_manager().lock()) {
+               window_manager->Draw();
+       }
+}
+
+void MainLoop::End()
+{
+}
+
 BasePtr MainLoop::NextScene()
 {
+       InputManager input;
        if(world_manager_->stage()->host_change_flag())
        {
                //account_manager_->set_host(world_manager_->stage()->host_change_flag().second);
                return BasePtr(new scene::ServerChange(manager_accessor_));
-       }else{
+       } else if (input.GetKeyCount(KEY_INPUT_F1) == 1) {
+               inputbox_->Inactivate();
+               return BasePtr(new scene::Option(manager_accessor_, shared_from_this()));
+       } else if (input.GetKeyCount(KEY_INPUT_F2) == 1) {
+               inputbox_->Inactivate();
+               return BasePtr(new scene::Dashboard(manager_accessor_, shared_from_this()));
+       } else{
                return nullptr;
        }
 }