rem 3 sky

stuntrally · Dec 20, 2023 · 426c55b · 426c55b
1 parent 8cf078b
commit 426c55b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 111 deletions.
diff --git a/config/presets.xml b/config/presets.xml
@@ -22,7 +22,7 @@
 <s m="sky/day_clouds_03_grey"    c="#8794a7"  p="52"  y="-47" fc="0.581 0.311 0.861 0.911 0.0" gc="0.591 0.451 0.541 0.860 0.0" /> <!-- -->
 
 <s m="sky/day_clouds_04_blue"    c="#7b95ce"  p="48"  y="-35" fc="0.591 0.329 0.997 1.000 0.0" gc="0.589 0.461 0.292 1.000 0.0" /> <!-- Aus3-Canyon, Beach, Temple, -->
-<s m="sky/day_clouds_05_bright"  c="#c0d0f0"  p="56"  y="-11" fc="0.581 0.311 0.561 0.911 0.0" gc="0.591 0.451 0.541 0.860 0.0" /> <!-- -->
+<s m="sky/day_clouds_05_bright"  c="#c0c8d0"  p="56"  y="-11" fc="0.581 0.064 0.312 0.911 0.0" gc="0.591 0.159 0.893 0.860 0.0" /> <!-- Wnt-MountPen -->
 <s m="sky/day_clouds_05_bright2" c="#ecf0ff"  p="56"  y="-11" fc="0.545 0.068 0.795 1.000 0.0" gc="0.541 0.045 0.879 0.975 0.0" /> <!-- Wnt-FrozenGarden-->
 <s m="sky/day_clouds_06"         c="#88aacc"  p="38"  y="0"   fc="0.522 0.436 0.383 1.000 0.0" gc="0.527 0.481 0.255 1.000 0.0" /> <!-- Grc-Halfpipes -->
 <s m="sky/dawn_01"               c="#ccc090"  p="15"  y="0"   fc="0.165 0.209 0.941 0.850 0.0" gc="0.126 0.368 0.262 0.907 0.0" /> <!-- Can-Obstacles -->
@@ -83,13 +83,9 @@
 <s m="sky/dawn_bright"     c="#D0D0B0"   p="21"  y="-45" />
 <s m="sky/sunset_gen"      c="#E080A0"   p="16"  y=" 45" />
 
-<s m="sky/morning_gen"     c="#C0B0A0"   p="30"  y=" -8" />
-<s m="sky/morning2_gen"    c="#D0D090"   p="30"  y="  8" />
-
 <!--  skies, oldest  (lowest quality)  -->
 <s m="sky/dust"            c="#C0C090"   p="32"  y=" 60" />
 <s m="sky/dawn"            c="#D4D090"   p="28"  y=" -7" />
-<s m="sky/white2"          c="#D0D0D0"   p="40"  y=" 60" />
 
 <s m="sky/light_blue"      c="#80C0FF"   p="20"  y=" 60" />
 <s m="sky/blue_clouds"     c="#C0E0FF"   p="57"  y=" 62" />

diff --git a/config/tracks.ini b/config/tracks.ini
@@ -99,7 +99,7 @@
 
 43,Wnt7-LJs-Mntn         v1.1 05/03/11 26/11/23 :Winter       |o1 c0 w1 ~0 J0 L0 P0 /1 s2 n0 l2  !2 *3  T=48.0   a:CryHam,rubberduck
 44,Jng10-Spiral          v1.1 10/03/11 23/06/22 :JungleDark   |o1 c0 w0 ~0 J0 L0 P0 /2 s2 n1 l2  !2 *3  T=57.4   a:CH
-45,Isl2-Sandy            v1.1 10/03/11 13/05/23 :Island       |o0 c0 w1 ~0 J0 L0 P0 /1 s2 n0 l1  !1 *1  T=40.0   a:CH
+45,Isl2-Sandy            v1.1 10/03/11 19/12/23 :Island       |o3 c0 w1 ~0 J0 L0 P0 /1 s2 n0 l1  !1 *2  T=40.0   a:CH
 46,Wnt8-PipeCross        v1.1 16/03/11 23/06/22 :WinterWet    |o0 c0 w0 ~0 J0 L0 P2 /1 s2 n0 l2  !2 *3  T=55.7   a:CH
 
 47,Sav10-PipeCurl        v1.1 17/03/11 23/06/22 :Savanna      |o0 c0 w0 ~0 J0 L0 P3 /0 s2 n0 l3  !3 *2  T=61.5   a:CH
@@ -295,9 +295,9 @@
     # 168  2.6  +5
 
 183,Grc9-Oasis           v2.7 28/11/20 04/05/23 :Greece       |o1 c3 w1 ~1 J3 L4 P4 /3 s3 n1 l8  !5 *6  T=241  a:CH
-184,Oth2-BlackWinter     v2.7 18/01/22 11/07/22 :Other        |o1 c1 w0 ~0 J1 L0 P0 /4 s3 n2 l4  !3 *2  T=141  a:EP,CryHam
+184,Oth2-BlackWinter     v2.7 18/01/22 19/12/23 :Other        |o1 c1 w0 ~0 J1 L0 P0 /4 s3 n2 l4  !3 *2  T=141  a:EP,CryHam
 185,Aus9-RedDesert       v2.7 11/03/22 15/03/22 :Australia    |o0 c1 w0 ~2 J1 L0 P1 /3 s3 n2 l3  !3 *5  T=135  a:EP,CryHam
-186,Sur4-BlueWinter      v2.7 12/03/22 16/03/22 :SurrealSpace |o0 c0 w2 ~2 J0 L0 P2 /3 s2 n1 l6  !4 *4  T=241  a:EP,CryHam
+186,Sur4-BlueWinter      v2.7 12/03/22 19/12/23 :SurrealSpace |o0 c0 w2 ~2 J0 L0 P2 /3 s2 n1 l6  !4 *4  T=241  a:EP,CryHam
 
 187,Grc10-BeachCity      v2.7 13/03/22 11/07/22 :GreeceWhite  |o3 c0 w1 ~1 J0 L0 P1 /1 s3 n0 l4  !2 *5  T=154  a:EP
 188,Isl15-IslandVillages v2.7 15/03/22 17/03/22 :IslandDark   |o0 c0 w3 ~1 J0 L0 P0 /0 s2 n0 l4  !3 *4  T=162  a:EP
@@ -309,7 +309,7 @@
 192,Jng24-NightJungle    v2.7 26/03/22 31/03/22 :JungleDark   |o0 c0 w0 ~1 J0 L0 P2 /3 s2 n1 l3  !2 *2  T=86   a:EP
 193,For18-MountCaro      v2.7 23/03/22 09/06/23 :ForestMntn   |o0 c0 w2 ~1 J0 L0 P2 /1 s4 n2 l22 !3 *6  T=900  a:EP,CryHam
 
-194,Wnt18-MountPen       v2.7 26/03/22 11/07/22 :WinterWet    |o0 c0 w2 ~1 J0 L0 P2 /2 s3 n2 l6  !3 *4  T=270  a:EP,CryHam
+194,Wnt18-MountPen       v2.7 26/03/22 19/12/23 :WinterWet    |o0 c0 w2 ~1 J0 L0 P2 /2 s3 n2 l6  !3 *4  T=270  a:EP,CryHam
 195,Isl17-AdapterIslands v2.7 29/03/22 02/04/22 :Island       |o0 c0 w3 ~1 J2 L4 P3 /3 s3 n2 l16 !5 *4  T=495  a:EP,CryHam
 196,Grc11-PickCave       v2.7 30/03/22 11/07/22 :GreeceWhite  |o0 c0 w3 ~1 J0 L0 P2 /2 s2 n1 l6  !3 *4  T=226  a:EP
     #  + 14

diff --git a/data/materials/Pbs/all.material.json b/data/materials/Pbs/all.material.json
@@ -43383,70 +43383,6 @@
 			}
 		},
 
-		"sky/morning2_gen" :
-		{
-			"macroblock" : "Macroblock_0",
-			"blendblock" : "Blendblock_0",
-			"shadow_const_bias" : 0.01,
-			"workflow" : "specular_ogre",
-			"diffuse" :
-			{
-				"value" : [0, 0, 0],
-				"background" : [1, 1, 1, 1]
-			},
-			"specular" :
-			{
-				"value" : [0, 0, 0]
-			},
-			"fresnel" :
-			{
-				"value" : [0.01, 0.01, 0.01],
-				"mode" : "coloured"
-			},
-			"roughness" :
-			{
-				"value" : 0.01
-			},
-			"emissive" :
-			{
-				"value" : [1, 1, 1],
-				"texture" : "gen-brightday2.jpg",
-				"sampler" : "Sampler_Sky"
-			}
-		},
-
-		"sky/morning_gen" :
-		{
-			"macroblock" : "Macroblock_0",
-			"blendblock" : "Blendblock_0",
-			"shadow_const_bias" : 0.01,
-			"workflow" : "specular_ogre",
-			"diffuse" :
-			{
-				"value" : [0, 0, 0],
-				"background" : [1, 1, 1, 1]
-			},
-			"specular" :
-			{
-				"value" : [0, 0, 0]
-			},
-			"fresnel" :
-			{
-				"value" : [0.01, 0.01, 0.01],
-				"mode" : "coloured"
-			},
-			"roughness" :
-			{
-				"value" : 0.01
-			},
-			"emissive" :
-			{
-				"value" : [1, 1, 1],
-				"texture" : "gen-brightday.jpg",
-				"sampler" : "Sampler_Sky"
-			}
-		},
-
 		"sky/sunset_gen" :
 		{
 			"macroblock" : "Macroblock_0",
@@ -43479,38 +43415,6 @@
 			}
 		},
 
-		"sky/white2" :
-		{
-			"macroblock" : "Macroblock_0",
-			"blendblock" : "Blendblock_0",
-			"shadow_const_bias" : 0.01,
-			"workflow" : "specular_ogre",
-			"diffuse" :
-			{
-				"value" : [0, 0, 0],
-				"background" : [1, 1, 1, 1]
-			},
-			"specular" :
-			{
-				"value" : [0, 0, 0]
-			},
-			"fresnel" :
-			{
-				"value" : [0.01, 0.01, 0.01],
-				"mode" : "coloured"
-			},
-			"roughness" :
-			{
-				"value" : 0.01
-			},
-			"emissive" :
-			{
-				"value" : [1, 1, 1],
-				"texture" : "sky_white2.jpg",
-				"sampler" : "Sampler_Sky"
-			}
-		},
-
 		"sky/clouds_01_blurry" :
 		{
 			"macroblock" : "Macroblock_0",

diff --git a/data/skies/gen-brightday.jpg b/data/skies/gen-brightday.jpg
diff --git a/data/skies/gen-brightday2.jpg b/data/skies/gen-brightday2.jpg
diff --git a/data/skies/sky_white2.jpg b/data/skies/sky_white2.jpg
diff --git a/docs/Materials.md b/docs/Materials.md
@@ -527,8 +527,8 @@ diffuse, specular, normal, roughness.
 - specular - tells where surface will shine from light reflection.
 - roughness - tells how much it will shine. 0 is mirror, 0.2 most shine, 0.4 gets blurry, 0.9 is just dull.
 
-There is no *metalness* texture, it's meant for a simpler metal workflow,
-we use specular workflow which has own colors (on texture) for specular shine.
+There is no *metalness* texture, it's meant for a simpler *metallic* workflow,  
+we use *specular_ogre* workflow which has own colors (on texture) for specular shine.
 
 
 ## Example 6, detail maps
@@ -593,7 +593,7 @@ Extra textures (layers) can be added to modulate original diffuse and/or normal
 In this quite advanced material, 2 extra maps are added.  
 First `detail_diffuse0` map multiplying regular `diffuse` map.  
 Other `mode` variants are possible, all inside `@piece` in [this shader file](../data/Hlms/Pbs/Any/Main/200.BlendModes_piece_ps.any).  
-The `scale"` is UV coords multiplier, it means that detail map will repeat 12 times more.  
+The `scale` is UV coords multiplier, it means that detail map will repeat 12 times more.  
 There is also `offset` which just gets added to UV coords.
 
 Great for adding smaller scale detail like scratches, etc.  

diff --git a/src/common/Tools.cpp b/src/common/Tools.cpp
@@ -277,8 +277,8 @@ void CGui::ToolSceneOld()
 		mapSky["sky/magic_alien"] = 1;		// "magic_alien.jpg"
 		mapSky["sky/magicdark"] = 1;		// "magicdark.jpg"
 
-		mapSky["sky/morning2_gen"] = 1;		// "gen-brightday2.jpg"
-		mapSky["sky/morning_gen"] = 1;		// "gen-brightday.jpg"
+			mapSky["sky/morning2_gen"] = 1;		// "gen-brightday2.jpg"  +
+			mapSky["sky/morning_gen"] = 1;		// "gen-brightday.jpg"  +
 
 			mapSky["sky/night_blue"] = 1;		// "sky-night.jpg"  +
 			mapSky["sky/offworld_gen"] = 1;		// "gen-offworld.jpg"  +
@@ -290,7 +290,7 @@ void CGui::ToolSceneOld()
 			mapSky["sky/sunset_rays_gen"] = 1;	// "gen-godrays.jpg"  +
 
 			mapSky["sky/white"] = 1;			// "sky_white.jpg"  +
-		mapSky["sky/white2"] = 1;			// "sky_white2.jpg"
+			mapSky["sky/white2"] = 1;			// "sky_white2.jpg"  +
 
 	int i,n, t = 0;
 	for (auto trkinf : data->tracks->trks)