Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rendering/sky box v2 sun moon and stars #207

Merged
merged 21 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d9b0b24
Calibration of SkyBox sun coord, addition of BSC5 stars
GBirch33 Nov 8, 2023
1b0445f
Compute vs Pixel shader star rendering.
GBirch33 Nov 10, 2023
1abb161
Create an utility to hot reload compute shaders
mikhail-dcl Nov 13, 2023
8ae7078
TimeOfDay - Skybox
GBirch33 Dec 7, 2023
245beac
Moon and TOD fixes
GBirch33 Dec 13, 2023
0dfb06f
Arrange SkyBox according to the architecture
mikhail-dcl Dec 15, 2023
5fb391e
Merge remote-tracking branch 'origin/main' into Rendering/SkyBoxV2_Su…
mikhail-dcl Dec 15, 2023
aec90ef
Fix after merge
mikhail-dcl Dec 15, 2023
ec571d4
Possible Compute Shader fix
GBirch33 Dec 15, 2023
f1f1799
Computer shader instantiation alterations
GBirch33 Dec 15, 2023
b492d3f
Merge branch 'main' into Rendering/SkyBoxV2_SunMoonAndStars
mikhail-dcl Dec 15, 2023
361101f
Merge remote-tracking branch 'origin/main' into Rendering/SkyBoxV2_Su…
mikhail-dcl Dec 26, 2023
b746b98
Fix after merge
mikhail-dcl Dec 26, 2023
015cb30
Move SkyBox to the namespace
mikhail-dcl Dec 26, 2023
0d6c7fe
Fix Light Rotation
mikhail-dcl Jan 8, 2024
2c34362
Fix Moon Position
mikhail-dcl Jan 8, 2024
c0f7edb
Skybox horizon edge fix
GBirch33 Jan 8, 2024
61e8d00
Merge branch 'main' into Rendering/SkyBoxV2_SunMoonAndStars
mikhail-dcl Jan 8, 2024
7e80b39
Fix asm and nullable after the merge
mikhail-dcl Jan 8, 2024
3d00e44
Merge branch 'main' into Rendering/SkyBoxV2_SunMoonAndStars
m3taphysics Jan 8, 2024
0970237
Merge branch 'main' into Rendering/SkyBoxV2_SunMoonAndStars
mikhail-dcl Jan 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 4 additions & 40 deletions Explorer/Assets/DCL/InfiniteFloor/Floor.mat
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,14 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AlphaTextureArr:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 2800000, guid: adac04f1d8e4f7d4ba258226a05fcddf, type: 3}
m_Scale: {x: 400, y: 400}
m_Offset: {x: 0, y: 0}
- _BaseMapArr:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMapArr:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -76,10 +64,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMapArr:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FresnelMatCap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -104,10 +88,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMapArr:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -132,15 +112,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints:
- _AlphaTextureArr_ID: -1
- _BaseMapArr_ID: -1
- _BumpMapArr_ID: -1
- _EmissionMapArr_ID: -1
- _MetallicGlossMapArr_ID: -1
- _OcclusionMapArr_ID: -1
- _lastAvatarVertCount: -1
- _lastWearableVertCount: -1
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
Expand All @@ -155,10 +127,6 @@ Material:
- _Cutoff: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DiffuseRampInnerMax: 1
- _DiffuseRampInnerMin: 0
- _DiffuseRampOuterMax: 1
- _DiffuseRampOuterMin: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EmissiveMapUVs: 0
Expand All @@ -181,23 +149,19 @@ Material:
- _Smoothness: 0.322
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SpecularRampInnerMax: 1
- _SpecularRampInnerMin: 0
- _SpecularRampOuterMax: 1
- _SpecularRampOuterMin: 0
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Thickness: 0.00261
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BackgroundColor: {r: 0, g: 0, b: 0, a: 1}
- _BackgroundColor: {r: 0.7647059, g: 0.654902, b: 0.68100697, a: 0.36078432}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _MainColor: {r: 0, g: 0, b: 0, a: 1}
- _MainColor: {r: 0.5, g: 1, b: 1, a: 1}
- _PlaneClipping: {r: -2.1474836e+9, g: 2.1474836e+9, b: -2.1474836e+9, a: 2.1474836e+9}
- _SecondaryColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public static DebugUtilitiesContainer Create(DebugViewsCatalog viewsCatalog)
{ typeof(DebugFloatFieldDef), new DebugElementBase<DebugFloatFieldElement, DebugFloatFieldDef>.Factory(viewsCatalog.FloatField) },
{ typeof(DebugHintDef), new DebugElementBase<DebugHintElement, DebugHintDef>.Factory(viewsCatalog.Hint) },
{ typeof(DebugIntFieldDef), new DebugElementBase<DebugIntFieldElement, DebugIntFieldDef>.Factory(viewsCatalog.IntField) },
{ typeof(DebugIntSliderDef), new DebugElementBase<DebugIntSliderElement, DebugIntSliderDef>.Factory(viewsCatalog.IntSlider) },
{ typeof(DebugVector2IntFieldDef), new DebugElementBase<DebugVector2IntFieldElement, DebugVector2IntFieldDef>.Factory(viewsCatalog.Vector2IntField) },
{ typeof(DebugLongMarkerDef), new DebugElementBase<DebugLongMarkerElement, DebugLongMarkerDef>.Factory(viewsCatalog.LongMarker) },
{ typeof(DebugSetOnlyLabelDef), new DebugElementBase<DebugSetOnlyLabelElement, DebugSetOnlyLabelDef>.Factory(viewsCatalog.SetOnlyLabel) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ public class DebugViewsCatalog
[field: SerializeField]
public VisualTreeAsset IntField { get; private set; }

[field: SerializeField]
public VisualTreeAsset IntSlider { get; private set; }

[field: SerializeField]
public VisualTreeAsset FloatField { get; private set; }

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using DCL.DebugUtilities.UIBindings;

namespace DCL.DebugUtilities
{
public class DebugIntSliderDef : DebugIntFieldDef
{
public readonly int Min;
public readonly int Max;

public DebugIntSliderDef(ElementBinding<int> binding, int min, int max) : base(binding)
{
Min = min;
Max = max;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<DCL.DebugUtilities.Views.DebugIntSliderElement style="align-self: stretch;">
<ui:SliderInt picking-mode="Ignore" value="38" high-value="100" inverted="false" show-input-field="true" />
</DCL.DebugUtilities.Views.DebugIntSliderElement>
</ui:UXML>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using UnityEngine.UIElements;

namespace DCL.DebugUtilities.Views
{
public class DebugIntSliderElement : DebugElementBase<DebugIntSliderElement, DebugIntSliderDef>
{
public new class UxmlFactory : UxmlFactory<DebugIntSliderElement, UxmlTraits> { }

protected override void ConnectBindings()
{
SliderInt sliderInt = this.Q<SliderInt>();

sliderInt.lowValue = definition.Min;
sliderInt.highValue = definition.Max;

definition.Binding.Connect(sliderInt);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

134 changes: 68 additions & 66 deletions Explorer/Assets/DCL/PluginSystem/DCL.Plugins.asmdef
Original file line number Diff line number Diff line change
@@ -1,68 +1,70 @@
{
"name": "DCL.Plugins",
"rootNamespace": "",
"references": [
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:9e314663ce958b746873cb22d57ede55",
"GUID:84651a3751eca9349aac36a66bba901b",
"GUID:593a5b492d29ac6448b1ebf7f035ef33",
"GUID:c80c82a8f4e04453b85fbab973d6774a",
"GUID:0f4c0f120707fb74497f5d581b9858f8",
"GUID:d414ef88f3b15f746a4b97636b50dfb4",
"GUID:4307f53044263cf4b835bd812fc161a4",
"GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
"GUID:007bff6000804d90ac597452fb69a4ee",
"GUID:ac3295688c7c22745a96e6ac34718181",
"GUID:75469ad4d38634e559750d17036d5f7c",
"GUID:101b8b6ebaf64668909b49c4b7a1420d",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:286980af24684da6acc1caa413039811",
"GUID:3c7b57a14671040bd8c549056adc04f5",
"GUID:8322ea9340a544c59ddc56d4793eac74",
"GUID:5eabe9a3d4dd19d42a16208ea5411062",
"GUID:d8b63aba1907145bea998dd612889d6b",
"GUID:d0ec51c740809fd4680d3ea27279dca7",
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:e0cd26848372d4e5c891c569017e11f1",
"GUID:0b3eab7834a09c24ca4e84fe0d8a43ce",
"GUID:96825943f4e14954b5172da80fdee63d",
"GUID:9f890bfbf13e43c481227c49a4e6cb11",
"GUID:e0eedfa2deb9406daf86fd8368728e39",
"GUID:78e0b5197588c4841a6544409324031c",
"GUID:e37c129839591a044b0819431bee5cb5",
"GUID:45f6fff651a0a514f8edfdaf9cce45af",
"GUID:9ca29a7d75ab84bab806a20bbd350fd8",
"GUID:3b1872af2b2224d8ab49d79a7efd4cf9",
"GUID:4725c02394ab4ce19f889e4e8001f989",
"GUID:56e8195b069a4dca9c4c4f313c65f526",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:d07d357721497c3469c49e00cf077f4d",
"GUID:275e22790c04e9b47a5085d7b0c4432a",
"GUID:913edaf513c8fc04b82cb1f01b93e20d",
"GUID:93de67908fd00d74fa58250a0deacd9f",
"GUID:4794e238ed0f65142a4aea5848b513e5",
"GUID:fb9aef3113f3505428c3576d8c32f8c4",
"GUID:006c0e0a70294dbba8a4cbcfb77e1f7d",
"GUID:1d75b3d8691c845b1a51082e81433dfc",
"GUID:d0d87470ef1844e08586dabeb6d672bd",
"GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
"GUID:1d2c76eb8b48e0b40940e8b31a679ce1",
"GUID:a7b31707bb5e04b20bfe1421647e6707",
"GUID:9b4463c7170cb485aaf17878a8b7281e",
"GUID:15bc5ce9b9f747c8a365e7dff4e2ebd7",
"GUID:393a5d2fbaa249d09c260018aaeb4fc0",
"GUID:db9f6ca714dd4f9b9755c0faa3a8f24c",
"GUID:6830e2f56251b492e9934f1fafbc8c7d",
"GUID:5ab29fa8ae5769b49ab29e390caca7a4"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
"name": "DCL.Plugins",
"rootNamespace": "",
"references": [
"GUID:9e24947de15b9834991c9d8411ea37cf",
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:9e314663ce958b746873cb22d57ede55",
"GUID:84651a3751eca9349aac36a66bba901b",
"GUID:593a5b492d29ac6448b1ebf7f035ef33",
"GUID:c80c82a8f4e04453b85fbab973d6774a",
"GUID:0f4c0f120707fb74497f5d581b9858f8",
"GUID:d414ef88f3b15f746a4b97636b50dfb4",
"GUID:4307f53044263cf4b835bd812fc161a4",
"GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
"GUID:007bff6000804d90ac597452fb69a4ee",
"GUID:ac3295688c7c22745a96e6ac34718181",
"GUID:75469ad4d38634e559750d17036d5f7c",
"GUID:101b8b6ebaf64668909b49c4b7a1420d",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:286980af24684da6acc1caa413039811",
"GUID:3c7b57a14671040bd8c549056adc04f5",
"GUID:8322ea9340a544c59ddc56d4793eac74",
"GUID:5eabe9a3d4dd19d42a16208ea5411062",
"GUID:d8b63aba1907145bea998dd612889d6b",
"GUID:d0ec51c740809fd4680d3ea27279dca7",
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:e0cd26848372d4e5c891c569017e11f1",
"GUID:0b3eab7834a09c24ca4e84fe0d8a43ce",
"GUID:96825943f4e14954b5172da80fdee63d",
"GUID:9f890bfbf13e43c481227c49a4e6cb11",
"GUID:e0eedfa2deb9406daf86fd8368728e39",
"GUID:78e0b5197588c4841a6544409324031c",
"GUID:e37c129839591a044b0819431bee5cb5",
"GUID:45f6fff651a0a514f8edfdaf9cce45af",
"GUID:9ca29a7d75ab84bab806a20bbd350fd8",
"GUID:3b1872af2b2224d8ab49d79a7efd4cf9",
"GUID:4725c02394ab4ce19f889e4e8001f989",
"GUID:56e8195b069a4dca9c4c4f313c65f526",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:d07d357721497c3469c49e00cf077f4d",
"GUID:275e22790c04e9b47a5085d7b0c4432a",
"GUID:913edaf513c8fc04b82cb1f01b93e20d",
"GUID:93de67908fd00d74fa58250a0deacd9f",
"GUID:4794e238ed0f65142a4aea5848b513e5",
"GUID:fb9aef3113f3505428c3576d8c32f8c4",
"GUID:006c0e0a70294dbba8a4cbcfb77e1f7d",
"GUID:1d75b3d8691c845b1a51082e81433dfc",
"GUID:d0d87470ef1844e08586dabeb6d672bd",
"GUID:4a12c0b1b77ec6b418a8d7bd5c925be3",
"GUID:1d2c76eb8b48e0b40940e8b31a679ce1",
"GUID:a7b31707bb5e04b20bfe1421647e6707",
"GUID:9b4463c7170cb485aaf17878a8b7281e",
"GUID:15bc5ce9b9f747c8a365e7dff4e2ebd7",
"GUID:571dc9f8bded0034f98595106462e3d0",
"GUID:15fc0a57446b3144c949da3e2b9737a9",
"GUID:393a5d2fbaa249d09c260018aaeb4fc0",
"GUID:5ab29fa8ae5769b49ab29e390caca7a4",
"GUID:db9f6ca714dd4f9b9755c0faa3a8f24c",
"GUID:6830e2f56251b492e9934f1fafbc8c7d"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
Loading
Loading