celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added NavMeshVolume component

Browse Source
This commit is contained in:
Antoine Pilote
2024-07-24 20:58:48 -04:00
parent fbc4ee1900
commit f15894920f
8 changed files with 135 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Editor/src/ComponentsPanel/NavMeshVolumePanel.h Normal file
View File

@@ -0,0 +1,70 @@
#pragma once
#include "ComponentPanel.h"
#include <src/Scene/Entities/ImGuiHelper.h>
#include <src/Scene/Components/NavMeshVolumeComponent.h>
#include <src/Core/Maths.h>
class NavMeshVolumePanel : ComponentPanel {
public:
NavMeshVolumePanel() {}
void Draw(Nuake::Entity entity) override
{
using namespace Nuake;
if (!entity.HasComponent<NavMeshVolumeComponent>())
{
return;
}
auto& component = entity.GetComponent<NavMeshVolumeComponent>();
BeginComponentTable(NAVMESH VOLUME, NavMeshVolumeComponent);
{
{
CompononentPropertyName("Volume Bounds");
ImGui::TableNextColumn();
Vector3 volumeSize = component.VolumeSize;
ImGuiHelper::DrawVec3("VolumeSize", &volumeSize);
if (volumeSize.x > 0 && volumeSize.y > 0 && volumeSize.z > 0)
{
component.VolumeSize = volumeSize;
}
ImGui::TableNextColumn();
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1, 1, 1, 0));
std::string resetLabel = std::string(ICON_FA_UNDO) + "##ResetVolumeSize";
if (ImGui::Button(resetLabel.c_str()))
{
volumeSize = { 1.0, 1.0, 1.0 };
}
ImGui::PopStyleColor();
}
ImGui::TableNextColumn();
{
CompononentPropertyName("Generate");
ImGui::TableNextColumn();
if (UI::SecondaryButton("Generate"))
{
}
ImGui::TableNextColumn();
// No reset button
ImGui::TableNextColumn();
}
}
EndComponentTable();
}
};

22
Editor/src/Misc/GizmoDrawer.cpp
View File

@@ -204,6 +204,28 @@ void GizmoDrawer::DrawGizmos(Ref<Scene> scene, bool occluded)
Nuake::RenderCommand::DrawLines(0, 26);
}
auto navMeshVolumeView = scene->m_Registry.view<TransformComponent, NavMeshVolumeComponent>();
for (auto e : navMeshVolumeView)
{
if (!IsEntityInSelection(Nuake::Entity{ (entt::entity)e, scene.get() }))
{
continue;
}
auto [transform, volume] = scene->m_Registry.get<TransformComponent, NavMeshVolumeComponent>(e);
const Quat& globalRotation = glm::normalize(transform.GetGlobalRotation());
const Matrix4& rotationMatrix = glm::mat4_cast(globalRotation);
m_LineShader->Bind();
m_LineShader->SetUniform1f("u_Opacity", 0.9f);
m_LineShader->SetUniformMat4f("u_View", glm::scale(glm::translate(scene->m_EditorCamera->GetTransform(), Vector3(transform.GetGlobalTransform()[3])) * rotationMatrix, volume.VolumeSize));
m_LineShader->SetUniformMat4f("u_Projection", scene->m_EditorCamera->GetPerspective());
m_BoxBuffer->Bind();
Nuake::RenderCommand::DrawLines(0, 26);
}
auto sphereColliderView = scene->m_Registry.view<TransformComponent, SphereColliderComponent>();
for (auto e : sphereColliderView)
{

4
Editor/src/Windows/EditorInterface.cpp
View File

@@ -1770,6 +1770,10 @@ namespace Nuake {
{
Engine::GetCurrentScene()->CreateEntity("Quake Map").AddComponent<QuakeMapComponent>();
}
if (ImGui::MenuItem("NavMesh Volume"))
{
Engine::GetCurrentScene()->CreateEntity("NavMesh Volume").AddComponent<NavMeshVolumeComponent>();
}
ImGui::EndMenu();
}

3
Editor/src/Windows/EditorSelectionPanel.cpp
View File

@@ -129,6 +129,7 @@ void EditorSelectionPanel::DrawEntity(Nuake::Entity entity)
mMeshColliderPanel.Draw(entity);
mCharacterControllerPanel.Draw(entity);
mAudioEmitterPanel.Draw(entity);
mNavMeshVolumePanel.Draw(entity);
using namespace Nuake;
@@ -169,7 +170,7 @@ void EditorSelectionPanel::DrawEntity(Nuake::Entity entity)
ImGui::Separator();
MenuItemComponent("Audio Emitter", AudioEmitterComponent);
ImGui::Separator();
MenuItemComponent("Path", AudioEmitterComponent);
MenuItemComponent("NavMesh Volume", NavMeshVolumeComponent);
ImGui::EndPopup();
}

2
Editor/src/Windows/EditorSelectionPanel.h
View File

@@ -24,6 +24,7 @@
#include "../ComponentsPanel/BonePanel.h"
#include "../ComponentsPanel/AudioEmitterPanel.h"
#include "../ComponentsPanel/NetScriptPanel.h"
#include "../ComponentsPanel/NavMeshVolumePanel.h"
class EditorSelectionPanel
{
@@ -47,6 +48,7 @@ private:
ParticleEmitterPanel mParticleEmitterPanel;
BonePanel mBonePanel;
AudioEmitterPanel mAudioEmitterPanel;
NavMeshVolumePanel mNavMeshVolumePanel;
Ref<Nuake::File> currentFile;
Ref<Nuake::Resource> selectedResource;

2
Nuake/src/AI/NavManager.cpp
View File

@@ -274,6 +274,8 @@ namespace Nuake {
{
Logger::Log("Could not init Detour navmesh query", "NavManager", CRITICAL);
}
m_Meshes.clear();
}
void NavManager::DrawNavMesh()

28
Nuake/src/Scene/Components/NavMeshVolumeComponent.h Normal file
View File

@@ -0,0 +1,28 @@
#pragma once
#include "../Entities/Entity.h"
#include "Engine.h"
namespace Nuake
{
struct NavMeshVolumeComponent
{
Vector3 VolumeSize = { 1.0f, 1.0f, 1.0f };
json Serialize()
{
BEGIN_SERIALIZE();
SERIALIZE_VEC3(VolumeSize);
END_SERIALIZE();
}
bool Deserialize(const json& j)
{
if (j.contains("VolumeSize"));
{
DESERIALIZE_VEC3(j["VolumeSize"], VolumeSize);
}
return true;
}
};
}

5
Nuake/src/Scene/Entities/Entity.cpp
View File

@@ -18,6 +18,7 @@
#include "src/Scene/Components/ParticleEmitterComponent.h"
#include "src/Scene/Components/BoneComponent.h"
#include "src/Scene/Components/SkinnedModelComponent.h"
#include <src/Scene/Components/NavMeshVolumeComponent.h>
namespace Nuake
{
@@ -79,6 +80,9 @@ namespace Nuake
SERIALIZE_OBJECT_REF_LBL("AudioEmitterComponent", GetComponent<AudioEmitterComponent>())
if (HasComponent<NetScriptComponent>())
SERIALIZE_OBJECT_REF_LBL("NetScriptComponent", GetComponent<NetScriptComponent>())
if (HasComponent<NavMeshVolumeComponent>())
SERIALIZE_OBJECT_REF_LBL("NavMeshVolumeComponent", GetComponent<NavMeshVolumeComponent>())
END_SERIALIZE();
}
@@ -111,6 +115,7 @@ namespace Nuake
DESERIALIZE_COMPONENT(SkinnedModelComponent);
DESERIALIZE_COMPONENT(AudioEmitterComponent);
DESERIALIZE_COMPONENT(NetScriptComponent);
DESERIALIZE_COMPONENT(NavMeshVolumeComponent);
return true;
}