Box object lambertian lighting

Author: NicusorN5

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Frontend/AssetRenderer.cpp

@@ -27,15 +27,12 @@ template<> bool AssetRenderer(IGraphicsDevice *device, const std::string &imageP
 
 	if(device && model)
 	{
-		//std::shared_ptr<BasicTextured> shader = std::make_shared<BasicTextured>(device);
-
 		auto boundingSphere = model->GetBoundingSphere();
 		auto cmd = device->ImmediateContext();
 
 		for (auto&& n : iota(0, 3))
 		{
 			cmd->Clear(Colors::Gray);
-			//model->SetShader(shader);
 			model->Draw(
 				Matrix4x4() *
 				Matrix4x4::CreateLookAtView(
@@ -82,8 +79,31 @@ bool AssetRenderer(IGraphicsDevice* device, const std::string& imagePath, FontAs
 }
 
 template<>
-bool AssetRenderer(IGraphicsDevice* device, const std::string& imagePath, Engine3DRadSpace::Content::Assets::SkyboxAsset* path)
+bool AssetRenderer(IGraphicsDevice* device, const std::string& imagePath, SkyboxAsset* skyboxAsset)
 {
-	//TODO.
-	return true;
+	auto skybox = skyboxAsset->Get();
+
+	skybox->View = Matrix4x4::CreateLookAtView(
+		Vector3(-1, 0, -1),
+		Vector3::Zero(),
+		Vector3::UnitY()
+	);
+
+	skybox->Projection = Matrix4x4::CreatePerspectiveProjection(4.f / 3.f, 65, 0.01f, 500.0f);
+
+	if (device && skybox)
+	{
+		auto cmd = device->ImmediateContext();
+		 
+		for (auto&& n : std::ranges::views::iota(0, 3))
+		{
+			cmd->Clear();
+			skybox->Draw3D();
+			cmd->Present();
+		}
+
+		cmd->SaveBackBufferToFile(imagePath);
+		return true;
+	}
+	return false;
 }

3DRadSpace/Data/Shaders/Lambert_PositionNormal.hlsl

@@ -1,12 +1,9 @@
-cbuffer Data : register(b0)
+cbuffer AllData : register(b0)
 {
-    row_major matrix matWorldViewProj; // MVP transformation
+    row_major matrix matWorldViewProj;        // MVP transformation
     row_major matrix matWorldInverseTranspose;
-}
-
-cbuffer DirectionalLight : register(b1)
-{
     float4 LightColor;
+    float4 AmbientColor;
     float3 LightDirection;
     float Intensity;
 }
@@ -36,5 +33,6 @@ VertexOut VS_Main(VertexIn v)
 
 float4 PS_Main(VertexOut v) : SV_TARGET
 {
-    return v.Color * LightColor * Intensity * max(0, dot(normalize(v.Normal), -LightDirection));
+    float diffuse = max(0, dot(normalize(v.Normal), -LightDirection));
+    return v.Color * (AmbientColor + LightColor * Intensity * diffuse);
 }

3DRadSpace/Engine3DRadSpace/Graphics/Primitives/Box.cpp

@@ -91,9 +91,10 @@ std::array<unsigned, 36> Box::CreateIndices()
 }
 
 Box::Box(IGraphicsDevice *device, const BoundingBox&b, Color color) :
-    IPrimitive(device, nullptr),
-    _box(b),
-    _color(color)
+	IPrimitive(device, nullptr),
+	_box(b),
+	_color(color),
+	Light{ Colors::White, Color(color.R * 0.15f, color.G * 0.15f, color.B * 0.15f, 1.0f), Vector3(0,-1,0), 1.0f }
 {
     auto box_vertices = CreateVertices(b, color);
     _vertices = device->CreateVertexBuffer<VertexPositionNormalColor>(box_vertices, BufferUsage::ReadOnlyGPU);
@@ -153,6 +154,35 @@ void Box::SetColor(const Color&color)
 
 void Box::Draw3D()
 {
-    _shader->operator[](1)->SetData(0, &Light, sizeof(Light));
-    IPrimitive::Draw3D();
+    struct alignas(16) AllDataBuffer
+    {
+        Matrix4x4 MatWorldViewProj;
+        Matrix4x4 MatWorldInverseTranspose;
+        Vector4   LightColor;
+        Vector4   AmbientColor;
+        Vector3   LightDirection;
+        float     Intensity;
+    };
+
+    Matrix4x4 mvp = _mvp();
+    Matrix4x4 worldInverseTranspose = Matrix4x4::Transpose(Matrix4x4::Invert(Transform));
+
+    AllDataBuffer data =
+    {
+        mvp,
+        worldInverseTranspose,
+        Vector4(Light.LightColor.R,   Light.LightColor.G,   Light.LightColor.B,   Light.LightColor.A),
+        Vector4(Light.AmbientColor.R, Light.AmbientColor.G, Light.AmbientColor.B, Light.AmbientColor.A),
+        Light.LightDirection,
+        Light.Intensity
+    };
+
+    // Upload to cbuffer slot 0 on every shader stage before binding
+    _shader->SetData(&data, 0);
+
+    _shader->SetAll();
+
+    auto cmd = _device->ImmediateContext();
+    cmd->SetTopology(VertexTopology::TriangleList);
+    cmd->DrawVertexBufferWithindices(_vertices.get(), _indices.get());
 }

3DRadSpace/Engine3DRadSpace/Graphics/Rendering/DirectionalLight.hpp

@@ -7,6 +7,7 @@ namespace Engine3DRadSpace::Graphics::Rendering
     struct DirectionalLight
     {
         Math::Color LightColor;
+        Math::Color AmbientColor;
         Math::Vector3 LightDirection;
         float Intensity;
     };