Skip to content

New debug draw extension for AABBs #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

New debug draw extension for AABBs #900

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
865e606
Merge branch 'mesh_loaders' into new_debug_draw
keptsecret Jul 1, 2025
ca86128
latest example
keptsecret Jul 1, 2025
0ae3da2
merge master, fix conflicts
keptsecret Jul 2, 2025
cd2ef95
latest example
keptsecret Jul 4, 2025
fe55bd7
merge master
keptsecret Jul 4, 2025
98ccfb2
added debug draw aabb extension, moved from ex
keptsecret Jul 8, 2025
a755514
removed todos
keptsecret Jul 8, 2025
473592b
support hlsl AABBs, also OBBs with transform
keptsecret Jul 9, 2025
f68f9c5
merge master, fix conflicts
keptsecret Aug 18, 2025
daf34e0
minor syntax changes
keptsecret Aug 18, 2025
33692fd
use hlsl cpp compat matrices, aabb
keptsecret Aug 19, 2025
72e3569
change batch render to use indexed draw
keptsecret Aug 19, 2025
5285e78
simplified single AABB draw
keptsecret Aug 20, 2025
328aa34
change batch render to take span of InstanceData
keptsecret Aug 20, 2025
a14c9dc
latest example
keptsecret Aug 20, 2025
9a35c9f
removed vertex buffer, use const vertex array in shader instead
keptsecret Aug 20, 2025
c6bd10b
validate creation params, added draw modes at create time
keptsecret Aug 20, 2025
1cb4c14
merge master, fix conflicts
keptsecret Aug 21, 2025
31e93f0
merge master, fix conflicts
keptsecret Sep 8, 2025
e5ceb1b
enable debug draw by default
keptsecret Sep 8, 2025
fe0a438
merge master, fix conflicts
keptsecret Sep 16, 2025
bfa233f
fix embed builtin resource build
keptsecret Sep 16, 2025
3b67580
resolve https://github.com/Devsh-Graphics-Programming/Nabla/pull/900#…
AnastaZIuk Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/nbl/ext/DebugDraw/builtin/hlsl/aabb_instances.fragment.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma shader_stage(fragment)

#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::ext::debug_draw;

Expand Down
2 changes: 1 addition & 1 deletion include/nbl/ext/DebugDraw/builtin/hlsl/aabb_instances.vertex.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::hlsl;
using namespace nbl::ext::debug_draw;
Expand Down
2 changes: 1 addition & 1 deletion include/nbl/ext/DebugDraw/builtin/hlsl/single.vertex.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::hlsl;
using namespace nbl::ext::debug_draw;
Expand Down
1 change: 1 addition & 0 deletions include/nbl/system/ISystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class NBL_API2 ISystem : public core::IReferenceCounted
//
virtual inline bool isDirectory(const system::path& p) const
{
// TODO: fix bug, input "nbl/ext/DebugDraw/builtin/hlsl" -> returs true when no such dir present in mounted stuff due to how it uses parent paths in loop (goes up up till matches "nbl" builtin archive and thinks it resolved the requested dir)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnastaZIuk open an issue about it

if (isPathReadOnly(p))
return p.extension()==""; // TODO: this is a temporary decision until we figure out how to check if a file is directory in android APK
else
Expand Down
2 changes: 1 addition & 1 deletion src/nbl/ext/DebugDraw/CDrawAABB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ smart_refctd_ptr<IGPUGraphicsPipeline> DrawAABB::createPipeline(SCreationParamet
return params.utilities->getLogicalDevice()->compileShader({ shaderSrc.get() });
};

if (!system->isDirectory(path(NBL_ARCHIVE_ENTRY.data())))
if (!system->exists(path(NBL_ARCHIVE_ENTRY) / "common.hlsl", {}))
mount(smart_refctd_ptr<ILogger>(params.utilities->getLogger()), system.get(), NBL_ARCHIVE_ENTRY);

auto vertexShader = compileShader(vsPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
Expand Down
4 changes: 2 additions & 2 deletions src/nbl/ext/DebugDraw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ nbl_create_ext_library_project(
)

# this should be standard for all extensions
set(_ARCHIVE_ENTRY_KEY_ "DebugDraw/builtin/hlsl") # then each one has unique archive key
get_filename_component(_ARCHIVE_ABSOLUTE_ENTRY_PATH_ "${NBL_EXT_INTERNAL_INCLUDE_DIR}/nbl/ext" ABSOLUTE)
set(_ARCHIVE_ENTRY_KEY_ "nbl/ext/DebugDraw/builtin/hlsl") # then each one has unique archive key
get_filename_component(_ARCHIVE_ABSOLUTE_ENTRY_PATH_ "${NBL_EXT_INTERNAL_INCLUDE_DIR}" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)

Expand Down
Loading