v0.606 WIP10

ozonexo3 · Jun 10, 2020 · 004e7ac · 004e7ac
1 parent 24fd4a9
commit 004e7ac
Show file tree

Hide file tree

Showing 18 changed files with 303 additions and 281 deletions.
diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj
diff --git a/Assets/GFX/Terrain/ScmapTerrain.asset b/Assets/GFX/Terrain/ScmapTerrain.asset
diff --git a/Assets/GFX/Terrain/TerrainShader.mat b/Assets/GFX/Terrain/TerrainShader.mat
@@ -252,16 +252,16 @@ Material:
     - _AreaY: 76.8
     - _Brush: 0
     - _BrushPainting: 0
-    - _BrushSize: 0
-    - _BrushUvX: 0.15161316
-    - _BrushUvY: 0.9026549
+    - _BrushSize: 5
+    - _BrushUvX: 0.26134828
+    - _BrushUvY: 0.43829408
     - _BuildGrid: 0
     - _DeepLevel: 1.675625
     - _DepthLevel: 1.5
     - _GeneratingNormal: 0
     - _Grid: 0
     - _GridCamDist: 0.049673967
-    - _GridScale: 102.4
+    - _GridScale: 204.8
     - _GridType: 0
     - _HideSplat0: 0
     - _HideSplat1: 0
@@ -274,31 +274,31 @@ Material:
     - _HideSplat8: 0
     - _HideTerrainType: 1
     - _LightingMultiplier: 1.27
-    - _LowerScale: 73.14286
-    - _LowerScaleNormal: 73.14286
+    - _LowerScale: 512
+    - _LowerScaleNormal: 234.05714
     - _Shininess: 0.03
     - _Slope: 0
-    - _Splat0Scale: 73.14286
-    - _Splat0ScaleNormal: 256
-    - _Splat1Scale: 73.14286
-    - _Splat1ScaleNormal: 73.14286
-    - _Splat2Scale: 73.14286
-    - _Splat2ScaleNormal: 73.14286
-    - _Splat3Scale: 73.14286
-    - _Splat3ScaleNormal: 73.14286
-    - _Splat4Scale: 73.14286
-    - _Splat4ScaleNormal: 73.14286
-    - _Splat5Scale: 73.14286
-    - _Splat5ScaleNormal: 73.14286
-    - _Splat6Scale: 73.14286
-    - _Splat6ScaleNormal: 73.14286
-    - _Splat7Scale: 51.2
-    - _Splat7ScaleNormal: 51.2
+    - _Splat0Scale: 61.134327
+    - _Splat0ScaleNormal: 512
+    - _Splat1Scale: 121.11177
+    - _Splat1ScaleNormal: 40.61075
+    - _Splat2Scale: 512
+    - _Splat2ScaleNormal: 512
+    - _Splat3Scale: 512
+    - _Splat3ScaleNormal: 512
+    - _Splat4Scale: 512
+    - _Splat4ScaleNormal: 512
+    - _Splat5Scale: 512
+    - _Splat5ScaleNormal: 512
+    - _Splat6Scale: 512
+    - _Splat6ScaleNormal: 512
+    - _Splat7Scale: 512
+    - _Splat7ScaleNormal: 512
     - _TTerrainXP: 0
     - _TerrainTypeCapacity: 0.228
     - _TerrainTypeCoof: 0.228
-    - _UpperScale: 8
-    - _UpperScaleNormal: 256
+    - _UpperScale: 16
+    - _UpperScaleNormal: 512
     - _UseSlopeTex: 1
     - _Water: 0
     - _WaterLevel: 1.75

diff --git a/Assets/GFX/Terrain/WaterShader.mat b/Assets/GFX/Terrain/WaterShader.mat
@@ -105,7 +105,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _Glossiness: 0.5
-    - _GridScale: 102.4
+    - _GridScale: 204.8
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1

diff --git a/Assets/Scripts/Common/EditorVersion.cs b/Assets/Scripts/Common/EditorVersion.cs
@@ -14,7 +14,7 @@ public class EditorVersion : MonoBehaviour
 	//public const float VersionOffset = 0f; // Release
 
 	// Prerelease
-	public const string EditorBuildTag = "WIP9";
+	public const string EditorBuildTag = "WIP10";
 	public const double VersionOffset = -0.001f; // Prerelease
 
 	public static string LatestTag = "";

diff --git a/Assets/Scripts/Ozone SCMAP Code/Lua/ScenarioLua.cs b/Assets/Scripts/Ozone SCMAP Code/Lua/ScenarioLua.cs
@@ -252,7 +252,7 @@ public void CheckForEmptyArmy()
 					{
 						if (Data.Configurations[c].Teams[t].Armys[a].Data == null)
 						{
-							Debug.Log("Fix army: " + Data.Configurations[c].Teams[t].Armys[a].Name);
+							Debug.Log("Fix army: " + Data.Configurations[c].Teams[t].Armys[a].Name + " (" + a + ")");
 							Data.Configurations[c].Teams[t].Armys[a].Data = new SaveLua.Army();
 							Data.Configurations[c].Teams[t].Armys[a].Data.Name = Data.Configurations[c].Teams[t].Armys[a].Name;
 						}
@@ -266,7 +266,7 @@ public void CheckForEmptyArmy()
 				{
 					if (Data.Configurations[c].ExtraArmys[a].Data == null)
 					{
-						Debug.Log("Fix army: " + Data.Configurations[c].ExtraArmys[a].Name);
+						Debug.Log("Fix extra army: " + Data.Configurations[c].ExtraArmys[a].Name + " (" + a +")");
 						Data.Configurations[c].ExtraArmys[a].Data = new SaveLua.Army();
 						Data.Configurations[c].ExtraArmys[a].Data.Name = Data.Configurations[c].ExtraArmys[a].Name;
 					}

diff --git a/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs b/Assets/Scripts/Ozone SCMAP Code/MapLuaParser.cs
@@ -462,13 +462,29 @@ public IEnumerator SaveMapProcess()
 
 		// Wait for all process to finish
 		while (Markers.MarkersControler.IsUpdating)
-			yield return null;
+		{
+			//Debug.Log("Wait for markers to finish...");
+			InfoPopup.Show(true, "Saving map...\nWait for markers upadate task...");
+			yield return new WaitForSeconds(0.5f);
+		}
 		while (PropsRenderer.IsUpdating)
-			yield return null;
+		{
+			//Debug.Log("Wait for props to finish...");
+			InfoPopup.Show(true, "Saving map...\nWait for props upadate task...");
+			yield return new WaitForSeconds(0.5f);
+		}
 		while (UnitsControler.IsUpdating)
-			yield return null;
+		{
+			//Debug.Log("Wait for units to finish...");
+			InfoPopup.Show(true, "Saving map...\nWait for units upadate task...");
+			yield return new WaitForSeconds(0.5f);
+		}
 		while (DecalsControler.IsUpdating)
-			yield return null;
+		{
+			//Debug.Log("Wait for decals to finish...");
+			InfoPopup.Show(true, "Saving map...\nWait for decals upadate task...");
+			yield return new WaitForSeconds(0.5f);
+		}
 
 
 		GenerateBackupPath();

diff --git a/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs b/Assets/Scripts/Ozone SCMAP Code/ScmapEditor.cs
@@ -314,10 +314,12 @@ public void LoadStratumScdTextures(bool Loading = true)
 					{
 						// Upper stratum normal should be empty!
 						Textures[i].NormalPath = "";
+						Debug.Log("Clear Upper stratum normal map");
 					}
 					else
 					{
 						Textures[i].NormalPath = "env/tundra/layers/tund_sandlight_normal.dds";
+						Debug.Log("Add missing normalmap on stratum " + i);
 						NormalMapFix = true;
 					}
 				}

diff --git a/Assets/Scripts/Ozone SCMAP Code/Texture/GenerateControlTex.cs b/Assets/Scripts/Ozone SCMAP Code/Texture/GenerateControlTex.cs
@@ -215,8 +215,8 @@ public IEnumerator GeneratingNormal()
 
 				if(Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 				{
-					Realtime = Time.realtimeSinceStartup;
 					yield return null;
+					Realtime = Time.realtimeSinceStartup;
 				}
 				/*
 				counter++;

diff --git a/Assets/Scripts/UI/Lists/MarkersList.cs b/Assets/Scripts/UI/Lists/MarkersList.cs
@@ -189,7 +189,7 @@ IEnumerator GenerateingList()
 
 		float Realtime = Time.realtimeSinceStartup;
 		//const float MaxAllowedOverhead = 0.03334f;
-		const float MaxAllowedOverhead = 0.4f;
+		const float MaxAllowedOverhead = 0.3f;
 
 
 		List<GameObject> AllObjectsList = new List<GameObject>(1024);
@@ -251,8 +251,8 @@ IEnumerator GenerateingList()
 				}*/
 				if (Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 				{
-					Realtime = Time.realtimeSinceStartup;
 					yield return null;
+					Realtime = Time.realtimeSinceStartup;
 				}
 			}
 

diff --git a/Assets/Scripts/UI/Marker/MarkersControler.cs b/Assets/Scripts/UI/Marker/MarkersControler.cs
@@ -506,7 +506,7 @@ public static void UpdateMarkersHeights()
 				BufforUpdate = true;
 		}
 
-		const float MaxAllowedOverhead = 0.001f;
+		const float MaxAllowedOverhead = 0.0002f;
 		public IEnumerator UpdatingMarkersHeights()
 		{
 			//const int BreakEvery = 50;
@@ -535,8 +535,8 @@ public IEnumerator UpdatingMarkersHeights()
 					}*/
 					if (Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 					{
-						Realtime = Time.realtimeSinceStartup;
 						yield return null;
+						Realtime = Time.realtimeSinceStartup;
 					}
 				}
 			}

diff --git a/Assets/Scripts/UI/Props/PropsRenderer.cs b/Assets/Scripts/UI/Props/PropsRenderer.cs
@@ -37,13 +37,16 @@ public void UpdatePropsHeights()
 
 	public static void StopPropsUpdate()
 	{
-		if(UpdateProcess != null)
+		if (UpdateProcess != null)
+		{
 			Current.StopCoroutine(UpdateProcess);
+			UpdateProcess = null;
+		}
 	}
 
 
 	//const int PauseEvery = 1200;
-	const float MaxAllowedOverhead = 0.001f;
+	const float MaxAllowedOverhead = 0.0002f;
 	IEnumerator PropsUpdater()
 	{
 		yield return null;
@@ -53,6 +56,8 @@ IEnumerator PropsUpdater()
 		PropsInfo.PropTypeGroup Ptg = null;
 		Vector3 LocalPos = Vector3.zero;
 		float Realtime = Time.realtimeSinceStartup;
+		//Debug.LogWarning("Start updating props: " + count);
+
 		for (i = 0; i < count; i++)
 		{
 			Ptg = PropsInfo.AllPropsTypes[i];
@@ -63,15 +68,16 @@ IEnumerator PropsUpdater()
 				LocalPos = listEnum.Current.Obj.Tr.localPosition;
 				LocalPos.y = ScmapEditor.Current.Teren.SampleHeight(LocalPos);
 				listEnum.Current.Obj.Tr.localPosition = LocalPos;
+				//step++;
 
 				if (Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 				{
-					Realtime = Time.realtimeSinceStartup;
+					//Debug.Log(step + "\n" + Time.realtimeSinceStartup + " : " + Realtime + "\n" + (Time.realtimeSinceStartup - Realtime).ToString("0.0000"));
 					yield return null;
+					Realtime = Time.realtimeSinceStartup;
 				}
 
-				/*step++;
-				if (step > PauseEvery)
+				/*if (step > PauseEvery)
 				{
 					step = 0;
 					yield return null;

diff --git a/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs b/Assets/Scripts/UI/Tools/Decals/DecalsControler.cs
@@ -236,7 +236,7 @@ public static void UpdateDecals()
 			BufforUpdate = true;
 	}
 
-	const float MaxAllowedOverhead = 0.001f;
+	const float MaxAllowedOverhead = 0.0002f;
 	IEnumerator UpdatingDecals()
 	{
 		//const int BreakEvery = 50;
@@ -252,8 +252,8 @@ IEnumerator UpdatingDecals()
 
 			if (Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 			{
-				Realtime = Time.realtimeSinceStartup;
 				yield return null;
+				Realtime = Time.realtimeSinceStartup;
 			}
 
 			/*UpdateCount++;

diff --git a/Assets/Scripts/UI/Tools/Units/UnitsControler.cs b/Assets/Scripts/UI/Tools/Units/UnitsControler.cs
@@ -74,8 +74,8 @@ public IEnumerator UpdatingUnitsHeights()
 
 				if (Time.realtimeSinceStartup - Realtime > MaxAllowedOverhead)
 				{
-					Realtime = Time.realtimeSinceStartup;
 					yield return null;
+					Realtime = Time.realtimeSinceStartup;
 				}
 
 				/*if (Counter > 1024)

diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log
@@ -58,3 +58,11 @@ The following packages were updated:
   com.unity.timeline from version 1.1.0 to 1.2.12
 The following packages were removed:
   [email protected]
+
+=== Wed Jun 10 22:02:54 2020
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were updated:
+  com.unity.ide.vscode from version 1.1.4 to 1.2.0
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -5,7 +5,7 @@
     "com.unity.collab-proxy": "1.2.16",
     "com.unity.ext.nunit": "1.0.0",
     "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.1.4",
+    "com.unity.ide.vscode": "1.2.0",
     "com.unity.timeline": "1.2.12",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -196,22 +196,6 @@ PlayerSettings:
   uIStatusBarHidden: 1
   uIExitOnSuspend: 0
   uIStatusBarStyle: 0
-  iPhoneSplashScreen: {fileID: 0}
-  iPhoneHighResSplashScreen: {fileID: 0}
-  iPhoneTallHighResSplashScreen: {fileID: 0}
-  iPhone47inSplashScreen: {fileID: 0}
-  iPhone55inPortraitSplashScreen: {fileID: 0}
-  iPhone55inLandscapeSplashScreen: {fileID: 0}
-  iPhone58inPortraitSplashScreen: {fileID: 0}
-  iPhone58inLandscapeSplashScreen: {fileID: 0}
-  iPadPortraitSplashScreen: {fileID: 0}
-  iPadHighResPortraitSplashScreen: {fileID: 0}
-  iPadLandscapeSplashScreen: {fileID: 0}
-  iPadHighResLandscapeSplashScreen: {fileID: 0}
-  iPhone65inPortraitSplashScreen: {fileID: 0}
-  iPhone65inLandscapeSplashScreen: {fileID: 0}
-  iPhone61inPortraitSplashScreen: {fileID: 0}
-  iPhone61inLandscapeSplashScreen: {fileID: 0}
   appleTVSplashScreen: {fileID: 0}
   appleTVSplashScreen2x: {fileID: 0}
   tvOSSmallIconLayers: []

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.3.10f1
-m_EditorVersionWithRevision: 2019.3.10f1 (5968d7f82152)
+m_EditorVersion: 2019.3.14f1
+m_EditorVersionWithRevision: 2019.3.14f1 (2b330bf6d2d8)