Cleanup shader class

Editor/Source/Layers/EditorLayer.cpp

@@ -33,10 +33,7 @@ void EditorLayer::OnAttach()
 		Ui::Gizmo(selected->Transform(), camera.View(), camera.Projection(), _gizmoControl);
 		return false;
 	};
-
-	_texture = Texture::Create("Assets/Textures/Milkyway/Milkyway_small.hdr");
-
-
+
 	App::Instance().Window().GainedFocus += []
 	{
 		for (auto& shader : ShaderStore::GetAll())
@@ -93,7 +90,6 @@ void EditorLayer::OnUi()
 	ImGui::End();
 
 	ImGui::Begin("Editor");
-	Ui::Image(*_texture);
 	if (ImGui::RadioButton("Translate", _gizmoControl == GizmoControl::Translate))
 	{
 		_gizmoControl = GizmoControl::Translate;

Editor/Source/Layers/EditorLayer.h

@@ -26,7 +26,5 @@ class EditorLayer : public Layer
 	ViewportPanel _depthViewportPanel;
 
 	GizmoControl _gizmoControl = GizmoControl::Translate;
-
-	std::shared_ptr<Texture> _texture;
 };
 }

Engine/Assets/Shaders/EquirectangularToCubeMap_c.hlsl

@@ -0,0 +1,42 @@
+#include "Common_i.hlsl"
+
+
+Texture2D equirectangularTex : register(t0);
+RWTexture2DArray<float> cubemap : register(u0);
+
+SamplerState equirectSampler : register(s0);
+
+float3 GetCubeMapTexCoord(uint3 DTid)
+{
+    float width;
+    float height;
+    float elements;
+    cubemap.GetDimensions(width, height, elements);
+
+    float2 st = DTid.xy / float2(width, height);
+    float2 uv = 2.0 * float2(st.x, 1.0 - st.y) - float2(1.0, 1.0);
+
+    float3 ret;
+    if (DTid.z == 0)      ret = float3(1.0, uv.y, -uv.x);
+    else if (DTid.z == 1) ret = float3(-1.0, uv.y, uv.x);
+    else if (DTid.z == 2) ret = float3(uv.x, 1.0, -uv.y);
+    else if (DTid.z == 3) ret = float3(uv.x, -1.0, uv.y);
+    else if (DTid.z == 4) ret = float3(uv.x, uv.y, 1.0);
+    else if (DTid.z == 5) ret = float3(-uv.x, uv.y, -1.0);
+    return normalize(ret);
+}
+
+[numthreads(32, 32, 1)]
+void main( uint3 DTid : SV_DispatchThreadID )
+{
+    float3 cubeTC = GetCubeMapTexCoord(DTid);
+
+    // Calculate sampling coords for equirectangular texture
+	// https://en.wikipedia.org/wiki/Spherical_coordinate_system#Cartesian_coordinates
+    float phi = atan2(cubeTC.z, cubeTC.x);
+    float theta = acos(cubeTC.y);
+    float2 uv = float2(phi / (2.0 * Pi) + 0.5, theta / Pi);
+
+    float4 color = { 0.0, 0.0, 0.0, 0.0 };
+    cubemap[DTid] = color;
+}

Engine/Assets/Shaders/MeshShader_p.hlsl

@@ -152,6 +152,14 @@ float3 CalculatePointLights(float3 F0, in PBR_Data pbrData, float3 pixelWorldPos
     return gammaCorr;
 }
 
+const float2 invAtan = float2(0.1591, 0.3183);
+float2 SampleSphericalMap(float3 v)
+{
+    float2 uv = float2(atan2(v.z, v.x), asin(v.y));
+    uv *= invAtan;
+    uv += 0.5;
+    return uv;
+}
 
 float4 main(PsInput input) : SV_TARGET
 {

Engine/Assets/Textures/GrandCanyon_C_YumaPoint/GrandCanyon_C_YumaPoint.ibl

@@ -0,0 +1,46 @@
+[Header]
+ICOfile = "GCanyon_C_YumaPoint_Thumb.jpg"
+PREVIEWfile = "GCanyon_C_YumaPoint_preview.jpg"
+Name = "Grand Canyon C"
+Author = "Blochi"
+Location = "Grand Canyon"
+Comment = "Bright daylight, high altitude, great for airplane renders"
+GEOlat = 36.08038998435272
+GEOlong = -112.22920417785645
+Link = "http://www.hdrlabs.com/sibl/archive.html"
+Date = "2008:11:28"
+Time = "12:55:00"
+Height = 100
+North = 0.41
+
+[Background]
+BGfile = "GCanyon_C_YumaPoint_8k.jpg"
+BGmap = 1
+BGu = 0.000000
+BGv = 0.000000
+BGheight = 4000
+
+[Enviroment]
+EVfile = "GCanyon_C_YumaPoint_Env.hdr"
+EVmap = 1
+EVu = 0.000000
+EVv = 0.000000
+EVheight = 180
+EVmulti = 1.000000
+EVgamma = 1.600000
+
+[Reflection]
+REFfile = "GCanyon_C_YumaPoint_3k.hdr"
+REFmap = 1
+REFu = 0.000000
+REFv = 0.000000
+REFheight = 1600
+REFmulti = 1.000000
+REFgamma = 1.600000
+
+[Sun]
+SUNcolor = 250,247,235
+SUNmulti = 1.000000
+SUNu = 0.824000
+SUNv = 0.376000
+

Engine/Source/Saffron/Graphics/Model.cpp

@@ -32,7 +32,7 @@ void Model::OnDebugUi()
 	ImGui::Begin("Model");
 	for (auto& cont : _textures)
 	{
-		auto type = ModelTextureMapType::Roughness;
+		auto type = ModelTextureMapType::Albedo;
 		if (cont[type] != nullptr)
 		{
 			Ui::Image(*cont[type]);

Engine/Source/Saffron/Graphics/ModelStore.cpp

@@ -338,6 +338,7 @@ auto ModelStore::ImportMaterial(
 		matTexContainer.emplace(ModelTextureMapType::Albedo, Renderer::WhiteTexture());
 	}
 
+
 	// Normal map
 	const auto hasNormalMap = aiMaterial.GetTexture(aiTextureType_NORMALS, 0, &aiTexPath) == AI_SUCCESS;
 	bool normalMapFallback = !hasNormalMap;

Engine/Source/Saffron/Graphics/Scene.cpp

@@ -19,6 +19,7 @@ Scene::Scene() :
 		-3.0f,
 		0.0f
 	);
+
 	constexpr int nBalls = 5;
 	for (int i = 0; i < nBalls; i++)
 	{
@@ -30,7 +31,7 @@ Scene::Scene() :
 			MaterialDataCBuf{Colors::Red, 0.0f, 0.00f, 1.0f, 0.0f, false}
 		);
 	}
-
+	
 	_cameraMesh = Model::Create("Sphere.fbx");
 
 	_pointLight.Position = Vector3{0.0f, 5.0f, 0.0f};
@@ -42,6 +43,9 @@ Scene::Scene() :
 		ViewportResized.Invoke(event);
 		return false;
 	};
+
+
+
 }
 
 void Scene::OnUpdate(TimeSpan ts)