Fix billboards.

Author: NicusorN5

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Editor/EditorGame.cpp

@@ -152,6 +152,12 @@ void EditorGame::Load()
 		RectangleF(btnSize * 8, 0.0f, btnSize, btnSize),
 		RectangleF(0.0f, 0.5f, 0.25f, 0.25f)
 	);
+
+	billboard = std::make_unique<CilindricalBillboard>(Device.get());
+	billboard->Texture = _btnSpritesheet.get();
+	billboard->Axis = Vector3::UnitY();
+	billboard->Scale = Vector2(1.0f, 1.0f);
+	billboard->Transform = Matrix4x4::CreateScale(1.5f) * Matrix4x4::CreateTranslation(Vector3(2, 2, 0));
 }
 
 void EditorGame::_controlCamera()
@@ -401,6 +407,10 @@ void EditorGame::Draw3D()
 	axis->Projection = Projection;
 	axis->Draw3D();
 
+	billboard->View = View;
+	billboard->Projection = Projection;
+	billboard->Draw3D();
+
 	if (Settings::ShowGrid.Value)
 	{
 		grid->View = View;

3DRadSpace/3DRadSpace_Editor_WindowsDX11/Editor/EditorGame.hpp

@@ -8,6 +8,7 @@
 #include <Engine3DRadSpace/Graphics/Primitives/LineList.hpp>
 #include <Engine3DRadSpace/Graphics/Primitives/Arrow.hpp>
 #include <Engine3DRadSpace/Graphics/Font.hpp>
+#include <Engine3DRadSpace/Graphics/Primitives/CilindricalBillboard.hpp>
 
 //Despite using namespaces are ill-advised to be used in headers, this header is not meant to be included in other files.
 using namespace Engine3DRadSpace;
@@ -42,7 +43,7 @@ class EditorGame : public Engine3DRadSpace::Game
 	IObject* _selectedObject = nullptr;
 
 	std::unique_ptr<ITexture2D> _btnSpritesheet;
-	//std::unique_ptr<CilindricalBillboard> billboard;
+	std::unique_ptr<CilindricalBillboard> billboard;
 
 	Button btnMvX;
 	Button btnMvY;

3DRadSpace/Data/Shaders/PositionUV.hlsl

@@ -0,0 +1,32 @@
+cbuffer Data : register(b0)
+{
+    row_major matrix matWorldViewProj; // MVP transformation
+}
+
+Texture2D TextureModel : register(t0);
+SamplerState TextureSampler : register(s0);
+
+struct VertexIn
+{
+    float3 Position : POSITION;
+	float2 UV : TEXCOORD;
+};
+
+struct VertexOut
+{
+    float4 Position : SV_POSITION;
+    float2 UV: TEXCOORD;
+};
+
+VertexOut VS_Main(VertexIn v)
+{
+    VertexOut r;
+    r.Position = mul(float4(v.Position.xyz,1), matWorldViewProj);
+	r.UV = v.UV;
+    return r;
+}
+
+float4 PS_Main(VertexOut v) : SV_TARGET
+{
+    return TextureModel.Sample(TextureSampler, v.UV);
+}

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

@@ -1,6 +1,8 @@
 #include "CilindricalBillboard.hpp"
 #include "Plane.hpp"
 #include "../IGraphicsCommandList.hpp"
+#include "../IShaderCompiler.hpp"
+#include "../../Logging/Exception.hpp"
 
 using namespace Engine3DRadSpace;
 using namespace Engine3DRadSpace::Graphics;
@@ -13,50 +15,76 @@ CilindricalBillboard::CilindricalBillboard(IGraphicsDevice *device) :
 {
 	auto vertices = CreateVertices();
 	_vertices = device->CreateVertexBuffer<VertexPositionUV>(vertices, BufferUsage::ReadOnlyGPU);
-	
-	auto indices = Plane::CreateIndices();
+
+	auto indices = CreateIndices();
 	_indices = device->CreateIndexBuffer(indices);
+
+	ShaderDescFile vtx("Data\\Shaders\\PositionUV.hlsl", "VS_Main", ShaderType::Vertex);
+	ShaderDescFile frg("Data\\Shaders\\PositionUV.hlsl", "PS_Main", ShaderType::Fragment);
+
+	std::array<ShaderDesc*, 2> shaders = { &vtx, &frg };
+
+	auto effect = device->ShaderCompiler()->CompileEffect(shaders);
+	if (effect.first)
+	{
+		_shader = effect.first;
+	}
+	else
+	{
+		throw Logging::Exception(std::format("Failed to compile effect for CilindricalBillboard: {}", effect.second.Log));
+	}
 }
 
 Matrix4x4 CilindricalBillboard::_mvp() const noexcept
 {
 	auto v = View;
+	auto v_inv = v;
+	v_inv.Invert();
 
-	Vector3 cam_pos(v.M41, v.M42, v.M43);
+	Vector3 cam_pos(v_inv.M41, v_inv.M42, v_inv.M43);
 	Vector3 x_axis(v.M11, v.M21, v.M31);
-	Vector3 y_axis(v.M11, v.M21, v.M31);
-	Vector3 z_axis(v.M11, v.M21, v.M31);
-	
-	Vector3 fwd = cam_pos + z_axis;
+	Vector3 y_axis(v.M12, v.M22, v.M32);
+	Vector3 z_axis(v.M13, v.M23, v.M33);
+
 	Vector3 up = cam_pos + y_axis;
-	Vector3 right = cam_pos + x_axis;
+	Vector3 fwd = cam_pos - z_axis;
 
-	auto model = Matrix4x4::CreateCylindricalBillboard(Position, cam_pos, up, fwd, Axis, std::nullopt);
-	return model * View * Projection;
+	// Use Position field if set, otherwise extract from Transform
+	Vector3 objectPos = (Position != Vector3::Zero()) ? Position : Vector3(Transform.M41, Transform.M42, Transform.M43);
+	auto model = Matrix4x4::CreateCylindricalBillboard(objectPos, cam_pos, up, fwd, Axis, std::nullopt);
+	return model * v * Projection;
 }
 
 std::array<VertexPositionUV, 4> CilindricalBillboard::CreateVertices()
 {
 	std::array<VertexPositionUV, 4> plane;
 
-	Vector2 s(0.5f);
+	Vector2 s(0.5f, 0.5f);
 
-	//See Plane.cpp
-	plane[0] = VertexPositionUV(Vector3(-s.X, 0, -s.Y), Vector2(0,1));
-	plane[1] = VertexPositionUV(Vector3(-s.X, 0, +s.Y), Vector2(0,0));
-	plane[2] = VertexPositionUV(Vector3(+s.X, 0, +s.Y), Vector2(0,1));
-	plane[3] = VertexPositionUV(Vector3(+s.X, 0, -s.Y), Vector2(1,1));
+	//Billboard in XY plane, will be rotated by cylindrical billboard matrix
+	plane[0] = VertexPositionUV(Vector3(-s.X, -s.Y, 0), Vector2(0, 1));
+	plane[1] = VertexPositionUV(Vector3(-s.X, +s.Y, 0), Vector2(0, 0));
+	plane[2] = VertexPositionUV(Vector3(+s.X, +s.Y, 0), Vector2(1, 0));
+	plane[3] = VertexPositionUV(Vector3(+s.X, -s.Y, 0), Vector2(1, 1));
 
 	return plane;
 }
 
+std::array<unsigned, 6> CilindricalBillboard::CreateIndices()
+{
+	//Counter-clockwise winding for camera-facing billboard (reversed from Plane for proper facing).
+	return { 0, 2, 1, 0, 3, 2 };
+}
+
 void CilindricalBillboard::Draw3D()
 {
 	auto mat = _mvp();
 
 	_shader->SetAll();
 	_shader->operator[](0)->SetData(0, &mat, sizeof(mat));
 	_shader->operator[](1)->SetTexture(0, Texture);
-	_device->ImmediateContext()->DrawVertexBufferWithindices(_vertices.get(), _indices.get());
+	auto cmdList = _device->ImmediateContext();
+	cmdList->SetTopology(VertexTopology::TriangleList);
+	cmdList->DrawVertexBufferWithindices(_vertices.get(), _indices.get());
 }
 

3DRadSpace/Engine3DRadSpace/Graphics/Primitives/CilindricalBillboard.hpp

@@ -19,14 +19,15 @@ namespace Engine3DRadSpace::Graphics::Primitives
 		/// Camera projection matrix.
 		/// </summary>
 		Math::Matrix4x4 Projection;
-	
-		Math::Vector3 Position;
+
+		Math::Vector3 Position = Math::Vector3::Zero();
 		Math::Vector2 Scale = Math::Vector2::One();
 		Math::Vector3 Axis = Math::Vector3::UnitY();
-	
+
 		ITexture2D* Texture;
 
 		static std::array<VertexPositionUV, 4> CreateVertices();
+		static std::array<unsigned, 6> CreateIndices();
 
 		void Draw3D() override;
 

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

@@ -11,15 +11,20 @@ SphericalBillboard::SphericalBillboard(IGraphicsDevice* device) : CilindricalBil
 
 Matrix4x4 SphericalBillboard::_mvp() const noexcept
 {
-	Vector3 cam_pos(-View.M41, -View.M42, -View.M43);
-	Vector3 x_axis(View.M11, View.M21, View.M31);
-	Vector3 y_axis(View.M11, View.M21, View.M31);
-	Vector3 z_axis(View.M11, View.M21, View.M31);
+	auto v = View;
+	auto v_inv = v;
+	v_inv.Invert();
+
+	Vector3 cam_pos(v_inv.M41, v_inv.M42, v_inv.M43);
+	Vector3 x_axis(v.M11, v.M21, v.M31);
+	Vector3 y_axis(v.M12, v.M22, v.M32);
+	Vector3 z_axis(v.M13, v.M23, v.M33);
 
 	Vector3 fwd = cam_pos + z_axis;
 	Vector3 up = cam_pos + y_axis;
-	Vector3 right = cam_pos + x_axis;
 
-	auto model = Matrix4x4::CreateSphericalBillboard(Position, cam_pos, up, fwd);
+	// Use Position field if set, otherwise extract from Transform
+	Vector3 objectPos = (Position != Vector3::Zero()) ? Position : Vector3(Transform.M41, Transform.M42, Transform.M43);
+	auto model = Matrix4x4::CreateSphericalBillboard(objectPos, cam_pos, up, fwd);
 	return model * View * Projection;
 }