Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix copy file behavior: Using trimmed line to get file path in Utils.cs #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix copy file behavior: Using trimmed line to get file path in Utils.cs #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4328f
replace `line` with `trimmedLine` to do slicing
EzioHelios Dec 19, 2023
20822e9
Update Utils.cs
EzioHelios Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 16 additions & 14 deletions Obj2Tiles/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ public static IEnumerable<string> GetObjDependencies(string objPath)

foreach (var line in objFile)
{
if (!line.StartsWith("mtllib")) continue;
var trimmedLine = line.Trim();

if (!trimmedLine.StartsWith("mtllib")) continue;

var mtlPath = Path.Combine(folderName, line[7..].Trim());
dependencies.Add(line[7..].Trim());
var mtlPath = Path.Combine(folderName, trimmedLine[7..].Trim());
dependencies.Add(trimmedLine[7..].Trim());

dependencies.AddRange(GetMtlDependencies(mtlPath));
}
Expand All @@ -42,70 +44,70 @@ private static IEnumerable<string> GetMtlDependencies(string mtlPath)

if (trimmedLine.StartsWith("map_Kd"))
{
dependencies.Add(line[7..].Trim());
dependencies.Add(trimmedLine[7..].Trim());

continue;
}

if (trimmedLine.StartsWith("map_Ka"))
{
dependencies.Add(line[7..].Trim());
dependencies.Add(trimmedLine[7..].Trim());

continue;
}

if (trimmedLine.StartsWith("norm"))
{
dependencies.Add(line[5..].Trim());
dependencies.Add(trimmedLine[5..].Trim());

continue;
}

if (trimmedLine.StartsWith("map_Ks"))
{
dependencies.Add(line[7..].Trim());
dependencies.Add(trimmedLine[7..].Trim());

continue;
}

if (trimmedLine.StartsWith("map_Bump"))
{
dependencies.Add(line[8..].Trim());
dependencies.Add(trimmedLine[8..].Trim());

continue;
}

if (trimmedLine.StartsWith("map_d"))
{
dependencies.Add(line[6..].Trim());
dependencies.Add(trimmedLine[6..].Trim());

continue;
}

if (trimmedLine.StartsWith("map_Ns"))
{
dependencies.Add(line[7..].Trim());
dependencies.Add(trimmedLine[7..].Trim());

continue;
}

if (trimmedLine.StartsWith("bump"))
{
dependencies.Add(line[5..].Trim());
dependencies.Add(trimmedLine[5..].Trim());

continue;
}

if (trimmedLine.StartsWith("disp"))
{
dependencies.Add(line[5..].Trim());
dependencies.Add(trimmedLine[5..].Trim());

continue;
}

if (trimmedLine.StartsWith("decal"))
{
dependencies.Add(line[6..].Trim());
dependencies.Add(trimmedLine[6..].Trim());

continue;
}
Expand Down Expand Up @@ -170,4 +172,4 @@ public static void ConvertB3dm(string objPath, string destPath)

File.WriteAllBytes(destPath, b3dm.ToBytes());
}
}
}