Skip to content

Fix incorrect usage of .material on the scaled mesh #423

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

Merged
JonnyOThan merged 1 commit into from
Feb 17, 2025
Merged

Fix incorrect usage of .material on the scaled mesh #423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions SCANsat/SCANcontroller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,34 +1416,46 @@ internal void LoadVisualMapTexture(CelestialBody b, mapSource s)

if (!readableScaledSpaceMaps.ContainsKey(b) || readableScaledSpaceMaps[b] == null)
{
if (scaledMesh.material.shader.name == "Terrain/Gas Giant")
if (scaledMesh.sharedMaterial.shader.name == "Terrain/Gas Giant")
{
if (scaledMesh.material.HasProperty("_DetailCloudPatternTexture"))
readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.material.GetTexture("_DetailCloudPatternTexture"), scaledMesh.material, true));
if (scaledMesh.sharedMaterial.HasProperty("_DetailCloudPatternTexture"))
readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_DetailCloudPatternTexture"), scaledMesh.sharedMaterial, true));
}
//else if (scaledMesh.material.shader.name == "Emissive Multi Ramp Sunspots")
//else if (scaledMesh.sharedMaterial.shader.name == "Emissive Multi Ramp Sunspots")
//{
// if (scaledMesh.material.HasProperty("_MainTex"))
// readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.material.GetTexture("_MainTex"), scaledMesh.material, true));
// if (scaledMesh.sharedMaterial.HasProperty("_MainTex"))
// readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_MainTex"), scaledMesh.sharedMaterial, true));
//}
else
{
if (scaledMesh.material.HasProperty("_MainTex"))
readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.material.GetTexture("_MainTex"), scaledMesh.material, true));
if (scaledMesh.sharedMaterial.HasProperty("_MainTex"))
{
readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_MainTex"), scaledMesh.sharedMaterial, true));
}
else if (scaledMesh.sharedMaterial.HasProperty("_ColorMap"))
{
readableScaledSpaceMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_ColorMap"), scaledMesh.sharedMaterial, true));
}
}
}

if (!readableScaledSpaceNormalMaps.ContainsKey(b) || readableScaledSpaceNormalMaps[b] == null)
{
if (scaledMesh.material.shader.name == "Terrain/Gas Giant")
if (scaledMesh.sharedMaterial.shader.name == "Terrain/Gas Giant")
{
if (scaledMesh.material.HasProperty("_NormalMap"))
readableScaledSpaceNormalMaps.Add(b, readableTexture(scaledMesh.material.GetTexture("_NormalMap"), scaledMesh.material, false));
if (scaledMesh.sharedMaterial.HasProperty("_NormalMap"))
readableScaledSpaceNormalMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_NormalMap"), scaledMesh.sharedMaterial, false));
}
else
{
if (scaledMesh.material.HasProperty("_BumpMap"))
readableScaledSpaceNormalMaps.Add(b, readableTexture(scaledMesh.material.GetTexture("_BumpMap"), scaledMesh.material, false));
if (scaledMesh.sharedMaterial.HasProperty("_BumpMap"))
{
readableScaledSpaceNormalMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_BumpMap"), scaledMesh.sharedMaterial, false));
}
else if (scaledMesh.sharedMaterial.HasProperty("_NormalMap"))
{
readableScaledSpaceNormalMaps.Add(b, readableTexture(scaledMesh.sharedMaterial.GetTexture("_NormalMap"), scaledMesh.sharedMaterial, false));
}
}
}

Expand Down
Loading