Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-22 20:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove unused code

Browse source
This commit is contained in:
in0finite 2021-05-02 23:51:37 +02:00
parent 2fc4d58bb6
commit 2da430251c
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Assets/Scripts/Behaviours/World/StaticGeometry.cs
View file

@ -158,22 +158,11 @@ namespace SanAndreasUnity.Behaviours.World
Profiler.BeginSample ("Add mesh", this);
var nightColors = geoms.Geometry[0].RwGeometry.ExtraVertColor;
bool hasNightColors = nightColors != null && nightColors.Colors != null;
var mf = gameObject.AddComponent<MeshFilter>();
var mr = gameObject.AddComponent<MeshRenderer>();
mf.sharedMesh = geoms.Geometry[0].Mesh;
mr.sharedMaterials = geoms.Geometry[0].GetMaterials(
Instance.Object.Flags,
hasNightColors,
mat =>
{
mat.SetTexture(NoiseTexId, NoiseTex);
// if (hasNightColors)
// mat.SetColorArray(Geometry.NightColorsPropertyId, nightColors.Colors);
});
mr.sharedMaterials = geoms.Geometry[0].GetMaterials(Instance.Object.Flags, mat => mat.SetTexture(NoiseTexId, NoiseTex));
Profiler.EndSample ();

7
Assets/Scripts/Importing/Conversion/Geometry.cs
View file

@ -19,7 +19,6 @@ namespace SanAndreasUnity.Importing.Conversion
Alpha = 2,
Vehicle = 4,
OverrideAlpha = 8,
NightColors = 16,
}
public class Geometry
@ -656,7 +655,6 @@ namespace SanAndreasUnity.Importing.Conversion
public UnityEngine.Material[] GetMaterials(
ObjectFlag flags,
bool hasNightColors,
Action<UnityEngine.Material> setupMaterial)
{
var matFlags = MaterialFlags.Default | MaterialFlags.OverrideAlpha;
@ -672,11 +670,6 @@ namespace SanAndreasUnity.Importing.Conversion
matFlags |= MaterialFlags.Alpha;
}
if (hasNightColors)
{
matFlags |= MaterialFlags.NightColors;
}
return GetMaterials(matFlags, setupMaterial);
}