From f54d64c6dd766989b6a1ca3021a28b857719761c Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 15:15:27 -0400 Subject: [PATCH 1/8] Added sprite component --- Editor/src/ComponentsPanel/SpritePanel.h | 73 +++++++++++++++++++ Editor/src/Windows/EditorSelectionPanel.cpp | 9 +-- Editor/src/Windows/EditorSelectionPanel.h | 4 +- Editor/src/Windows/FileSystemUI.cpp | 18 ++++- .../src/Scene/Components/SpriteComponent.cpp | 53 ++++++++++++++ Nuake/src/Scene/Components/SpriteComponent.h | 24 ++++++ Nuake/src/Scene/Entities/Entity.cpp | 29 +++++--- 7 files changed, 188 insertions(+), 22 deletions(-) create mode 100644 Editor/src/ComponentsPanel/SpritePanel.h create mode 100644 Nuake/src/Scene/Components/SpriteComponent.cpp create mode 100644 Nuake/src/Scene/Components/SpriteComponent.h diff --git a/Editor/src/ComponentsPanel/SpritePanel.h b/Editor/src/ComponentsPanel/SpritePanel.h new file mode 100644 index 00000000..5db42544 --- /dev/null +++ b/Editor/src/ComponentsPanel/SpritePanel.h @@ -0,0 +1,73 @@ +#pragma once +#include "ComponentPanel.h" + +#include +#include +#include +#include + + +class SpritePanel : ComponentPanel +{ +public: + SpritePanel() = default; + ~SpritePanel() = default; + + void Draw(Nuake::Entity entity) override + { + if (!entity.HasComponent()) + { + return; + } + + auto& component = entity.GetComponent(); + BeginComponentTable(SPRITE, Nuake::SpriteComponent); + { + { + ImGui::Text("Sprite"); + ImGui::TableNextColumn(); + + std::string path = component.SpritePath; + ImGui::Button(path.empty() ? "Drag image" : component.SpritePath.c_str(), ImVec2(ImGui::GetContentRegionAvail().x, 0)); + if (ImGui::BeginDragDropTarget()) + { + if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload("_Image")) + { + char* file = (char*)payload->Data; + + std::string fullPath = std::string(file, 512); + path = Nuake::FileSystem::AbsoluteToRelative(std::move(fullPath)); + component.SpritePath = path; + + component.LoadSprite(); + } + ImGui::EndDragDropTarget(); + } + + ImGui::TableNextColumn(); + ComponentTableReset(component.LockYRotation, false); + } + ImGui::TableNextColumn(); + { + ImGui::Text("Billboard"); + ImGui::TableNextColumn(); + + ImGui::Checkbox("##billboard", &component.Billboard); + ImGui::TableNextColumn(); + + ComponentTableReset(component.Billboard, false); + } + ImGui::TableNextColumn(); + { + ImGui::Text("Lock Y rotation"); + ImGui::TableNextColumn(); + + ImGui::Checkbox("##lockYRotation", &component.LockYRotation); + ImGui::TableNextColumn(); + + ComponentTableReset(component.LockYRotation, false); + } + } + EndComponentTable(); + } +}; \ No newline at end of file diff --git a/Editor/src/Windows/EditorSelectionPanel.cpp b/Editor/src/Windows/EditorSelectionPanel.cpp index b278e5cc..5822096c 100644 --- a/Editor/src/Windows/EditorSelectionPanel.cpp +++ b/Editor/src/Windows/EditorSelectionPanel.cpp @@ -14,13 +14,6 @@ EditorSelectionPanel::EditorSelectionPanel() { - mTransformPanel = TransformPanel(); - mLightPanel = LightPanel(); - mScriptPanel = ScriptPanel(); - mQuakeMapPanel = QuakeMapPanel(); - mCameraPanel = CameraPanel(); - mRigidbodyPanel = RigidbodyPanel(); - mBoxColliderPanel = BoxColliderPanel(); } void EditorSelectionPanel::ResolveFile(Ref file) @@ -100,6 +93,7 @@ void EditorSelectionPanel::DrawEntity(Nuake::Entity entity) mTransformPanel.Draw(entity); mLightPanel.Draw(entity); mScriptPanel.Draw(entity); + mSpritePanel.Draw(entity); mMeshPanel.Draw(entity); mQuakeMapPanel.Draw(entity); mCameraPanel.Draw(entity); @@ -129,6 +123,7 @@ void EditorSelectionPanel::DrawAddComponentMenu(Nuake::Entity entity) MenuItemComponent("Camera", Nuake::CameraComponent) MenuItemComponent("Light", Nuake::LightComponent) MenuItemComponent("Model", Nuake::ModelComponent) + MenuItemComponent("Sprite", Nuake::SpriteComponent) ImGui::Separator(); MenuItemComponent("Character Controller", Nuake::CharacterControllerComponent) MenuItemComponent("Rigid body", Nuake::RigidBodyComponent) diff --git a/Editor/src/Windows/EditorSelectionPanel.h b/Editor/src/Windows/EditorSelectionPanel.h index 88b2cd7b..847406ad 100644 --- a/Editor/src/Windows/EditorSelectionPanel.h +++ b/Editor/src/Windows/EditorSelectionPanel.h @@ -18,6 +18,8 @@ #include "../ComponentsPanel/SphereColliderPanel.h" #include "../ComponentsPanel/MeshColliderPanel.h" #include "../ComponentsPanel/CharacterControllerPanel.h" +#include "../ComponentsPanel/SpritePanel.h" + class EditorSelectionPanel { private: @@ -33,7 +35,7 @@ private: MeshColliderPanel mMeshColliderPanel; CapsuleColliderPanel mCapsuleColliderPanel; CylinderColliderPanel mCylinderColliderPanel; - + SpritePanel mSpritePanel; CharacterControllerPanel mCharacterControllerPanel; Ref currentFile; diff --git a/Editor/src/Windows/FileSystemUI.cpp b/Editor/src/Windows/FileSystemUI.cpp index 2e10a976..c1af61eb 100644 --- a/Editor/src/Windows/FileSystemUI.cpp +++ b/Editor/src/Windows/FileSystemUI.cpp @@ -211,28 +211,42 @@ namespace Nuake { Editor->Selection = EditorSelection(file); } + } - if (ImGui::BeginDragDropSource()) + if (ImGui::BeginDragDropSource()) { char pathBuffer[256]; std::strncpy(pathBuffer, file->GetAbsolutePath().c_str(), sizeof(pathBuffer)); std::string dragType; if (fileExtension == ".wren") + { dragType = "_Script"; + } else if (fileExtension == ".map") + { dragType = "_Map"; + } else if (fileExtension == ".obj" || fileExtension == ".mdl" || fileExtension == ".gltf" || fileExtension == ".md3" || fileExtension == ".fbx") + { dragType = "_Model"; + } else if (fileExtension == ".interface") + { dragType = "_Interface"; + } else if (fileExtension == ".prefab") + { dragType = "_Prefab"; + } + else if (fileExtension == ".png" || fileExtension == ".jpg") + { + dragType = "_Image"; + } ImGui::SetDragDropPayload(dragType.c_str(), (void*)(pathBuffer), sizeof(pathBuffer)); ImGui::Text(file->GetName().c_str()); ImGui::EndDragDropSource(); } - } const std::string hoverMenuId = std::string("item_hover_menu") + std::to_string(drawId); if (ImGui::IsItemHovered() && ImGui::IsMouseReleased(1)) diff --git a/Nuake/src/Scene/Components/SpriteComponent.cpp b/Nuake/src/Scene/Components/SpriteComponent.cpp new file mode 100644 index 00000000..414d99d3 --- /dev/null +++ b/Nuake/src/Scene/Components/SpriteComponent.cpp @@ -0,0 +1,53 @@ +#include "SpriteComponent.h" + +#include "src/Rendering/Textures/TextureManager.h" + +namespace Nuake +{ + SpriteComponent::SpriteComponent() : + Billboard(false), + LockYRotation(false), + SpritePath("") + { + + } + + bool SpriteComponent::LoadSprite() + { + const auto texture = TextureManager::Get()->GetTexture(SpritePath); + Sprite = texture; + return true; + } + + json SpriteComponent::Serialize() + { + BEGIN_SERIALIZE(); + SERIALIZE_VAL(Billboard) + SERIALIZE_VAL(LockYRotation) + SERIALIZE_VAL(SpritePath) + END_SERIALIZE(); + } + + bool SpriteComponent::Deserialize(const std::string& str) + { + BEGIN_DESERIALIZE(); + + if (j.contains("Billboard")) + { + Billboard = j["Billboard"]; + } + + if (j.contains("LockYRotation")) + { + LockYRotation = j["LockYRotation"]; + } + + if (j.contains("SpritePath")) + { + SpritePath = j["SpritePath"]; + LoadSprite(); + } + + return true; + } +} \ No newline at end of file diff --git a/Nuake/src/Scene/Components/SpriteComponent.h b/Nuake/src/Scene/Components/SpriteComponent.h new file mode 100644 index 00000000..97761f76 --- /dev/null +++ b/Nuake/src/Scene/Components/SpriteComponent.h @@ -0,0 +1,24 @@ +#pragma once +#include "src/Core/Core.h" +#include "src/Resource/Serializable.h" +#include "src/Rendering/Textures/Texture.h" + +namespace Nuake +{ + class SpriteComponent + { + public: + bool Billboard; + bool LockYRotation; + std::string SpritePath; + Ref Sprite; + + SpriteComponent(); + + public: + bool LoadSprite(); + + json Serialize(); + bool Deserialize(const std::string& str); + }; +} diff --git a/Nuake/src/Scene/Entities/Entity.cpp b/Nuake/src/Scene/Entities/Entity.cpp index 30c9583a..87dbca05 100644 --- a/Nuake/src/Scene/Entities/Entity.cpp +++ b/Nuake/src/Scene/Entities/Entity.cpp @@ -1,19 +1,21 @@ -#include "../Components/ParentComponent.h" #include "Entity.h" -#include "../Components/NameComponent.h" -#include "../Components/TransformComponent.h" -#include "../Components/CameraComponent.h" -#include "../Components/QuakeMap.h" -#include "../Components/LightComponent.h" -#include "../Components/QuakeMap.h" -#include "../Components/WrenScriptComponent.h" -#include "../Components/CharacterControllerComponent.h" -#include "../Components/RigidbodyComponent.h" -#include "src/Scene/Components/BSPBrushComponent.h" +#include "src/Scene/Components/ParentComponent.h" +#include "src/Scene/Components/NameComponent.h" +#include "src/Scene/Components/TransformComponent.h" +#include "src/Scene/Components/CameraComponent.h" +#include "src/Scene/Components/QuakeMap.h" +#include "src/Scene/Components/LightComponent.h" +#include "src/Scene/Components/QuakeMap.h" +#include "src/Scene/Components/WrenScriptComponent.h" +#include "src/Scene/Components/CharacterControllerComponent.h" +#include "src/Scene/Components/RigidbodyComponent.h" +#include "src/Scene/Components/BSPBrushComponent.h" #include "src/Scene/Components/Components.h" -#include +#include "src/Scene/Components/BoxCollider.h" #include "src/Scene/Components/CapsuleColliderComponent.h" +#include "src/Scene/Components/SpriteComponent.h" + namespace Nuake { @@ -37,6 +39,8 @@ namespace Nuake SERIALIZE_OBJECT_REF_LBL("VisibilityComponent", GetComponent()) if (HasComponent()) SERIALIZE_OBJECT_REF_LBL("CameraComponent", GetComponent()) + if (HasComponent()) + SERIALIZE_OBJECT_REF_LBL("SpriteComponent", GetComponent()) if (HasComponent()) SERIALIZE_OBJECT_REF_LBL("QuakeMapComponent", GetComponent()) if (HasComponent()) @@ -78,6 +82,7 @@ namespace Nuake } DESERIALIZE_COMPONENT(NameComponent) DESERIALIZE_COMPONENT(ParentComponent) + DESERIALIZE_COMPONENT(SpriteComponent) DESERIALIZE_COMPONENT(CameraComponent) DESERIALIZE_COMPONENT(QuakeMapComponent) DESERIALIZE_COMPONENT(LightComponent) From f7398d0224e829df8fdd7a1be54a3f2476ab50b8 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 15:15:36 -0400 Subject: [PATCH 2/8] Code cleanup --- Nuake/src/Core/Physics/DynamicWorld.cpp | 2 +- Nuake/src/Rendering/Shaders/Shader.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Nuake/src/Core/Physics/DynamicWorld.cpp b/Nuake/src/Core/Physics/DynamicWorld.cpp index 2db145bc..e3cce79f 100644 --- a/Nuake/src/Core/Physics/DynamicWorld.cpp +++ b/Nuake/src/Core/Physics/DynamicWorld.cpp @@ -331,7 +331,7 @@ namespace Nuake { // Create jolt ray const auto& fromJolt = JPH::Vec3(from.x, from.y, from.z); - const auto& toJolt = JPH::Vec3(to.x, to.y, to.z); + const auto& toJolt = JPH::Vec3(to.x , to.y, to.z); JPH::RayCast ray { fromJolt, toJolt - fromJolt }; JPH::AllHitCollisionCollector collector; _JoltPhysicsSystem->GetBroadPhaseQuery().CastRay(ray, collector); diff --git a/Nuake/src/Rendering/Shaders/Shader.cpp b/Nuake/src/Rendering/Shaders/Shader.cpp index 895eb8c5..17a7fa2d 100644 --- a/Nuake/src/Rendering/Shaders/Shader.cpp +++ b/Nuake/src/Rendering/Shaders/Shader.cpp @@ -26,6 +26,8 @@ namespace Nuake Source = newSource; ProgramId = newProgramId; + + return true; } // Bind the shader From fe9f69143982b787a1abfe18497d531f800e0d5e Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 15:15:53 -0400 Subject: [PATCH 3/8] Added billboard calculation --- Nuake/src/Rendering/Renderer.cpp | 40 +++++++++--------------- Nuake/src/Rendering/Renderer.h | 1 + Nuake/src/Rendering/SceneRenderer.cpp | 45 ++++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/Nuake/src/Rendering/Renderer.cpp b/Nuake/src/Rendering/Renderer.cpp index 25f86f4f..92c61628 100644 --- a/Nuake/src/Rendering/Renderer.cpp +++ b/Nuake/src/Rendering/Renderer.cpp @@ -22,6 +22,7 @@ namespace Nuake unsigned int depthFBO; Ref Renderer::CubeMesh; + Ref Renderer::QuadMesh; Shader* Renderer::m_Shader; Shader* Renderer::m_SkyboxShader; @@ -62,13 +63,14 @@ namespace Nuake 4, 5, 0, 0, 5, 1 }; - float QuadVertices[] = { - -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, - 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, - -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, - 1.0f, -1.0f, 0.0f, 1.0f, 0.0f, - -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, - 1.0f, 1.0f, 0.0f, 1.0f, 1.0f + std::vector QuadVertices + { + { Vector3(-1.0f, -1.0f, 0.0f), Vector2(0, 0), Vector3(0, 0, -1) }, + { Vector3(1.0f, 1.0f, 0.0f), Vector2(1.0f, 1.0f), Vector3(0, 0, -1) }, + { Vector3(-1.0f, 1.0f, 0.0f), Vector2(0.0f, 1.0f), Vector3(0, 0, -1) }, + { Vector3(1.0f, -1.0f, 0.0f), Vector2(1.0f, 0.0f), Vector3(0, 0, -1) }, + { Vector3(-1.0f, -1.0f, 0.0f), Vector2(0.0f, 0.0f), Vector3(0, 0, -1) }, + { Vector3(1.0f, 1.0f, 0.0f), Vector2(1.0f, 1.0f), Vector3(0, 0, -1) } }; @@ -84,24 +86,10 @@ namespace Nuake CubeMesh = CreateRef(); CubeMesh->AddSurface(CubeVertices, CubeIndices); CubeMesh->SetMaterial(material); - // Cube buffer - //CubeVertexArray = new VertexArray(); - //CubeVertexArray->Bind(); - //CubeVertexBuffer = new VertexBuffer(CubeVertices, sizeof(CubeVertices)); - // - VertexBufferLayout vblayout = VertexBufferLayout(); - vblayout.Push(3); - //CubeVertexArray->AddBuffer(*CubeVertexBuffer, vblayout); - // Quad buffer - QuadVertexArray = new VertexArray(); - QuadVertexArray->Bind(); - QuadVertexBuffer = new VertexBuffer(QuadVertices, sizeof(QuadVertices)); - - vblayout = VertexBufferLayout(); - vblayout.Push(3); - vblayout.Push(2); - QuadVertexArray->AddBuffer(*QuadVertexBuffer, vblayout); + QuadMesh = CreateRef(); + QuadMesh->AddSurface(QuadVertices, { 0, 1, 2, 3, 4, 5 }); + QuadMesh->SetMaterial(material); } void Renderer::LoadShaders() @@ -221,7 +209,7 @@ namespace Nuake m_DebugShader->SetUniformMat4f("u_Model", transform.GetGlobalTransform()); m_DebugShader->SetUniform4f("u_Color", color.r, color.g, color.b, color.a); - CubeVertexArray->Bind(); + CubeMesh->Bind(); RenderCommand::DrawArrays(0, 36); } @@ -233,7 +221,7 @@ namespace Nuake void Renderer::DrawQuad(Matrix4 transform) { - QuadVertexArray->Bind(); + QuadMesh->Bind(); RenderCommand::DrawArrays(0, 6); } } diff --git a/Nuake/src/Rendering/Renderer.h b/Nuake/src/Rendering/Renderer.h index 847e3b86..2cde2df3 100644 --- a/Nuake/src/Rendering/Renderer.h +++ b/Nuake/src/Rendering/Renderer.h @@ -51,6 +51,7 @@ namespace Nuake static Ref m_LightsUniformBuffer; static Ref CubeMesh; + static Ref QuadMesh; static void Init(); static void LoadShaders(); diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp index 486beb1f..05f0b606 100644 --- a/Nuake/src/Rendering/SceneRenderer.cpp +++ b/Nuake/src/Rendering/SceneRenderer.cpp @@ -1,7 +1,9 @@ #include "SceneRenderer.h" #include "src/Rendering/Shaders/ShaderManager.h" -#include +#include "src/Scene/Components/BSPBrushComponent.h" +#include "src/Scene/Components/SpriteComponent.h" + #include namespace Nuake @@ -208,16 +210,18 @@ namespace Nuake mGBuffer->Bind(); mGBuffer->Clear(); { + // Init RenderCommand::Enable(RendererEnum::FACE_CULL); Shader* gBufferShader = ShaderManager::GetShader("resources/Shaders/gbuffer.shader"); gBufferShader->Bind(); gBufferShader->SetUniformMat4f("u_Projection", mProjection); gBufferShader->SetUniformMat4f("u_View", mView); - auto view = scene.m_Registry.view(); + // Models + auto view = scene.m_Registry.view(); for (auto e : view) { - auto [transform, mesh, parent, visibility] = view.get(e); + auto [transform, mesh, visibility] = view.get(e); if (mesh.ModelResource && visibility.Visible) { @@ -232,10 +236,11 @@ namespace Nuake RenderCommand::Disable(RendererEnum::FACE_CULL); Renderer::Flush(gBufferShader, false); - auto quakeView = scene.m_Registry.view(); + // Quake BSPs + auto quakeView = scene.m_Registry.view(); for (auto e : quakeView) { - auto [transform, model, parent, visibility] = quakeView.get(e); + auto [transform, model, visibility] = quakeView.get(e); if (model.IsTransparent || !visibility.Visible) continue; @@ -246,6 +251,36 @@ namespace Nuake } } Renderer::Flush(gBufferShader, false); + + // Sprites + auto spriteView = scene.m_Registry.view(); + for (auto e : spriteView) + { + auto [transform, sprite, visibility] = spriteView.get(e); + + if (!visibility.Visible) + continue; + + auto finalQuadTransform = transform.GetGlobalTransform(); + if (sprite.Billboard) + { + Matrix4 finalMatrix; + finalQuadTransform = glm::inverse(mView); + + if (sprite.LockYRotation) + { + finalQuadTransform[1] = Vector4(0, 1, 0, 0); + finalQuadTransform[2] = Vector4(finalQuadTransform[2][0], 0, finalQuadTransform[2][2], 0); + finalQuadTransform = finalQuadTransform; + //finalQuadTransform[1] = Vector4(0, 1, 0, 1); + } + + finalQuadTransform[3] = Vector4(transform.GetGlobalPosition(), 1.0f); + } + + Renderer::SubmitMesh(Renderer::QuadMesh, finalQuadTransform, (uint32_t)e); + } + Renderer::Flush(gBufferShader, false); } } From 3ee0413e8ad55612f58c4c9bf0f8e3f821326c1c Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 18:49:38 -0400 Subject: [PATCH 4/8] Added alpha scisorring --- Editor/resources/Shaders/gbuffer.shader | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Editor/resources/Shaders/gbuffer.shader b/Editor/resources/Shaders/gbuffer.shader index 9d7aa722..6b0a7aa7 100644 --- a/Editor/resources/Shaders/gbuffer.shader +++ b/Editor/resources/Shaders/gbuffer.shader @@ -23,7 +23,6 @@ void main() //T = normalize(T - dot(T, N) * N); //vec3 B = cross(N, T); - vec3 T = normalize((u_Model * vec4(Tangent, 0.0f)).xyz); vec3 N = normalize((u_Model * vec4(Normal, 0.0f)).xyz); vec3 B = normalize((u_Model * vec4(Bitangent, 0.0f)).xyz); @@ -83,10 +82,17 @@ void main() // Albedo gAlbedo = vec4(m_AlbedoColor, 1.0); if (u_HasAlbedo == 1) - gAlbedo.rgb = texture(m_Albedo, UV).rgb; + { + vec4 albedoSample = texture(m_Albedo, UV); + gAlbedo.rgb = albedoSample.rgb * m_AlbedoColor.rgb; + gAlbedo.a = albedoSample.a; + + if (albedoSample.a < 0.1f) + { + discard; + } + } - gAlbedo.rgb = texture(m_Albedo, UV).rgb * m_AlbedoColor.rgb; - // Material float finalMetalness = u_MetalnessValue; if (u_HasMetalness == 1) From b69d71d0ebb9261f00b75c747a0b9dd9848afd5e Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 18:49:51 -0400 Subject: [PATCH 5/8] Removed unused code --- Nuake/src/Rendering/Renderer.h | 2 +- Nuake/src/Rendering/Textures/MaterialManager.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Nuake/src/Rendering/Renderer.h b/Nuake/src/Rendering/Renderer.h index 2cde2df3..76c86b28 100644 --- a/Nuake/src/Rendering/Renderer.h +++ b/Nuake/src/Rendering/Renderer.h @@ -33,6 +33,7 @@ namespace Nuake { private: static RenderList m_RenderList; + public: static VertexArray* QuadVertexArray; static VertexBuffer* QuadVertexBuffer; @@ -66,7 +67,6 @@ namespace Nuake // Lights static std::vector m_Lights; - static void RegisterLight(TransformComponent transform, LightComponent light); static void RegisterDeferredLight(TransformComponent transform, LightComponent light); // Debug diff --git a/Nuake/src/Rendering/Textures/MaterialManager.h b/Nuake/src/Rendering/Textures/MaterialManager.h index 525493fa..1495512d 100644 --- a/Nuake/src/Rendering/Textures/MaterialManager.h +++ b/Nuake/src/Rendering/Textures/MaterialManager.h @@ -29,7 +29,6 @@ namespace Nuake void LoadMaterials(); - void RegisterMaterial(Ref material); Ref LoadMaterial(std::string path); From e5603c51119d0022fb055c42a248057b62400377 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Tue, 1 Aug 2023 18:50:04 -0400 Subject: [PATCH 6/8] Added sprite mesh --- Nuake/src/Rendering/SceneRenderer.cpp | 13 +++++++----- .../src/Scene/Components/SpriteComponent.cpp | 21 +++++++++++++++++-- Nuake/src/Scene/Components/SpriteComponent.h | 3 ++- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp index 05f0b606..17468d53 100644 --- a/Nuake/src/Rendering/SceneRenderer.cpp +++ b/Nuake/src/Rendering/SceneRenderer.cpp @@ -258,27 +258,30 @@ namespace Nuake { auto [transform, sprite, visibility] = spriteView.get(e); - if (!visibility.Visible) + if (!visibility.Visible || !sprite.SpriteMesh) continue; - auto finalQuadTransform = transform.GetGlobalTransform(); + auto& finalQuadTransform = transform.GetGlobalTransform(); if (sprite.Billboard) { - Matrix4 finalMatrix; finalQuadTransform = glm::inverse(mView); if (sprite.LockYRotation) { + // This locks the pitch rotation on the billboard, useful for trees, lamps, etc. finalQuadTransform[1] = Vector4(0, 1, 0, 0); finalQuadTransform[2] = Vector4(finalQuadTransform[2][0], 0, finalQuadTransform[2][2], 0); finalQuadTransform = finalQuadTransform; - //finalQuadTransform[1] = Vector4(0, 1, 0, 1); } + // Translation finalQuadTransform[3] = Vector4(transform.GetGlobalPosition(), 1.0f); + + // Scale + finalQuadTransform = glm::scale(finalQuadTransform, transform.GetGlobalScale()); } - Renderer::SubmitMesh(Renderer::QuadMesh, finalQuadTransform, (uint32_t)e); + Renderer::SubmitMesh(sprite.SpriteMesh, finalQuadTransform, (uint32_t)e); } Renderer::Flush(gBufferShader, false); } diff --git a/Nuake/src/Scene/Components/SpriteComponent.cpp b/Nuake/src/Scene/Components/SpriteComponent.cpp index 414d99d3..db0fdad0 100644 --- a/Nuake/src/Scene/Components/SpriteComponent.cpp +++ b/Nuake/src/Scene/Components/SpriteComponent.cpp @@ -1,6 +1,9 @@ #include "SpriteComponent.h" +#include "src/Core/FileSystem.h" #include "src/Rendering/Textures/TextureManager.h" +#include "src/Rendering/Textures/MaterialManager.h" +#include "src/Rendering/Vertex.h" namespace Nuake { @@ -14,8 +17,22 @@ namespace Nuake bool SpriteComponent::LoadSprite() { - const auto texture = TextureManager::Get()->GetTexture(SpritePath); - Sprite = texture; + std::vector quadVertices = + { + { Vector3(-1.0f, -1.0f, 0.0f), Vector2(0, 0), Vector3(0, 0, -1) }, + { Vector3(1.0f, 1.0f, 0.0f), Vector2(1.0f, 1.0f), Vector3(0, 0, -1) }, + { Vector3(-1.0f, 1.0f, 0.0f), Vector2(0.0f, 1.0f), Vector3(0, 0, -1) }, + { Vector3(1.0f, -1.0f, 0.0f), Vector2(1.0f, 0.0f), Vector3(0, 0, -1) }, + { Vector3(-1.0f, -1.0f, 0.0f), Vector2(0.0f, 0.0f), Vector3(0, 0, -1) }, + { Vector3(1.0f, 1.0f, 0.0f), Vector2(1.0f, 1.0f), Vector3(0, 0, -1) } + }; + + SpriteMesh = CreateRef(); + SpriteMesh->AddSurface(quadVertices, { 0, 1, 2, 3, 4, 5 }); + + auto& material = MaterialManager::Get()->GetMaterial(FileSystem::Root + SpritePath); + SpriteMesh->SetMaterial(material); + return true; } diff --git a/Nuake/src/Scene/Components/SpriteComponent.h b/Nuake/src/Scene/Components/SpriteComponent.h index 97761f76..465abd3e 100644 --- a/Nuake/src/Scene/Components/SpriteComponent.h +++ b/Nuake/src/Scene/Components/SpriteComponent.h @@ -2,6 +2,7 @@ #include "src/Core/Core.h" #include "src/Resource/Serializable.h" #include "src/Rendering/Textures/Texture.h" +#include "src/Rendering/Mesh/Mesh.h" namespace Nuake { @@ -11,7 +12,7 @@ namespace Nuake bool Billboard; bool LockYRotation; std::string SpritePath; - Ref Sprite; + Ref SpriteMesh; SpriteComponent(); From 220948fe92a53f3fdad26282af88244f88b45058 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Wed, 2 Aug 2023 11:59:42 -0400 Subject: [PATCH 7/8] Update Nuake/src/Core/Physics/DynamicWorld.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: émeryc --- Nuake/src/Core/Physics/DynamicWorld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nuake/src/Core/Physics/DynamicWorld.cpp b/Nuake/src/Core/Physics/DynamicWorld.cpp index e3cce79f..2db145bc 100644 --- a/Nuake/src/Core/Physics/DynamicWorld.cpp +++ b/Nuake/src/Core/Physics/DynamicWorld.cpp @@ -331,7 +331,7 @@ namespace Nuake { // Create jolt ray const auto& fromJolt = JPH::Vec3(from.x, from.y, from.z); - const auto& toJolt = JPH::Vec3(to.x , to.y, to.z); + const auto& toJolt = JPH::Vec3(to.x, to.y, to.z); JPH::RayCast ray { fromJolt, toJolt - fromJolt }; JPH::AllHitCollisionCollector collector; _JoltPhysicsSystem->GetBroadPhaseQuery().CastRay(ray, collector); From fadb79eb81f33626419b67e00cc0874a4fa2a4d3 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Wed, 2 Aug 2023 16:01:07 +0000 Subject: [PATCH 8/8] Indentention --- Editor/src/Windows/EditorSelectionPanel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Editor/src/Windows/EditorSelectionPanel.cpp b/Editor/src/Windows/EditorSelectionPanel.cpp index 5822096c..a5674899 100644 --- a/Editor/src/Windows/EditorSelectionPanel.cpp +++ b/Editor/src/Windows/EditorSelectionPanel.cpp @@ -93,7 +93,7 @@ void EditorSelectionPanel::DrawEntity(Nuake::Entity entity) mTransformPanel.Draw(entity); mLightPanel.Draw(entity); mScriptPanel.Draw(entity); - mSpritePanel.Draw(entity); + mSpritePanel.Draw(entity); mMeshPanel.Draw(entity); mQuakeMapPanel.Draw(entity); mCameraPanel.Draw(entity);