- refactor json gamefiles and remove duplicate keys

- update CMakePresets.json
dgcor · Feb 10, 2025 · 7148a2a · 7148a2a
1 parent 461dcc7
commit 7148a2a
Show file tree

Hide file tree

Showing 36 changed files with 116 additions and 113 deletions.
diff --git a/DGEngine.core/src/Game/BaseAnimation.cpp b/DGEngine.core/src/Game/BaseAnimation.cpp
@@ -223,6 +223,6 @@ bool BaseAnimation::updateTexture(CompositeSprite& sprite, bool& absoluteOffset)
 
 bool BaseAnimation::updateTexture(CompositeSprite& sprite) const
 {
-	bool absoluteoffet;
-	return updateTexture(sprite, absoluteoffet);
+	bool absoluteOffset;
+	return updateTexture(sprite, absoluteOffset);
 }
diff --git a/DGEngine.core/src/Parser/Game/ParseGame.cpp b/DGEngine.core/src/Parser/Game/ParseGame.cpp
@@ -6,6 +6,7 @@
 #include "Parser/Utils/ParseUtils.h"
 #include "ParseSaveDir.h"
 #include "Utils/StringHash.h"
+#include "Utils/Utils.h"
 
 namespace Parser
 {
@@ -98,7 +99,8 @@ namespace Parser
 		}
 		for (const auto& it : std::ranges::subrange(elem.MemberBegin(), elem.MemberEnd()))
 		{
-			parseGameElem(game, str2int16(it.name.GetStringView()), it.value);
+			auto [name, _] = Utils::splitStringIn2(it.name.GetStringView(), '.');
+			parseGameElem(game, str2int16(name), it.value);
 		}
 	}
 }
diff --git a/DGEngine.core/src/Parser/ParseFile.cpp b/DGEngine.core/src/Parser/ParseFile.cpp
@@ -167,7 +167,8 @@ namespace Parser
 		ReplaceVars replaceVars = replaceVars_;
 		for (auto& it : std::ranges::subrange(doc.MemberBegin(), doc.MemberEnd()))
 		{
-			parseDocumentElemHelper(game, str2int16(it.name.GetStringView()),
+			auto [name, _] = Utils::splitStringIn2(it.name.GetStringView(), '.');
+			parseDocumentElemHelper(game, str2int16(name),
 				it.value, replaceVars, doc.GetAllocator());
 		}
 	}

diff --git a/DGEngine.core/src/Parser/Utils/ParseUtilsKey.h b/DGEngine.core/src/Parser/Utils/ParseUtilsKey.h
@@ -238,7 +238,7 @@ namespace Parser
 	}
 
 	sf::PrimitiveType getPrimitiveTypeKey(const rapidjson::Value& elem,
-		const std::string_view key, sf::PrimitiveType val = sf::PrimitiveType::TrianglesStrip);
+		const std::string_view key, sf::PrimitiveType val = sf::PrimitiveType::TriangleStrip);
 
 	// returns null JSON value if key doesn't exist.
 	// returns query[key] JSON value if query fails.

diff --git a/DGEngine.core/src/Parser/Utils/ParseUtilsVal.h b/DGEngine.core/src/Parser/Utils/ParseUtilsVal.h
@@ -412,7 +412,7 @@ namespace Parser
 	}
 
 	sf::PrimitiveType getPrimitiveTypeVal(const rapidjson::Value& elem,
-		sf::PrimitiveType val = sf::PrimitiveType::TrianglesStrip);
+		sf::PrimitiveType val = sf::PrimitiveType::TriangleStrip);
 
 	Number32 getMinMaxNumber32Val(const rapidjson::Value& elem);
 

diff --git a/DGEngine.core/src/Resources/TexturePacks/BitmapFontTexturePack.cpp b/DGEngine.core/src/Resources/TexturePacks/BitmapFontTexturePack.cpp
@@ -178,7 +178,7 @@ void BitmapFontTexturePack::calculateCharSizes(const sf::Image& img, int rows, i
 	{
 		charRects['\t'].width = cellW * 2;
 	}
-	else if (space > 0)
+	else if (tab > 0)
 	{
 		charRects['\t'].width = tab;
 	}

diff --git a/DGEngine.core/src/SFML/Sprite2.cpp b/DGEngine.core/src/SFML/Sprite2.cpp
@@ -138,7 +138,7 @@ void Sprite2::draw(sf::RenderTarget& target, GameShader* spriteShader,
 				}
 
 				if (updateAll == true ||
-					ignore2 != cache->outline)
+					ignore2 != cache->ignore)
 				{
 					if (cache != nullptr)
 					{

diff --git a/DGEngine.core/test/src/Parser/Utils/ParseUtilsVal.cpp b/DGEngine.core/test/src/Parser/Utils/ParseUtilsVal.cpp
@@ -1694,8 +1694,8 @@ TEST_CASE("Parser::getPrimitiveTypeVal", "Parser")
 
 	CHECK(Parser::getPrimitiveTypeVal(doc["key01"]) == sf::PrimitiveType::Points);
 	CHECK(Parser::getPrimitiveTypeVal(doc["key02"], sf::PrimitiveType::Points) == sf::PrimitiveType::Points);
-	CHECK(Parser::getPrimitiveTypeVal(doc["key03"]) == sf::PrimitiveType::TrianglesStrip);
-	CHECK(Parser::getPrimitiveTypeVal(doc["key04"]) == sf::PrimitiveType::TrianglesStrip);
+	CHECK(Parser::getPrimitiveTypeVal(doc["key03"]) == sf::PrimitiveType::TriangleStrip);
+	CHECK(Parser::getPrimitiveTypeVal(doc["key04"]) == sf::PrimitiveType::TriangleStrip);
 }
 
 // Parser::getQueryVal == JsonUtils::query

diff --git a/gamefilesc/level/loadAmateur.json b/gamefilesc/level/loadAmateur.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel.json",
-  "load": "level/levelOptionsAmateur.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel.json",
+  "load.levelOptions": "level/levelOptionsAmateur.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadAmateur1.json b/gamefilesc/level/loadAmateur1.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel1.json",
-  "load": "level/levelOptionsAmateur.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel1.json",
+  "load.levelOptions": "level/levelOptionsAmateur.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadAmateur2.json b/gamefilesc/level/loadAmateur2.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel2.json",
-  "load": "level/levelOptionsAmateur.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel2.json",
+  "load.levelOptions": "level/levelOptionsAmateur.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadArcade.json b/gamefilesc/level/loadArcade.json
@@ -1,10 +1,10 @@
 {
-  "load": "level/baseLevel2.json",
-  "load": "level/levelOptionsArcade.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json",
-  "load": "level/baseLevel1.json",
-  "load": "level/levelOptionsArcade.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel2": "level/baseLevel2.json",
+  "load.levelOptions2": "level/levelOptionsArcade.json",
+  "load.highScores2": "level/highScores.json",
+  "load.jewelClasses2": "level/jewelClasses.json",
+  "load.baseLevel1": "level/baseLevel1.json",
+  "load.levelOptions1": "level/levelOptionsArcade.json",
+  "load.highScores1": "level/highScores.json",
+  "load.jewelClasses1": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadNovice.json b/gamefilesc/level/loadNovice.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel.json",
-  "load": "level/levelOptionsNovice.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel.json",
+  "load.levelOptions": "level/levelOptionsNovice.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadNovice1.json b/gamefilesc/level/loadNovice1.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel1.json",
-  "load": "level/levelOptionsNovice.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel1.json",
+  "load.levelOptions": "level/levelOptionsNovice.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadNovice2.json b/gamefilesc/level/loadNovice2.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel2.json",
-  "load": "level/levelOptionsNovice.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel2.json",
+  "load.levelOptions": "level/levelOptionsNovice.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadPro.json b/gamefilesc/level/loadPro.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel.json",
-  "load": "level/levelOptionsPro.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel.json",
+  "load.levelOptions": "level/levelOptionsPro.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadPro1.json b/gamefilesc/level/loadPro1.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel1.json",
-  "load": "level/levelOptionsPro.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel1.json",
+  "load.levelOptions": "level/levelOptionsPro.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/level/loadPro2.json b/gamefilesc/level/loadPro2.json
@@ -1,6 +1,6 @@
 {
-  "load": "level/baseLevel2.json",
-  "load": "level/levelOptionsPro.json",
-  "load": "level/highScores.json",
-  "load": "level/jewelClasses.json"
+  "load.baseLevel": "level/baseLevel2.json",
+  "load.levelOptions": "level/levelOptionsPro.json",
+  "load.highScores": "level/highScores.json",
+  "load.jewelClasses": "level/jewelClasses.json"
 }
diff --git a/gamefilesc/main.json b/gamefilesc/main.json
@@ -10,8 +10,8 @@
     "keepAR": true,
     "stretchToFit": true,
     "smoothScreen": true,
-    "load": "settings.json",
-    "load": "res/updateSettings.json",
+    "load.settings": "settings.json",
+    "load.updateSettings": "res/updateSettings.json",
     "init": true
   },
   "action": { "name": "load", "file": "ui/loadMain.json" }

diff --git a/gamefilesc/ui/loadMain.json b/gamefilesc/ui/loadMain.json
@@ -1,12 +1,12 @@
 {
-  "load": "res/actions.json",
+  "load.actions": "res/actions.json",
   "game": {
     "icon": "res/icon.png",
     "onClose": "saveSettingsAndClose"
   },
-  "load": "res/textures.json",
-  "load": "res/fonts.json",
-  "load": "ui/gameInputEvents.json",
-  "load": "ui/inputEvents.json",
-  "load": "ui/mainMenu.json"
+  "load.textures": "res/textures.json",
+  "load.fonts": "res/fonts.json",
+  "load.gameInputEvents": "ui/gameInputEvents.json",
+  "load.inputEvents": "ui/inputEvents.json",
+  "load.mainMenu": "ui/mainMenu.json"
 }
diff --git a/gamefilesc/ui/mainMenu.json b/gamefilesc/ui/mainMenu.json
@@ -52,7 +52,7 @@
       }
     }
   ],
-  "load": "res/mainMenuTextures.json",
+  "load.textures": "res/mainMenuTextures.json",
   "replaceVars": "value",
   "image": {
     "id": "background",
@@ -63,7 +63,7 @@
     "id": "menuPanel",
     "visible": false
   },
-  "image": {
+  "image.menu": {
     "id": "menuImg",
     "panel": "menuPanel",
     "position": ["center", "|$.#scale * 128|"],
@@ -124,5 +124,5 @@
       }
     ]
   },
-  "load": "ui/mainMenuStart.json"
+  "load.start": "ui/mainMenuStart.json"
 }
diff --git a/gamefilesc/ui/menu/common.json b/gamefilesc/ui/menu/common.json
@@ -679,7 +679,7 @@
     }
   ],
   "replaceVars": "value",
-  "action": [
+  "action.2": [
     {
       "name": "action.set",
       "id": "selectBGMClotho",

diff --git a/gamefilesc/ui/menu/menuFlash.json b/gamefilesc/ui/menu/menuFlash.json
@@ -48,7 +48,7 @@
     }
   ],
   "replaceVars": "value",
-  "button": {
+  "button.background": {
     "id": "background",
     "anchor": "none",
     "texture": "options",
@@ -254,7 +254,7 @@
       "pause": true
     }
   ],
-  "action": [
+  "action.update": [
     "updateBGM",
     "updateHeight",
     "updateHeightP2",

diff --git a/gamefilesc/ui/menu/menuFlashMatch.json b/gamefilesc/ui/menu/menuFlashMatch.json
@@ -48,7 +48,7 @@
     }
   ],
   "replaceVars": "value",
-  "button": {
+  "button.background": {
     "id": "background",
     "anchor": "none",
     "texture": "options",
@@ -283,7 +283,7 @@
       "pause": true
     }
   ],
-  "action": [
+  "action.update": [
     "updateBGM",
     "updateMatch",
     "updateHeight",

diff --git a/gamefilesc/ui/menu/menuOriginal.json b/gamefilesc/ui/menu/menuOriginal.json
@@ -48,7 +48,7 @@
     }
   ],
   "replaceVars": "value",
-  "button": {
+  "button.background": {
     "id": "background",
     "anchor": "none",
     "texture": "options",
@@ -301,7 +301,7 @@
       "pause": true
     }
   ],
-  "action": [
+  "action.update": [
     "updateBGM",
     "updateTimeTrial",
     "updateLevel",

diff --git a/gamefilesc/ui/options/soundTest.json b/gamefilesc/ui/options/soundTest.json
@@ -172,5 +172,5 @@
       }
     ]
   },
-  "action": { "name": "menu.setFont", "id": "menu", "index": 8, "font": "font1White" }
+  "action.update": { "name": "menu.setFont", "id": "menu", "index": 8, "font": "font1White" }
 }
diff --git a/gamefilesc/ui/play/arcade.json b/gamefilesc/ui/play/arcade.json
@@ -176,11 +176,11 @@
       "binding": "%level2.jewels%"
     }
   ],
-  "replaceVars": false,
-  "load": "level/loadArcade.json",
-  "load": "ui/play/pause1.json",
-  "load": "ui/play/pause2.json",
-  "action": [
+  "replaceVars.disable": false,
+  "load.level": "level/loadArcade.json",
+  "load.pause1": "ui/play/pause1.json",
+  "load.pause2": "ui/play/pause2.json",
+  "action.game": [
     {
       "name": "action.set",
       "id": "newGame",

diff --git a/gamefilesc/ui/play/flash.json b/gamefilesc/ui/play/flash.json
@@ -66,10 +66,10 @@
       "horizontalAlign": "right"
     }
   ],
-  "replaceVars": false,
-  "load": "level/load.json",
-  "load": "ui/play/pause.json",
-  "action": [
+  "replaceVars.disable": false,
+  "load.level": "level/load.json",
+  "load.pause": "ui/play/pause.json",
+  "action.game": [
     {
       "replaceVars": "value",
       "name": "action.set",

diff --git a/gamefilesc/ui/play/flash2p.json b/gamefilesc/ui/play/flash2p.json
@@ -97,11 +97,11 @@
       "horizontalAlign": "right"
     }
   ],
-  "replaceVars": false,
-  "load": "level/load2.json",
-  "load": "ui/play/pause1.json",
-  "load": "ui/play/pause2.json",
-  "action": [
+  "replaceVars.disable": false,
+  "load.level": "level/load2.json",
+  "load.pause1": "ui/play/pause1.json",
+  "load.pause2": "ui/play/pause2.json",
+  "action.game": [
     {
       "replaceVars": "value",
       "name": "action.set",
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,5 +172,5 @@ @@
           }
         ]
       },
-      "action": { "name": "menu.setFont", "id": "menu", "index": 8, "font": "font1White" }
+      "action.update": { "name": "menu.setFont", "id": "menu", "index": 8, "font": "font1White" }
     }