UUTF-8 with BOMに統一

NoixChou · Apr 27, 2019 · 4dc0bda · 4dc0bda
1 parent c400d11
commit 4dc0bda
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 27 deletions.
diff --git a/Otoge/Game/Scenes/Title/Setting/SettingScene.cpp b/Otoge/Game/Scenes/Title/Setting/SettingScene.cpp
@@ -1,4 +1,4 @@
-#include "SettingScene.hpp"
+#include "SettingScene.hpp"
 #include "../../../../Util/Setting/SettingManager.h"
 #include "../../../../System/Config.h"
 #include "../../../../System/Input/KeyboardManager.hpp"
@@ -18,7 +18,7 @@ SettingScene::SettingScene() : Scene("SettingScene", 40.f)
     CloseButton_->SetTransparent(100.f);
     AddChildTask(std::static_pointer_cast<Task>(CloseButton_));
 
-    std::shared_ptr<Label> l_TitleLabel = std::make_shared<Label>("Ý’è", ScreenData(20.0f, 0.0f, 60.f, CloseButton_->GetScreenHeight()), DefaultScaler_);
+    std::shared_ptr<Label> l_TitleLabel = std::make_shared<Label>(u8"設定", ScreenData(20.0f, 0.0f, 60.f, CloseButton_->GetScreenHeight()), DefaultScaler_);
     l_TitleLabel->SetTextAlign(Label::TextAlignment::center | Label::TextAlignment::middle);
     l_TitleLabel->baseColor = GetColor(117, 117, 117);
     l_TitleLabel->AdjustmentFontSize_ = false;

diff --git a/Otoge/Game/Scenes/Title/Setting/SettingScene.hpp b/Otoge/Game/Scenes/Title/Setting/SettingScene.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "../../../../System/Task/Scene.hpp"
 #include "../../../../Util/Calculate/Screen/FlexibleScaler.hpp"
 #include "../../../../System/GUI/Button.hpp"

diff --git a/Otoge/Game/Scenes/Title/TitleScene.cpp b/Otoge/Game/Scenes/Title/TitleScene.cpp
@@ -1,4 +1,4 @@
-#include "TitleScene.hpp"
+#include "TitleScene.hpp"
 #include "../../../Util/Setting/SettingManager.h"
 #include "../../../System/Config.h"
 #include "../../../System/Input/KeyboardManager.hpp"
@@ -12,7 +12,7 @@
 TitleScene::TitleScene() : Scene("TitleScene")
 {
     // メニュー開閉ボタン
-    MenuOpener_ = std::make_shared<Button>("おなまえ", ScreenData(40.f, 40.f, 20.f, 20.f, true), DefaultScaler_);
+    MenuOpener_ = std::make_shared<Button>(u8"おなまえ", ScreenData(40.f, 40.f, 20.f, 20.f, true), DefaultScaler_);
     MenuOpener_->GetTextLabelInstance()->AdjustmentFontSize_ = false;
     MenuOpener_->baseColor = GetColor(179, 229, 252);
     MenuOpener_->animationColor = GetColor(3, 169, 244);

diff --git a/Otoge/Game/Scenes/Title/TitleScene.hpp b/Otoge/Game/Scenes/Title/TitleScene.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "../../../System/Task/Scene.hpp"
 #include "../../../Util/Calculate/Screen/FlexibleScaler.hpp"
 #include "../../../System/GUI/Button.hpp"

diff --git a/Otoge/Main.cpp b/Otoge/Main.cpp
@@ -54,7 +54,7 @@ void PreInitialize()
     g_SystemSettings->SetGlobal();
 
     ChangeWindowMode(!g_SystemSettings->Get<bool>(SETTINGS_FULLSCREEN).get()); // ウィンドウモード/フルスクリーン
-    SetUseCharCodeFormat(DX_CHARCODEFORMAT_UTF8);
+    SetUseCharCodeFormat(DX_CHARCODEFORMAT_UTF8); // 文字コード
     SetMainWindowText(GAME_APP_NAME " v" GAME_APP_VER); // ウィンドウのタイトル
     SetAlwaysRunFlag(TRUE); // 常に処理
     SetWaitVSyncFlag(static_cast<int>(g_SystemSettings->Get<bool>(SETTINGS_VSYNC).get())); // 垂直同期

diff --git a/Otoge/Otoge.vcxproj b/Otoge/Otoge.vcxproj
@@ -238,4 +238,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Otoge/System/Config.h b/Otoge/System/Config.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 // アプリケーション
 #define GAME_APP_NAME "おとげー" // アプリ名

diff --git a/Otoge/System/PrecompiledHeader/pch.cpp b/Otoge/System/PrecompiledHeader/pch.cpp
@@ -1 +1 @@
-////#include "pch.h"  // Forced
+////#include "pch.h"  // Forced
diff --git a/Otoge/System/PrecompiledHeader/pch.h b/Otoge/System/PrecompiledHeader/pch.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 // コンパイラ設定
 #define _CRT_SECURE_NO_WARNINGS

diff --git a/Otoge/System/Task/Task.cpp b/Otoge/System/Task/Task.cpp
@@ -1,4 +1,4 @@
-#include "Task.h"
+#include "Task.h"
 
 Task::Task(const std::string& taskName)
 {

diff --git a/Otoge/System/Task/Task.h b/Otoge/System/Task/Task.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "../../Util/Debug/Logger.h"
 #include <cstdarg>
 

diff --git a/Otoge/Util/Calculate/Animation/Easing.cpp b/Otoge/Util/Calculate/Animation/Easing.cpp
@@ -1,4 +1,4 @@
-#include "Easing.hpp"
+#include "Easing.hpp"
 
 double Easing::InQuad(double t, double totaltime, double max, double min)
 {

diff --git a/Otoge/Util/Calculate/Animation/Easing.hpp b/Otoge/Util/Calculate/Animation/Easing.hpp
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 class Easing
 {

diff --git a/Otoge/Util/Debug/Logger.cpp b/Otoge/Util/Debug/Logger.cpp
@@ -1,4 +1,4 @@
-#include "Logger.h"
+#include "Logger.h"
 
 using namespace std;
 
@@ -38,30 +38,30 @@ Logger::~Logger()
 void Logger::Log(const string& message, const string &tag)
 {
 #ifdef _DEBUG
-    printf("[%s] ", tag.c_str());
-    OutputDebugString(("[" + tag + "] ").c_str());
+    printf(u8"[%s] ", tag.c_str());
+    OutputDebugString((u8"[" + tag + "] ").c_str());
 
     if (ModuleName_ != "")
-        printf("<%s> ", ModuleName_.c_str()), OutputDebugString(("<" + ModuleName_ + "> ").c_str());
-    printf("%s", message.c_str());
+        printf(u8"<%s> ", ModuleName_.c_str()), OutputDebugString(("<" + ModuleName_ + "> ").c_str());
+    printf(u8"%s", message.c_str());
     printf("\n");
     OutputDebugString(message.c_str());
     OutputDebugString("\n");
-    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN); //‰ŠúF
+    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN); //初期色
 #endif
 }
 
 void Logger::LowLevelLog(const std::string& message, const std::string& tag)
 {
 #ifdef _DEBUG
-    printf("[%s] ", tag.c_str());
+    printf(u8"[%s] ", tag.c_str());
     OutputDebugString(("[" + tag + "] ").c_str());
 
-    printf("%s", message.c_str());
+    printf(u8"%s", message.c_str());
     printf("\n");
     OutputDebugString(message.c_str());
     OutputDebugString("\n");
-    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN); //‰ŠúF
+    SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN); //初期色
 #endif
 }
 

diff --git a/Otoge/Util/Debug/Logger.h b/Otoge/Util/Debug/Logger.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 class Logger
 {

diff --git a/Otoge/Util/Setting/SettingManager.cpp b/Otoge/Util/Setting/SettingManager.cpp
@@ -1,4 +1,4 @@
-#include "SettingManager.h"
+#include "SettingManager.h"
 
 using namespace std;
 

diff --git a/Otoge/Util/Setting/SettingManager.h b/Otoge/Util/Setting/SettingManager.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "../Debug/Logger.h"