Merge pull request #22 from xen-42/planetary-features

Planetary features

NewHorizons/Builder/Atmosphere/FogBuilder.cs

@@ -38,12 +38,7 @@ namespace NewHorizons.Atmosphere
             PFC.fogExponent = 1f;
             PFC.fogColorRampTexture = dbPlanetaryFogController.fogColorRampTexture;
             PFC.fogColorRampIntensity = 1f;
-            var adjustedColour = atmo.FogTint.ToColor32();
-            adjustedColour.r = (byte)(adjustedColour.r * atmo.FogDensity);
-            adjustedColour.g = (byte)(adjustedColour.g * atmo.FogDensity);
-            adjustedColour.b = (byte)(adjustedColour.b * atmo.FogDensity);
-            adjustedColour.a = (byte)(adjustedColour.a * atmo.FogDensity);
-            PFC.fogTint = atmo.FogTint.ToColor32();
+            PFC.fogTint = atmo.FogTint.ToColor();
 
             GameObject lodFogGO = new GameObject("LODFogSphere");
             lodFogGO.SetActive(false);
@@ -55,7 +50,7 @@ namespace NewHorizons.Atmosphere
 
             MeshRenderer lodMR = lodFogGO.AddComponent<MeshRenderer>();
             lodMR.material = new Material(brambleLODFog.GetComponent<MeshRenderer>().material);
-            lodMR.material.color = atmo.FogTint.ToColor32();
+            lodMR.material.color = atmo.FogTint.ToColor();
             lodMR.material.renderQueue = 1000;
 
             /*

NewHorizons/Builder/Body/ProcGenBuilder.cs

@@ -25,7 +25,7 @@ namespace NewHorizons.Builder.Body
 
             var cubeSphereMR = icosphere.AddComponent<MeshRenderer>();
             cubeSphereMR.material = new Material(Shader.Find("Standard"));
-            cubeSphereMR.material.color = module.Color.ToColor32();
+            cubeSphereMR.material.color = module.Color.ToColor();
 
             var cubeSphereMC = icosphere.AddComponent<MeshCollider>();
             cubeSphereMC.sharedMesh = mesh;

NewHorizons/Builder/Props/DetailBuilder.cs

@@ -71,7 +71,7 @@ namespace NewHorizons.Builder.Props
             {
                 // Enable all children or something
                 var enabledField = component.GetType().GetField("enabled");
-                if (enabledField != null && enabledField.FieldType == typeof(bool)) enabledField.SetValue(component, true);
+                if (enabledField != null && enabledField.FieldType == typeof(bool)) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => enabledField.SetValue(component, true));
 
                 // TODO: Make this work or smthng
                 if (component is GhostIK) (component as GhostIK).enabled = false;
@@ -80,6 +80,14 @@ namespace NewHorizons.Builder.Props
                 if (component is Animator) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as Animator).enabled = true);
                 if (component is Collider) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as Collider).enabled = true);
 
+                if(component is Shape) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as Shape).enabled = true);
+
+                if(component is DarkMatterVolume)
+                {
+                    var probeVisuals = component.gameObject.transform.Find("ProbeVisuals");
+                    if (probeVisuals != null) probeVisuals.gameObject.SetActive(true);
+                }
+
                 if (component is SectoredMonoBehaviour)
                 {
                     (component as SectoredMonoBehaviour).SetSector(sector);

NewHorizons/Builder/Props/ScatterBuilder.cs

@@ -38,6 +38,8 @@ namespace NewHorizons.Builder.Props
 
             foreach (var propInfo in scatterInfo)
             {
+                Random.InitState(propInfo.seed);
+
                 GameObject prefab;
                 if (propInfo.assetBundle != null) prefab = PropBuildManager.LoadPrefab(propInfo.assetBundle, propInfo.path, uniqueModName, assets);
                 else prefab = GameObject.Find(propInfo.path);

NewHorizons/Builder/Props/SignalBuilder.cs

@@ -121,7 +121,8 @@ namespace NewHorizons.Builder.Props
             {
                 try
                 {
-                    clip = mod.Assets.GetAudio(info.AudioFilePath);
+                    clip = AudioUtility.LoadAudio(mod.Manifest.ModFolderPath + "/" + info.AudioFilePath);
+                    //clip = mod.Assets.GetAudio(info.AudioFilePath);
                 }
                 catch(Exception e)
                 {

NewHorizons/External/PropModule.cs

@@ -18,6 +18,7 @@ namespace NewHorizons.External
 
         public class ScatterInfo
         {
+            public int seed = 0;
             public int count;
             public string path;
             public string assetBundle;

NewHorizons/Utility/AudioUtility.cs

@@ -5,87 +5,55 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
+using UnityEngine.Networking;
 
 namespace NewHorizons.Utility
 {
     public static class AudioUtility
     {
-        // Thank you https://answers.unity.com/questions/737002/wav-byte-to-audioclip.html?_ga=2.94866780.194866897.1641426110-1837936344.1635819725
-
-        // convert two bytes to one float in the range -1 to 1
-        static float bytesToFloat(byte firstByte, byte secondByte)
+        public static AudioClip LoadAudio(string filePath)
         {
-            // convert two bytes to one short (little endian)
-            short s = (short)((secondByte << 8) | firstByte);
-            // convert to range from -1 to (just below) 1
-            return s / 32768.0F;
+            var task = Task.Run(async () => await GetAudioClip(filePath));
+            task.Wait();
+            return task.Result;
         }
 
-        static int bytesToInt(byte[] bytes, int offset = 0)
+        private static async Task<AudioClip> GetAudioClip(string filePath)
         {
-            int value = 0;
-            for (int i = 0; i < 4; i++)
+
+            var extension = filePath.Split(new char[] { '.' }).Last();
+
+            UnityEngine.AudioType audioType;
+
+            switch (extension)
             {
-                value |= ((int)bytes[offset + i]) << (i * 8);
+                case ("wav"):
+                    audioType = UnityEngine.AudioType.WAV;
+                    break;
+                case ("ogg"):
+                    audioType = UnityEngine.AudioType.OGGVORBIS;
+                    break;
+                default:
+                    Logger.LogError($"Invalid audio file extension ({extension}) must be .wav or .ogg");
+                    return null;
             }
-            return value;
-        }
 
-        private static byte[] GetBytes(string filename)
-        {
-            return File.ReadAllBytes(filename);
-        }
-
-        // Returns left and right double arrays. 'right' will be null if sound is mono.
-        public static AudioClip LoadWAV(string filename) 
-        {
-            var wav = GetBytes(filename);
-
-            // Determine if mono or stereo
-            var ChannelCount = wav[22];     // Forget byte 23 as 99.999% of WAVs are 1 or 2 channels
-
-            // Get the frequency
-            var Frequency = bytesToInt(wav, 24);
-
-            // Get past all the other sub chunks to get to the data subchunk:
-            int pos = 12;   // First Subchunk ID from 12 to 16
-
-            // Keep iterating until we find the data chunk (i.e. 64 61 74 61 ...... (i.e. 100 97 116 97 in decimal))
-            while (!(wav[pos] == 100 && wav[pos + 1] == 97 && wav[pos + 2] == 116 && wav[pos + 3] == 97))
+            using (UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(filePath, audioType))
             {
-                pos += 4;
-                int chunkSize = wav[pos] + wav[pos + 1] * 256 + wav[pos + 2] * 65536 + wav[pos + 3] * 16777216;
-                pos += 4 + chunkSize;
-            }
-            pos += 8;
+                var result = www.SendWebRequest();
 
-            // Pos is now positioned to start of actual sound data.
-            var SampleCount = (wav.Length - pos) / 2;     // 2 bytes per sample (16 bit sound mono)
-            if (ChannelCount == 2) SampleCount /= 2;        // 4 bytes per sample (16 bit stereo)
+                while (!result.isDone) { await Task.Delay(100); }
 
-            // Allocate memory (right will be null if only mono sound)
-            var LeftChannel = new float[SampleCount];
-            float[] RightChannel;
-            if (ChannelCount == 2) RightChannel = new float[SampleCount];
-            else RightChannel = null;
-
-            // Write to double array/s:
-            int i = 0;
-            while (pos < wav.Length)
-            {
-                LeftChannel[i] = bytesToFloat(wav[pos], wav[pos + 1]);
-                pos += 2;
-                if (ChannelCount == 2)
+                if (www.isNetworkError)
                 {
-                    RightChannel[i] = bytesToFloat(wav[pos], wav[pos + 1]);
-                    pos += 2;
+                    Debug.Log(www.error);
+                    return null;
+                }
+                else
+                {
+                    return DownloadHandlerAudioClip.GetContent(www);
                 }
-                i++;
             }
-
-            AudioClip audioClip = AudioClip.Create("testSound", SampleCount, 1, Frequency, false);
-            audioClip.SetData(LeftChannel, 0);
-            return audioClip;
         }
     }
 }

NewHorizons/manifest.json

@@ -3,7 +3,7 @@
   "author": "xen",
   "name": "New Horizons",
   "uniqueName": "xen.NewHorizons",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "owmlVersion": "2.1.0",
   "dependencies": [ "PacificEngine.OW_CommonResources" ],
   "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.OuterWildsMMO", "Vesper.AutoResume" ]

NewHorizons/schema.json

@@ -1107,7 +1107,7 @@
             "Star"
           ],
           "default": "Sand"
-        }
+        },
         "tint": {
           "type": "object",
           "properties": {