From 1b8f7639693602920f653142f5fc7e337d50ee70 Mon Sep 17 00:00:00 2001 From: "Nick J. Connors" Date: Sun, 19 Dec 2021 10:16:24 -0500 Subject: [PATCH] LocalPosition bug fix --- NewHorizons/Atmosphere/AirBuilder.cs | 1 + NewHorizons/Atmosphere/AtmosphereBuilder.cs | 3 +- NewHorizons/Atmosphere/CloudsBuilder.cs | 1 + NewHorizons/Atmosphere/EffectsBuilder.cs | 1 + NewHorizons/Atmosphere/FogBuilder.cs | 2 ++ NewHorizons/Atmosphere/SunOverrideBuilder.cs | 1 + NewHorizons/Atmosphere/VolumesBuilder.cs | 1 + NewHorizons/Body/AsteroidBeltBuilder.cs | 2 +- NewHorizons/Body/GeometryBuilder.cs | 37 +------------------- NewHorizons/Body/HeightMapBuilder.cs | 20 +---------- NewHorizons/Body/ProcGenBuilder.cs | 1 + NewHorizons/Body/WaterBuilder.cs | 1 + NewHorizons/General/DetectorBuilder.cs | 1 + NewHorizons/General/GravityBuilder.cs | 1 + NewHorizons/General/OrbitlineBuilder.cs | 1 + NewHorizons/General/RFVolumeBuilder.cs | 1 + NewHorizons/General/SectorBuilder.cs | 1 + NewHorizons/Main.cs | 4 +-- 18 files changed, 20 insertions(+), 60 deletions(-) diff --git a/NewHorizons/Atmosphere/AirBuilder.cs b/NewHorizons/Atmosphere/AirBuilder.cs index 414862f7..dda40bfa 100644 --- a/NewHorizons/Atmosphere/AirBuilder.cs +++ b/NewHorizons/Atmosphere/AirBuilder.cs @@ -59,6 +59,7 @@ namespace NewHorizons.Atmosphere airGO.AddComponent(); } + airGO.transform.localPosition = Vector3.zero; airGO.SetActive(true); } } diff --git a/NewHorizons/Atmosphere/AtmosphereBuilder.cs b/NewHorizons/Atmosphere/AtmosphereBuilder.cs index a5c878d8..2bf896ac 100644 --- a/NewHorizons/Atmosphere/AtmosphereBuilder.cs +++ b/NewHorizons/Atmosphere/AtmosphereBuilder.cs @@ -12,7 +12,7 @@ namespace NewHorizons.Atmosphere atmoGO.SetActive(false); atmoGO.transform.parent = body.transform; - if(atmosphereModule.hasAtmosphere) + if (atmosphereModule.hasAtmosphere) { var mat = GameObject.Find("TimberHearth_Body/Atmosphere_TH/AtmoSphere/Atmosphere_LOD0").GetComponent().material; @@ -76,6 +76,7 @@ namespace NewHorizons.Atmosphere */ } + atmoGO.transform.localPosition = Vector3.zero; atmoGO.SetActive(true); } } diff --git a/NewHorizons/Atmosphere/CloudsBuilder.cs b/NewHorizons/Atmosphere/CloudsBuilder.cs index 4a5953c1..850016b2 100644 --- a/NewHorizons/Atmosphere/CloudsBuilder.cs +++ b/NewHorizons/Atmosphere/CloudsBuilder.cs @@ -112,6 +112,7 @@ namespace NewHorizons.Atmosphere // Fix the rotations once the rest is done cloudsMainGO.transform.localRotation = Quaternion.Euler(0, 0, 0); + cloudsMainGO.transform.localPosition = Vector3.zero; cloudsTopGO.SetActive(true); cloudsBottomGO.SetActive(true); diff --git a/NewHorizons/Atmosphere/EffectsBuilder.cs b/NewHorizons/Atmosphere/EffectsBuilder.cs index 36a6563e..14310bfa 100644 --- a/NewHorizons/Atmosphere/EffectsBuilder.cs +++ b/NewHorizons/Atmosphere/EffectsBuilder.cs @@ -50,6 +50,7 @@ namespace NewHorizons.Atmosphere snowGO.SetActive(true); } + effectsGO.transform.localPosition = Vector3.zero; effectsGO.SetActive(true); } } diff --git a/NewHorizons/Atmosphere/FogBuilder.cs b/NewHorizons/Atmosphere/FogBuilder.cs index df7faa7f..8665413f 100644 --- a/NewHorizons/Atmosphere/FogBuilder.cs +++ b/NewHorizons/Atmosphere/FogBuilder.cs @@ -64,6 +64,8 @@ namespace NewHorizons.Atmosphere lodFogSectorProxy.SetSector(sector); */ + fogGO.transform.localPosition = Vector3.zero; + lodFogGO.transform.localPosition = Vector3.zero; fogGO.SetActive(true); lodFogGO.SetActive(true); } diff --git a/NewHorizons/Atmosphere/SunOverrideBuilder.cs b/NewHorizons/Atmosphere/SunOverrideBuilder.cs index 073c609f..6419aa6b 100644 --- a/NewHorizons/Atmosphere/SunOverrideBuilder.cs +++ b/NewHorizons/Atmosphere/SunOverrideBuilder.cs @@ -20,6 +20,7 @@ namespace NewHorizons.Atmosphere GDSOV.SetValue("_waterOuterRadius", surfaceSize); GDSOV.SetValue("_waterInnerRadius", 0f); + overrideGO.transform.localPosition = Vector3.zero; overrideGO.SetActive(true); } } diff --git a/NewHorizons/Atmosphere/VolumesBuilder.cs b/NewHorizons/Atmosphere/VolumesBuilder.cs index 96cda341..569d8b14 100644 --- a/NewHorizons/Atmosphere/VolumesBuilder.cs +++ b/NewHorizons/Atmosphere/VolumesBuilder.cs @@ -36,6 +36,7 @@ namespace NewHorizons.Atmosphere ER.SetValue("_material", GameObject.Find("RulesetVolumes_GD").GetComponent().GetValue("_material")); ER.SetValue("_cloudMaterial", GameObject.Find("RulesetVolumes_GD").GetComponent().GetValue("_cloudMaterial")); + volumesGO.transform.localPosition = Vector3.zero; rulesetGO.SetActive(true); volumesGO.SetActive(true); } diff --git a/NewHorizons/Body/AsteroidBeltBuilder.cs b/NewHorizons/Body/AsteroidBeltBuilder.cs index 1ce09aac..b3779a7e 100644 --- a/NewHorizons/Body/AsteroidBeltBuilder.cs +++ b/NewHorizons/Body/AsteroidBeltBuilder.cs @@ -18,7 +18,7 @@ namespace NewHorizons.Body var minSize = 20; var maxSize = 50; int count = (int)(2f * Mathf.PI * belt.InnerRadius / (10f * maxSize)); - if (count > 400) count = 400; + if (count > 200) count = 200; Logger.Log($"Making {count} asteroids around {bodyName}"); diff --git a/NewHorizons/Body/GeometryBuilder.cs b/NewHorizons/Body/GeometryBuilder.cs index a5c38ad9..3e25a7dd 100644 --- a/NewHorizons/Body/GeometryBuilder.cs +++ b/NewHorizons/Body/GeometryBuilder.cs @@ -10,45 +10,10 @@ namespace NewHorizons.Body GameObject groundGO = GameObject.CreatePrimitive(PrimitiveType.Sphere); groundGO.transform.parent = body.transform; groundGO.transform.localScale = new Vector3(groundScale, groundScale, groundScale); + groundGO.transform.localPosition = Vector3.zero; groundGO.GetComponent().mesh = GameObject.Find("CloudsTopLayer_GD").GetComponent().mesh; groundGO.GetComponent().radius = 1f; groundGO.SetActive(true); - - /* - GameObject sphere = new GameObject(); - Debug.LogError("1"); - sphere.SetActive(false); - Debug.LogError("2"); - MeshFilter mf = sphere.AddComponent(); - Debug.LogError("3"); - mf.mesh = mesh; - Debug.LogError("4"); - MeshRenderer mr = sphere.AddComponent(); - Debug.LogError("5"); - mr.material = new Material(Shader.Find("Standard")); - Debug.LogError("6"); - sphere.transform.parent = body.transform; - Debug.LogError("7"); - sphere.transform.localScale = new Vector3(groundScale, groundScale, groundScale); - Debug.LogError("8"); - sphere.SetActive(true); - Debug.LogError("9"); - */ - - /* - var geo = MainClass.assetBundle.LoadAsset("PLANET"); - GameObject temp = GameObject.CreatePrimitive(PrimitiveType.Sphere); - geo.GetComponent().material = temp.GetComponent().material; - GameObject.Destroy(temp); - geo.transform.parent = body.transform; - geo.transform.localScale = new Vector3(1,1,1); - geo.transform.localPosition = new Vector3(0, 0, 0); - Debug.LogError(geo.name); - Debug.LogError(geo.GetComponent().mesh.name); - Debug.LogError(geo.transform.parent.name); - geo.SetActive(true); - - */ } } } diff --git a/NewHorizons/Body/HeightMapBuilder.cs b/NewHorizons/Body/HeightMapBuilder.cs index 5832df48..dad29cd1 100644 --- a/NewHorizons/Body/HeightMapBuilder.cs +++ b/NewHorizons/Body/HeightMapBuilder.cs @@ -48,25 +48,7 @@ namespace NewHorizons.Body // Fix rotation in the end cubeSphere.transform.localRotation = Quaternion.Euler(90, 0, 0); - - /* - GameObject icosphere = new GameObject("Icosphere"); - icosphere.transform.parent = go.transform; - icosphere.transform.rotation = Quaternion.Euler(90, 0, 0); - - Mesh mesh = Icosphere.Build(5, heightMap, module.MinHeight, module.MaxHeight); - - icosphere.AddComponent(); - icosphere.GetComponent().mesh = mesh; - - var cubeSphereMR = icosphere.AddComponent(); - cubeSphereMR.material = new Material(Shader.Find("Standard")); - cubeSphereMR.material.mainTexture = textureMap; - - var cubeSphereMC = icosphere.AddComponent(); - cubeSphereMC.sharedMesh = mesh; - icosphere.transform.localRotation = Quaternion.Euler(90, 0, 0); - */ + cubeSphere.transform.localPosition = Vector3.zero; } } } diff --git a/NewHorizons/Body/ProcGenBuilder.cs b/NewHorizons/Body/ProcGenBuilder.cs index 3feb6aba..258c1407 100644 --- a/NewHorizons/Body/ProcGenBuilder.cs +++ b/NewHorizons/Body/ProcGenBuilder.cs @@ -16,6 +16,7 @@ namespace NewHorizons.Body GameObject icosphere = new GameObject("Icosphere"); icosphere.transform.parent = go.transform; icosphere.transform.rotation = Quaternion.Euler(90, 0, 0); + icosphere.transform.localPosition = Vector3.zero; Mesh mesh = Icosphere.Build(3, module.Scale, module.Scale * 1.2f); diff --git a/NewHorizons/Body/WaterBuilder.cs b/NewHorizons/Body/WaterBuilder.cs index b41d7fe1..704d7a7b 100644 --- a/NewHorizons/Body/WaterBuilder.cs +++ b/NewHorizons/Body/WaterBuilder.cs @@ -79,6 +79,7 @@ namespace NewHorizons.Body fog3.GetComponent().material.color = new Color32(0, 75, 50, 5); */ + waterGO.transform.localPosition = Vector3.zero; waterGO.SetActive(true); } } diff --git a/NewHorizons/General/DetectorBuilder.cs b/NewHorizons/General/DetectorBuilder.cs index 52186f5f..1857cd1a 100644 --- a/NewHorizons/General/DetectorBuilder.cs +++ b/NewHorizons/General/DetectorBuilder.cs @@ -12,6 +12,7 @@ namespace NewHorizons.General GameObject detectorGO = new GameObject("FieldDetector"); detectorGO.SetActive(false); detectorGO.transform.parent = body.transform; + detectorGO.transform.localPosition = Vector3.zero; detectorGO.layer = 20; ConstantForceDetector CFD = detectorGO.AddComponent(); diff --git a/NewHorizons/General/GravityBuilder.cs b/NewHorizons/General/GravityBuilder.cs index 8f9a485f..b894a5c9 100644 --- a/NewHorizons/General/GravityBuilder.cs +++ b/NewHorizons/General/GravityBuilder.cs @@ -11,6 +11,7 @@ namespace NewHorizons.General { GameObject gravityGO = new GameObject("GravityWell"); gravityGO.transform.parent = body.transform; + gravityGO.transform.localPosition = Vector3.zero; gravityGO.layer = 17; gravityGO.SetActive(false); diff --git a/NewHorizons/General/OrbitlineBuilder.cs b/NewHorizons/General/OrbitlineBuilder.cs index 1e901654..7596387e 100644 --- a/NewHorizons/General/OrbitlineBuilder.cs +++ b/NewHorizons/General/OrbitlineBuilder.cs @@ -12,6 +12,7 @@ namespace NewHorizons.General { GameObject orbitGO = new GameObject("Orbit"); orbitGO.transform.parent = body.transform; + orbitGO.transform.localPosition = Vector3.zero; var LR = orbitGO.AddComponent(); diff --git a/NewHorizons/General/RFVolumeBuilder.cs b/NewHorizons/General/RFVolumeBuilder.cs index f90545b2..a1bf672b 100644 --- a/NewHorizons/General/RFVolumeBuilder.cs +++ b/NewHorizons/General/RFVolumeBuilder.cs @@ -11,6 +11,7 @@ namespace NewHorizons.General { GameObject rfGO = new GameObject("RFVolume"); rfGO.transform.parent = body.transform; + rfGO.transform.localPosition = Vector3.zero; rfGO.layer = 19; rfGO.SetActive(false); diff --git a/NewHorizons/General/SectorBuilder.cs b/NewHorizons/General/SectorBuilder.cs index 714e89f3..496e67f4 100644 --- a/NewHorizons/General/SectorBuilder.cs +++ b/NewHorizons/General/SectorBuilder.cs @@ -13,6 +13,7 @@ namespace NewHorizons.Body GameObject sectorGO = new GameObject("Sector"); sectorGO.SetActive(false); sectorGO.transform.parent = body.transform; + sectorGO.transform.localPosition = Vector3.zero; SphereShape SS = sectorGO.AddComponent(); SS.SetCollisionMode(Shape.CollisionMode.Volume); diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index a69fba65..e7b369b5 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -92,15 +92,13 @@ namespace NewHorizons try { existingPlanet = AstroObjectLocator.GetAstroObject(stringID); - if (existingPlanet == null) - existingPlanet = existingPlanet = AstroObjectLocator.GetAstroObject(body.Config.Name.Replace(" ", "")); + if (existingPlanet == null) existingPlanet = AstroObjectLocator.GetAstroObject(body.Config.Name.Replace(" ", "")); } catch (Exception e) { Logger.LogWarning($"Error when looking for {body.Config.Name}: {e.Message}, {e.StackTrace}"); } - if (existingPlanet != null) { try