Misc Clean Up

Yuria-Shikibe · Jun 11, 2024 · e8ddaf2 · e8ddaf2
1 parent c43fc8e
commit e8ddaf2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/arc-impl/Core.cpp b/src/arc-impl/Core.cpp
@@ -35,7 +35,7 @@ void Core::initFileSystem() {
 #if defined(ASSETS_DIR)
 	rootFileTree = OS::FileTree(ASSETS_DIR);
 #else
-	const auto dir = Core::platform->getProcessFileDir();
+	const auto dir = Core::platform->getCurrentParentDir();
 
 	std::cout << "Targeted Resource Root:" << dir.absolutePath() << std::endl;
 

diff --git a/src/arc/asset/LoaderRenderer.cppm b/src/arc/asset/LoaderRenderer.cppm
@@ -67,7 +67,7 @@ export namespace Assets {
 		void update(){
 			if(!loader)return;
 			if(!loader->isFinished()) {
-				Font::defGlyphParser->parseWith(loadTasks, R"(loader->getCurrentProgress("$<alp#[0.3]>$<scl#[1.5]>", ">> ")");
+				Font::defGlyphParser->parseWith(loadTasks, R"($<alp#[0.3]>$<scl#[1.5]>Loading...)");
 				lastProgress = Math::lerp(lastProgress, loader->getCurrentProgress(), 0.075f);
 			}else {
 				Font::defGlyphParser->parseWith(loadTasks, "$<alp#[0.3]>$<scl#[1.8]>LOAD DONE");

diff --git a/src/arc/asset/load/AssetsLoadCore.cppm b/src/arc/asset/load/AssetsLoadCore.cppm
@@ -258,6 +258,7 @@ namespace Assets::Load{
 
 	void LoadManager::afterArrival() noexcept{
 		if(std::to_underlying(currentPhase) < MaxPhaseCount){
+			//TODO move this to other place
 			std::println("[{}]: Phase {} Reached | {:.1f}% Completed.", taskName, std::to_underlying(currentPhase), calCurrentProgress() * 100.f);
 			std::cout.flush();
 			for (const auto task : tasks | std::views::keys){

diff --git a/src/arc/asset/load/TexturePacker.cppm b/src/arc/asset/load/TexturePacker.cppm
@@ -266,7 +266,7 @@ namespace Assets::Load{
 			ext::json::JsonSrlContBase_string_map<PackData, true>::write(pageJsonValue.asObject()[ext::json::keys::Value], fragments);
 
 			std::ofstream stream{getDataFile().getPath()};
-			stream << pageJsonValue;
+			std::print(stream, "{:nf0}", pageJsonValue);
 		}
 
 		//TODO load by cache
@@ -339,11 +339,16 @@ namespace Assets::Load{
 						pageData.allPages = &pagesToPack;
 					}
 
+					progress = .1f;
+
 					break;
 				case Phase::pull:
 					for (auto& pageData : pagesToPack | std::views::values){
 						pageData.loadPulledData();
 					}
+
+					progress = .3f;
+
 					break;
 				case Phase::load:{
 					loadPages();
@@ -352,6 +357,8 @@ namespace Assets::Load{
 						pageData.applyTextureToRegion();
 					}
 
+					progress = .5f;
+
 					break;
 				}
 				case Phase::post_load:{
@@ -362,7 +369,11 @@ namespace Assets::Load{
 					}
 
 					try{
-						std::ranges::for_each(cacheTasks, &std::future<void>::get);
+						for (std::future<void>& cacheTask : cacheTasks){
+							cacheTask.get();
+
+							progress += .5f / static_cast<float>(cacheTasks.size());
+						}
 					}catch(...){
 						handler.throwException(std::current_exception());
 					}

diff --git a/src/ext/Json.cppm b/src/ext/Json.cppm
@@ -619,9 +619,8 @@ namespace ext::json{
 
 		std::unreachable();
 	}
-}
 
-export namespace ext::json{
+	export
 	[[nodiscard]] JsonValue parse(const std::string_view view){
 		return parseJsonFromString(view);
 	}