Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

Commit 87940a9

Browse files
committed
improved light colors a bit
1 parent 2accb90 commit 87940a9

File tree

7 files changed

+113
-22
lines changed

7 files changed

+113
-22
lines changed

Assets/Scenes/World.unity

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,7 +2898,7 @@ Texture2D:
28982898
m_ColorSpace: 1
28992899
m_PlatformBlob:
29002900
image data: 1364
2901-
_typelessdata: 0f0f0fff141211ff191613ff1f1a16ff261f18ff2e241cff372b20ff413324ff4d3c2aff5b4832ff6b573dff806b4cff9a8563ffbbaa8bffe7e0d2fffcfcfcff131313ff181615ff1d1917ff231e19ff2a221cff32281fff3a2e23ff443628ff50402eff5e4c36ff6f5b40ff846f50ff9d8967ffbeae8effeae4d6fffcfcfcff171717ff1c1a19ff211e1bff27221dff2e2620ff362c23ff3e3327ff493a2cff544432ff62503aff735f44ff887354ffa18d6bffc2b292ffefe8dafffcfcfcff1b1b1bff201f1dff262220ff2c2622ff332b25ff3a3128ff43372cff4d3f31ff594937ff67553eff786449ff8c7758ffa69270ffc7b697fff3eddffffcfcfcff212121ff252423ff2b2725ff312b27ff38302aff3f362dff483c31ff524436ff5e4e3cff6c5a44ff7d694eff927c5dffab9775ffccbc9cfff8f2e4fffcfcfcff262626ff2b2a28ff312d2bff37312dff3e3630ff453c33ff4e4237ff584a3cff645442ff726049ff836f54ff978263ffb19d7bffd2c2a2fffcf8eafffcfcfcff2d2d2dff32302fff373431ff3e3834ff443d37ff4c423aff55493eff5f5142ff6b5a48ff796650ff8a755bff9e896affb8a382ffd9c8a9fffcfcf0fffcfcfcff353535ff3a3837ff3f3c39ff45403cff4c453eff544a42ff5d5145ff67594aff736250ff816e58ff917d63ffa69172ffc0ab89ffe1d0b1fffcfcf8fffcfcfcff3e3e3eff434140ff484542ff4e4945ff554e47ff5d534bff665a4fff706253ff7c6b59ff8a7761ff9a866cffaf9a7bffc9b492ffead9bafffcfcfcfffcfcfcff494949ff4e4c4bff534f4dff59544fff605852ff675e55ff706459ff7a6c5eff867664ff94826cffa59176ffbaa586ffd3bf9dfff4e4c4fffcfcfcfffcfcfcff555555ff5a5957ff605c5aff66605cff6d655fff746b62ff7d7166ff87796bff938371ffa18f78ffb29e83ffc6b192ffe0ccaafffcf1d1fffcfcfcfffcfcfcff656565ff6a6867ff6f6c69ff75706cff7c756fff847a72ff8d8176ff97897affa39280ffb19e88ffc2ad93ffd6c1a2fff0dbbafffcfce1fffcfcfcfffcfcfcff797979ff7e7c7bff837f7dff89847fff908882ff988e85ffa09589ffab9c8effb6a694ffc4b29cffd5c1a6ffead5b6fffcefcdfffcfcf4fffcfcfcfffcfcfcff929292ff979594ff9c9996ffa29d98ffa9a29bffb1a79fffbaaea2ffc4b6a7ffd0bfadffdecbb5ffeedabffffceecffffcfce6fffcfcfcfffcfcfcfffcfcfcffb3b3b3ffb8b7b5ffbebab8ffc4bebaffcbc3bdffd2c9c0ffdbcfc4ffe5d7c9fff1e1cffffcedd6fffcfce1fffcfcf0fffcfcfcfffcfcfcfffcfcfcfffcfcfcffe3e3e3ffe7e6e4ffede9e7fff3ede9fffaf2ecfffcf8effffcfcf3fffcfcf8fffcfcfcfffcfcfcfffcfcfcfffcfcfcfffcfcfcfffcfcfcfffcfcfcfffcfcfcff131212ff1e1916ff2c231bff3d3023ff554430ff776346ffab9978fff2efe8ff1b1a1aff26221eff342b23ff45382bff5d4c38ff7f6b4effb3a180fff6f3ecff252524ff312c29ff3e362eff504336ff685742ff8a7558ffbeac8bfffbf8f1ff333232ff3e3a36ff4c433cff5e5143ff766450ff978366ffccb999fffcfcf8ff454444ff504c48ff5e554eff706356ff887662ffa99578ffdecbabfffcfcfcff5f5e5eff6a6662ff786f68ff8a7d70ffa2907cffc4af92fff2e4c5fffcfcfcff878686ff928e8affa09790ffb2a597ffcab8a4ffead7bafffcf8e8fffcfcfcffcdcccbffd8d3d0ffe4ddd5ffeee7ddfff9f1e7fffcfcf2fffcfcfcfffcfcfcff1c1918ff382d23ff6a573fffd1c7b3ff312f2dff4e4338ff7f6c54ffe0d6c3ff575553ff74695fffa5927afff2e9d9ffafacaaffc9c0b6ffeadecdfffcfbf7ff342e27ffa69882ff908a84ffdfd4c5ff92897cff
2901+
_typelessdata: 0f0f0fff151311ff1c1814ff241d17ff2c231bff362a1fff413325ff4e3e2bff5d4b34ff6f5b3fff846f50ff9f8b69ffbfaf91ffe9e4d7fffcfcfcfffcfcfcff0f0f10ff151312ff1c1815ff241d18ff2d231cff362b20ff423325ff4f3e2cff5e4b34ff6f5b40ff857050ff9f8b69ffc0b092ffe9e4d8fffcfcfcfffcfcfcff101010ff161413ff1d1816ff241d19ff2d241cff372b21ff423426ff4f3e2cff5e4b35ff705b40ff857051ff9f8b6affc0b092ffeae4d8fffcfcfcfffcfcfcff101011ff161413ff1d1916ff251e19ff2d241dff372b21ff423427ff4f3f2dff5e4b36ff705c41ff857052ffa08b6bffc0b093ffeae4d9fffcfcfcfffcfcfcff101012ff161414ff1d1917ff251e1aff2e241eff372c22ff433427ff503f2eff5f4c36ff705c42ff867152ffa08c6bffc1b194ffeae5dafffcfcfcfffcfcfcff111113ff171515ff1e1918ff251f1bff2e251fff382c23ff433528ff503f2fff5f4c37ff715c43ff867153ffa08c6cffc1b195ffebe5dbfffcfcfcfffcfcfcff111114ff171516ff1e1a19ff261f1cff2f2520ff382d24ff443529ff504030ff5f4d38ff715d44ff877254ffa18d6dffc1b296ffebe6dcfffcfcfcfffcfcfcff121215ff181618ff1f1a1aff26201eff2f2621ff392d25ff44362bff514031ff604d3aff725d45ff877256ffa18d6fffc2b297ffece6ddfffcfcfcfffcfcfcff121217ff191619ff1f1b1cff27201fff302623ff3a2e27ff45362cff524133ff614e3bff725e47ff887357ffa28e70ffc3b399ffede7dffffcfcfcfffcfcfcff131318ff19171bff201c1eff282121ff302724ff3a2f29ff45372eff524234ff614f3dff735f48ff897359ffa38f72ffc3b49affede8e0fffcfcfcfffcfcfcff14141aff1a181dff211d20ff292223ff312826ff3b2f2bff463830ff534336ff62503fff74604aff8a745bffa49074ffc4b49cffeee9e3fffcfcfcfffcfcfcff15151dff1b191fff221e22ff2a2325ff332929ff3c312dff483932ff544439ff635141ff75614dff8b765effa59177ffc5b69fffefeae5fffcfcfcfffcfcfcff171720ff1d1b23ff241f25ff2b2428ff342b2cff3e3230ff493b36ff56453cff655245ff776250ff8c7761ffa6927affc7b7a2fff1ebe8fffcfcfcfffcfcfcff181824ff1f1c27ff252129ff2d262cff362c30ff403434ff4b3c3aff584740ff675449ff796454ff8e7965ffa8947effc9b9a6fff3edecfffcfcfcfffcfcfcff1b1b29ff211f2cff28232fff302932ff382f36ff42363aff4d3f3fff5a4946ff69564eff7b665aff907b6affaa9683ffcbbbabfff5eff2fffcfcfcfffcfcfcff1e1e31ff242234ff2b2736ff332c39ff3c323dff453a41ff504247ff5d4d4dff6c5a56ff7e6a61ff947e72ffae9a8bffcebfb3fff8f3f9fffcfcfcfffcfcfcff121110ff201a15ff31261dff473828ff665339ff917d5cffd4c9b4fffcfcfcff131211ff201a17ff32271eff483929ff67533aff927d5dffd5cab5fffcfcfcff131213ff211b18ff322820ff49392aff67543cff937e5effd5cbb7fffcfcfcff141315ff221c1bff332922ff4a3a2dff68553eff947f61ffd6ccb9fffcfcfcff151418ff231d1eff352a25ff4b3b30ff695641ff958064ffd8cdbcfffcfcfcff17161cff251f22ff362c29ff4d3d34ff6b5845ff978268ffd9cfc0fffcfcfcff1a1923ff282228ff3a2f30ff50403bff6f5b4cff9a856fffddd2c7fffcfcfcff1f1e2eff2d2733ff3e343bff544546ff736057ff9f8a7affe1d7d2fffcfcfcff191513ff3c2f22ff7b684affe8e2d8ff1a1616ff3d3026ff7d694effe8e3d9ff1d191dff40332cff806c54ffeae4ddff231f2aff47393aff867262ffede8e4ff2a221cffb1a592ff31292bffb7aa9dff70665dff
29022902
m_StreamData:
29032903
serializedVersion: 2
29042904
offset: 0
@@ -4329,10 +4329,10 @@ MonoBehaviour:
43294329
mapSeedOffset: {x: -251, y: 150, z: 0}
43304330
GenerateMoreChunks: 1
43314331
gamma: 0
4332-
skyLightMultiplier: 0.9
4333-
blockLightMultiplier: 1.18
4334-
dayColor: {r: 0.46666667, g: 0.8156863, b: 0.9137255, a: 1}
4335-
nightColor: {r: 0.12591669, g: 0.22711694, b: 0.254717, a: 1}
4332+
skyLightMultiplier: 1
4333+
blockLightMultiplier: 1.5
4334+
dayColor: {r: 0.4745098, g: 0.6509804, b: 1, a: 1}
4335+
nightColor: {r: 0.14100002, g: 0.195, b: 0.3, a: 1}
43364336
worldName: gdfhdhd1
43374337
disabled: 0
43384338
binaryCompressSaves: 0
@@ -5746,7 +5746,7 @@ Camera:
57465746
m_Enabled: 1
57475747
serializedVersion: 2
57485748
m_ClearFlags: 2
5749-
m_BackGroundColor: {r: 0.43259168, g: 0.7568293, b: 0.84782463, a: 1}
5749+
m_BackGroundColor: {r: 0.4745098, g: 0.6509804, b: 1, a: 1}
57505750
m_projectionMatrixMode: 1
57515751
m_GateFitMode: 2
57525752
m_FOVAxisMode: 0
@@ -6232,8 +6232,8 @@ MonoBehaviour:
62326232
m_EditorClassIdentifier:
62336233
lightTexture: {fileID: 1019117329}
62346234
gamma: 0
6235-
skyLightMultiplier: 0.9
6236-
blockLightMultiplier: 1.18
6235+
skyLightMultiplier: 0.145
6236+
blockLightMultiplier: 1.5
62376237
--- !u!4 &1951370242
62386238
Transform:
62396239
m_ObjectHideFlags: 0

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

Lines changed: 86 additions & 9 deletions
Large diffs are not rendered by default.

Assets/_Scripts/F3DebugMenuManger.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public bool CheckForDebugControls()
4444
{
4545
if (Input.GetKeyDown(KeyCode.KeypadPlus))
4646
{
47-
World.Instance.skyLightMultiplier = Mathf.Clamp(World.Instance.skyLightMultiplier+0.1f,0,0.9f);
47+
World.Instance.skyLightMultiplier = Mathf.Clamp(World.Instance.skyLightMultiplier+0.1f,0.15F,1f);
4848
World.Instance.UpadteLightTexture();
4949
}
5050
if (Input.GetKeyDown(KeyCode.KeypadMinus))
5151
{
52-
World.Instance.skyLightMultiplier = Mathf.Clamp(World.Instance.skyLightMultiplier-0.1f,0,0.9f);;
52+
World.Instance.skyLightMultiplier = Mathf.Clamp(World.Instance.skyLightMultiplier-0.1f,0.15F,1f);;
5353
World.Instance.UpadteLightTexture();
5454
}
5555

Assets/_Scripts/World/LightTextureCreator.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public static void CreateLightTexture()
1818

1919
public static void GenerateLightMapColors()
2020
{
21+
Vector3 vector3f = new Vector3(skyLightMultiplier, skyLightMultiplier, 1f);
22+
vector3f = WeirdLerp(vector3f, Vector3.one, 0.35f);
2123
for (var k = 0; k < 16; ++k) {
2224
for (var l = 0; l < 16; ++l) {
2325
float n;
@@ -27,7 +29,7 @@ public static void GenerateLightMapColors()
2729
var q = n * (n * n * 0.6f + 0.4f);
2830
var vector3f2 = new Vector3(o, p, q);
2931

30-
Vector3 vector3f3 = Vector3.one;
32+
Vector3 vector3f3 = vector3f;
3133
vector3f3 *= m;
3234
vector3f2 += vector3f3;
3335
vector3f2 = Vector3.Lerp(vector3f2, new Vector3(0.75f, 0.75f, 0.75f), 0.04f);
@@ -54,6 +56,16 @@ public static void GenerateLightMapColors()
5456
}
5557
}
5658

59+
public static Vector3 WeirdLerp(Vector3 v1, Vector3 v2, float delta)
60+
{
61+
float f = 1 - delta;
62+
v1.x = v1.x * f + v2.x * delta;
63+
v1.y = v1.y * f + v2.y * delta;
64+
v1.z = v1.z * f + v2.z * delta;
65+
66+
return v1;
67+
}
68+
5769
public static float modifyVector(float f)
5870
{
5971
float g = 1.0f - f;

Assets/_Scripts/World/LightTextureVisualizer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public class LightTextureVisualizer : MonoBehaviour
44
{
55
public Texture2D lightTexture;
66
[Range(0, 1)] public float gamma;
7+
[Range(0.15f, 1)]
78
public float skyLightMultiplier = 0.75f;
89
public float blockLightMultiplier = 1.5f;
910

Assets/_Scripts/World/World.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ public partial class World : MonoBehaviour
3636
[Header("Lighting")]
3737
[Range(0, 1)]
3838
public float gamma = 0.0f;
39+
[Range(0.15f, 1)]
3940
public float skyLightMultiplier = 0.75f;
40-
public float blockLightMultiplier = 1.18f;
41+
public float blockLightMultiplier = 1.5f;
4142
[Space]
4243
public Color dayColor;
4344
public Color nightColor;

Assets/_Scripts/World/World_UpdateLoop.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void AddChunkToUpdate(ChunkRenderer chunk, bool first = false)
5656
private void Update()
5757
{
5858
//TODO: remove this because it is slow
59-
Camera.main.backgroundColor = Color.Lerp(nightColor,dayColor , skyLightMultiplier);
59+
Camera.main.backgroundColor = Color.Lerp(nightColor,dayColor , skyLightMultiplier*(1+1/9f));
6060

6161
// if (Input.GetKeyDown(KeyCode.L))
6262
// {

0 commit comments

Comments
 (0)