more logging and slightly more helpful error messages

src/ResourceLoader.cpp

@@ -16,7 +16,7 @@ bool ResourceLoader::Load(std::filesystem::path filePath, uint32_t expectedVersi
 
     if(!std::filesystem::exists(filePath))
     {
-        Log::Error("File \"%s\" does not exist.", absolutePath.Get());
+        Log::Error("Resource file \"%s\" does not exist.", absolutePath.Get());
         return false;
     }
 
@@ -36,7 +36,7 @@ bool ResourceLoader::Load(std::filesystem::path filePath, uint32_t expectedVersi
 
     if(rscHeader.Magic != rage::datResourceFileHeader::MAGIC_RSC5)
     {
-        Log::Error("File \"%s\" uses an unsupported version or is not a resource file.", absolutePath.Get());
+        Log::Error("Resource file \"%s\" uses an unsupported version or is not a resource file.", absolutePath.Get());
         return false;
     }
 

src/main.cpp

@@ -95,7 +95,6 @@ int main(int32_t argc, char** argv)
     else if(argc == 2)
     {
         ProcessParticleList(argv[1], "");
-        Log::Info("Done.");
         std::ignore = getc(stdin);
     }
 
@@ -297,6 +296,7 @@ void ProcessParticleList(std::filesystem::path filePathIn, std::filesystem::path
 
         ptxList.SaveToJson(filePathOut);
         rsc.Map->FreeAllChunks();
+        Log::Info("Done.");
     }
     //json to wpfl
     else if(filePathIn.extension() == ".json")
@@ -308,6 +308,7 @@ void ProcessParticleList(std::filesystem::path filePathIn, std::filesystem::path
         {
             RSC5Layout layout;
             layout.Save(ptxList, filePathOut, 36);
+            Log::Info("Done.");
         }
     }
 }

src/rage/grcore/Texture.cpp

@@ -74,7 +74,7 @@ void rage::grcTexturePC::LoadFromDDS(const DDS_HEADER& header, const void* pixel
         mStride = mWidth;
     else
     {
-        Log::Error("grcTexturePC::LoadFromDDS: Unsupported texture format: %d.", (uint32_t)mFormat);
+        Log::Error("Can't load texture \"%s\" because it uses an unsupported format: %d.", mName ? mName : "null", (uint32_t)mFormat);
         return;
     }
 

src/rage/rmptfx/PtxEvent.cpp

@@ -294,7 +294,6 @@ namespace rage
             break;
 
             default:
-                Log::Error("Invalid ptx domain type - %d", type);
                 return nullptr;
         }
     }
@@ -323,6 +322,10 @@ namespace rage
             mEmitterDomain = { CreateDomain(0, type) };
             if(mEmitterDomain.Get())
                 mEmitterDomain->LoadFromJson(domainObj);
+            else
+            {
+                Log::Error("ptxEventEffect \"%s\"'s EmitterDomain uses an invalid domain type - %d", mEffectName ? mEffectName : "null", type);
+            }
         }
 
         field_A4 = object["field_A4"].GetInt();

src/rage/rmptfx/PtxList.cpp

@@ -24,7 +24,7 @@ namespace rage
             rapidjson::Document document;
             if(document.Parse(fileData.data()).HasParseError())
             {
-                Log::Error("Error parsing \"%s\". %d", filePath.string().c_str(), (uint32_t)document.GetParseError());
+                Log::Error("Error parsing \"%s\". Code: %d. Offset: %d", filePath.string().c_str(), (uint32_t)document.GetParseError(), document.GetErrorOffset());
                 return {};
             }
 

src/rage/rmptfx/PtxList.h

@@ -68,6 +68,8 @@ namespace rage
 
             Log::Info("Saving effect rules...");
             mEffectRules.AddToLayout(layout, depth);
+
+            Log::Info("Saving resource...");
         }
 
         void SerializePtrs(RSC5Layout& layout, datResource& rsc, uint32_t depth)

src/rage/rmptfx/PtxRule.cpp

@@ -30,7 +30,7 @@ namespace rage
         }
         else
         {
-            Log::Error("Invalid ptxRule type - %s", mClassName);
+            Log::Error("ptxRule \"%s\" uses an invalid type - %s", mName ? mName : "null", mClassName);
         }
     }
 
@@ -51,7 +51,7 @@ namespace rage
         }
         else
         {
-            Log::Error("Invalid ptxRule type - %s", mClassName);
+            Log::Error("ptxRule \"%s\" uses an invalid type - %s", mName ? mName : "null", mClassName);
         }
     }
 
@@ -67,7 +67,7 @@ namespace rage
         }
         else
         {
-            Log::Error("Invalid ptxRule type - %s", mClassName);
+            Log::Error("ptxRule \"%s\" uses an invalid type - %s", mName ? mName : "null", mClassName);
         }
     }
 

src/rage/rmptfx/RmPtfxShader.cpp

@@ -96,7 +96,8 @@ namespace rage
                     break;
 
                     default:
-                        Log::Error("Invalid rmptfx shader var type - %d", (uint32_t)varType);
+                        Log::Error("Shader variable \"%s\" in shader \"%s\" uses an invalid type - %d", 
+                                    varValue.HasMember("Name") ? varValue["Name"].GetString() : "null", mName ? mName : "null", (uint32_t)varType);
                 }
 
                 auto varObject = varValue.GetObject();

src/rage/rmptfx/RmPtfxShaderVar.cpp

@@ -39,7 +39,7 @@ namespace rage
             break;
 
             default:
-                Log::Error("Invalid rmptfx shader var type - %d", mType);
+                Log::Error("Shader variable \"%s\" uses an invalid type - %d", mName ? mName : "null", mType);
         }
     }
 
@@ -108,7 +108,7 @@ namespace rage
             break;
 
             default:
-                Log::Error("Invalid rmptfx shader var type - %d", mType);
+                Log::Error("Shader variable \"%s\" uses an invalid type - %d", mName ? mName : "null", mType);
                 return 0;
         }
     }