max/Nerfed
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

- Fixed bug in builder when no content files exist

Browse Source
This commit is contained in:
robert 2024-07-12 23:08:52 +02:00
parent dd3bbf1d5b
commit d45f7c3b8c
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Nerfed.Builder/Builder/Builder.cs
View File

@ -37,65 +37,69 @@ public void Run(BuildArgs args)
CollectAssetFiles(absContentPath, absContentPath, ref contentFiles); CollectAssetFiles(absContentPath, absContentPath, ref contentFiles);
} }
string importPath = $"{args.ProjectPath}/{PathUtil.ImportFolderName}"; if (contentFiles.Count > 0)
ParallelOptions parallelOptions = new ParallelOptions
{ {
MaxDegreeOfParallelism = contentFiles.Count string importPath = $"{args.ProjectPath}/{PathUtil.ImportFolderName}";
};
Parallel.ForEach(contentFiles, parallelOptions, relativeFile => ParallelOptions parallelOptions = new ParallelOptions
{
try
{ {
string inFile = $"{args.ProjectPath}/{PathUtil.ContentFolderName}/{relativeFile}"; MaxDegreeOfParallelism = contentFiles.Count
};
if (!File.Exists(inFile)) Parallel.ForEach(contentFiles, parallelOptions, relativeFile =>
{
Console.Error.WriteLine($"Asset file '{relativeFile}' not found");
return;
}
string outFile = $"{importPath}/{relativeFile}{PathUtil.ImportedFileExtension}";
FileInfo inFileInfo = new FileInfo(inFile);
FileInfo outFileInfo = new FileInfo(outFile);
if (!FileUtil.IsNewer(inFileInfo, outFileInfo))
{
// File has not changed since last build, no need to build this one.
return;
}
string outDir = Path.GetDirectoryName(outFile);
if (!Directory.Exists(outDir))
{
Directory.CreateDirectory(outDir);
}
string ext = Path.GetExtension(inFile).ToLower();
if (importers.TryGetValue(ext, out IImporter importer))
{
importer.Import(inFile, outFile);
}
else
{
rawFileImporter.Import(inFile, outFile);
}
Console.WriteLine(relativeFile);
}
catch (Exception e)
{ {
Console.Error.WriteLine($"Import error on asset '{relativeFile}': {e.Message}"); try
} {
}); string inFile = $"{args.ProjectPath}/{PathUtil.ContentFolderName}/{relativeFile}";
if (!File.Exists(inFile))
{
Console.Error.WriteLine($"Asset file '{relativeFile}' not found");
return;
}
string outFile = $"{importPath}/{relativeFile}{PathUtil.ImportedFileExtension}";
FileInfo inFileInfo = new FileInfo(inFile);
FileInfo outFileInfo = new FileInfo(outFile);
if (!FileUtil.IsNewer(inFileInfo, outFileInfo))
{
// File has not changed since last build, no need to build this one.
return;
}
string outDir = Path.GetDirectoryName(outFile);
if (!Directory.Exists(outDir))
{
Directory.CreateDirectory(outDir);
}
string ext = Path.GetExtension(inFile).ToLower();
if (importers.TryGetValue(ext, out IImporter importer))
{
importer.Import(inFile, outFile);
}
else
{
rawFileImporter.Import(inFile, outFile);
}
Console.WriteLine(relativeFile);
}
catch (Exception e)
{
Console.Error.WriteLine($"Import error on asset '{relativeFile}': {e.Message}");
}
});
}
Console.WriteLine($"Build content completed in {stopwatch.Elapsed.TotalSeconds:F2} seconds"); Console.WriteLine($"Build content completed in {stopwatch.Elapsed.TotalSeconds:F2} seconds");
} }
private void CopyLibs(string projectPath) private void CopyLibs(string projectPath)
{ {
string libDir = $"{Directory.GetCurrentDirectory()}/../../Native/"; string libDir = $"{AppDomain.CurrentDomain.BaseDirectory}/../../Native/";
if (OperatingSystem.IsWindows()) if (OperatingSystem.IsWindows())
{ {
libDir += "x64"; libDir += "x64";

4
Nerfed.Editor/Nerfed.Editor.csproj
View File

@ -27,4 +27,8 @@
</ItemGroup> </ItemGroup>
<Import Project=".\CopyLibs.targets"/> <Import Project=".\CopyLibs.targets"/>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="&quot;$(ProjectDir)../Tools/Nerfed.Builder/Nerfed.Builder&quot; -build -projectPath $(ProjectDir) -platform Desktop" />
</Target>
</Project> </Project>