Merge pull request #60 from AsPJT/feature-fix-location-point

GUI最適化改善（地名表示の改良、ファイル読み込み不具合の修正、OpenMP有効化）
AsPJT · Oct 21, 2023 · 2c4b88b · 2c4b88b
2 parents b86b849 + 74cff64
commit 2c4b88b
Show file tree

Hide file tree

Showing 20 changed files with 80,066 additions and 223 deletions.
diff --git a/Data/PlaceName/Balhae.tsv b/Data/PlaceName/Balhae.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 渤海國	Balhae	129.1417	44.1306	50	300	1976003	2059279	None
 渤海國	Balhae	131.5	41.5	20	50	1976003	2059279	None
 上京龍泉府	Longquan	129.1417	44.1306	1	50	1976003	2059279	None

diff --git a/Data/PlaceName/China.tsv b/Data/PlaceName/China.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 河東郡		111.2217747	35.25473631	0.1	24	0	9999999	None
 平陽郡		111.4559656	36.28217254	0.1	24	0	9999999	None
 河内郡		113.3450665	35.20637242	0.1	24	0	9999999	None

diff --git a/Data/PlaceName/Geoshape/LICENSE.txt b/Data/PlaceName/Geoshape/LICENSE.txt
diff --git a/Data/PlaceName/Geoshape/NRCT.tsv b/Data/PlaceName/Geoshape/NRCT.tsv
diff --git a/Data/PlaceName/KojikiPlaceName.tsv b/Data/PlaceName/KojikiPlaceName.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 阿岐豆野	Akizuno	135.8919167	34.37763889	0	2	1721424	1940208	JP-Kojiki
 阿岐豆野	Akizuno	135.9162778	34.35363889	0	2	1721424	1940208	JP-Kojiki
 阿耶訶	Azaka	136.4688056	34.59086111	0	2	1721424	1940208	JP-Kojiki

diff --git a/Data/PlaceName/OmoroSoshiPlaceName.tsv b/Data/PlaceName/OmoroSoshiPlaceName.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 たな	Tana	127.9866667	27.06166667	0	1	1721424	9999999	None
 たう	Tau	126.7741667	26.38138889	0	1	1721424	9999999	None
 なかち	Nakachi	126.7458333	26.3675	0	1	1721424	9999999	None

diff --git a/Data/PlaceName/PlaceName.tsv b/Data/PlaceName/PlaceName.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 州胡	Zhouhu	126.544687	33.378782	0.1	40	1721424	1894917	None
 耽羅國	Tamna	126.544687	33.378782	0.1	40	1894917	2130504	None
 濟州	Jeju	126.544687	33.378782	0.1	40	2130504	9999999	None

diff --git a/Data/PlaceName/Ryoseikoku.tsv b/Data/PlaceName/Ryoseikoku.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 唱更國	Hayahito	130.306333	31.832	1	10	1977703	1978233	None
 薩麻國	Satsuma	130.306333	31.832	1	10	1978234	1994999	None
 薩摩國	Satsuma	130.306333	31.832	1	10	1995000	9999999	None

diff --git a/Data/PlaceName/SamgukSagi.tsv b/Data/PlaceName/SamgukSagi.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 沙伐國	Sabeol	128.1388481	36.40498025	0.1	16	1721424	1912995	None
 上州	Sang	128.1388481	36.40498025	0.1	24	1912996	1972166	None
 沙伐州	Sabeol	128.1388481	36.40498025	0.1	24	1972167	1997733	None

diff --git a/Data/PlaceName/TohokuAynu.tsv b/Data/PlaceName/TohokuAynu.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 アイナイ	Ainai	141.3019444	40.43166667	1	4	1721424	9999999	None
 アイナイ	Ainai	140.3788889	40.50305556	1	4	1721424	9999999	None
 アカホナイ	Akahonai	141.6175	40.44166667	1	16	1721424	9999999	None

diff --git a/Data/PlaceName/UnifiedSilla.tsv b/Data/PlaceName/UnifiedSilla.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 悉直州	Siljik	129.165	37.45	1	24	1905691	1972166	None
 新州	Sin	127.283333	37.366667	1	24	1923223	1972166	None
 比列忽州	Biryeolhol	127.5	39.03	1	24	1924319	1972166	None

diff --git a/Data/PlaceName/WamyoRuijushoKori.tsv b/Data/PlaceName/WamyoRuijushoKori.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 膽澤郡	いさわ	141.1175	39.03944444	1	1.8	1721424	9999999	JP-WamyoRuijusho
 江刺郡	えさし	141.1905556	39.09138889	1	16	1721424	9999999	JP-WamyoRuijusho
 磐井郡	いわい	141.1194444	38.92138889	1	6	1721424	9999999	JP-WamyoRuijusho

diff --git a/Data/PlaceName/WamyoRuijushoPlaceName.tsv b/Data/PlaceName/WamyoRuijushoPlaceName.tsv
@@ -1,4 +1,4 @@
-Local language	English	Longitude	Latitude	Minimum size	Maximum size	First Julian day	Last Julian day	Source
+language_ja_jp	language_en_us	longitude	latitude	min_size	max_size	first_julian_day	last_julian_day	texture
 胆沢郡白鳥郷	Isawa Shirotori	141.1175	39.03944444	0	1	1721424	9999999	JP-WamyoRuijusho
 江刺郡大井郷	Esashi Ōi	141.1905556	39.09138889	0	1	1721424	9999999	JP-WamyoRuijusho
 磐井郡磐井郷	Iwai Iwai	141.1194444	38.92138889	0	1	1721424	9999999	JP-WamyoRuijusho

diff --git a/Library/PAX_GRAPHICA/InputFile.hpp b/Library/PAX_GRAPHICA/InputFile.hpp
@@ -34,8 +34,8 @@ namespace paxg {
 
 #ifdef PAXS_USING_DXLIB // PAXS_USING_DXLIB
         int file_handle{ 0 };
-        std::string pline{};
-        std::string pline_tmp{};
+        std::string pline0{}; // ファイル読み込み用の文字列 (char*) として扱う
+        std::string pline{}; // std::string として用いる文字列
 #else
         std::ifstream pifs{};
         std::string pline{};
@@ -62,8 +62,7 @@ namespace paxg {
 #endif // __ANDROID__
             DxLib::FileRead_set_format(file_handle, DX_CHARCODEFORMAT_UTF8); // UTF-8 を読み込む
             if (file_handle != 0) {
-                pline.resize(4096);
-                pline_tmp.resize(4096);
+                pline0.resize(4096);
             }
 #else
             pifs = std::ifstream((default_path_.size() == 0) ? str_ : default_path_ + str_); // ファイルを読み込む
@@ -72,9 +71,12 @@ namespace paxg {
         // 1 行読み込む
         bool getLine() {
 #ifdef PAXS_USING_DXLIB // PAXS_USING_DXLIB
-            const int dline = DxLib::FileRead_gets(&(pline[0]), 4096, file_handle);
-            if (dline == -1) return false;
-            if (dline == 0) return false;
+            const int dline = DxLib::FileRead_gets(&(pline0[0]), 4096, file_handle);
+            if (dline == -1 || dline == 0) {
+                pline.clear();
+                return false;
+            }
+            pline = std::string(pline0.c_str()); // std::string 型に変える
             return true;
 #else
             return static_cast<bool>(std::getline(pifs, pline));