Feat/bvh improvements

CMakeLists.txt

@@ -401,7 +401,7 @@ set(DEPENDENCY_RECTANGLEBINPACK_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/third_party_li
 search_lib_recursive(DEPENDENCY_RECTANGLEBINPACK_LIBRARY third_party_libs/rectangle_bin_pack/${BINARY_PRAGMA_DIR} rectangle_bin_pack STATIC)
 
 set(DEPENDENCY_MINIBALL_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/third_party_libs/miniball/cpp/main CACHE PATH "Path to include directory.")
-set(DEPENDENCY_BVH_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/third_party_libs/bvh/include CACHE PATH "Path to include directory.")
+set(DEPENDENCY_BVH_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/third_party_libs/bvh/src CACHE PATH "Path to include directory.")
 
 set(DEPENDENCY_VTFLIB_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/third_party_libs/vtflib/src CACHE PATH "Path to include directory.")
 set(DEPENDENCY_VTFLIB_BUILD_INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/third_party_libs/vtflib/src CACHE PATH "Path to include directory.")

assets/addons/gui_component/lua/entities/components/gui_3d/client/cl_init.lua

@@ -351,6 +351,12 @@ function ents.GUI3D:InitializeGUICallbacks()
 				if util.is_valid(self.m_pGui) == false then
 					return util.EVENT_REPLY_UNHANDLED
 				end
+
+				local renderC = self:GetEntityComponent(ents.COMPONENT_RENDER)
+				if renderC == nil or renderC:GetSceneRenderPass() == game.SCENE_RENDER_PASS_NONE then
+					return util.EVENT_REPLY_UNHANDLED
+				end
+
 				local bt
 				if action == input.ACTION_ATTACK then
 					bt = input.MOUSE_BUTTON_LEFT
@@ -379,15 +385,29 @@ function ents.GUI3D:InitializeGUICallbacks()
 		if util.is_valid(self.m_pGui) == false then
 			return
 		end
+
+		local renderC = self:GetEntityComponent(ents.COMPONENT_RENDER)
+		if renderC == nil or renderC:GetSceneRenderPass() == game.SCENE_RENDER_PASS_NONE then
+			return util.EVENT_REPLY_UNHANDLED
+		end
+
 		local pos = self:CalcCursorPos()
 		if pos ~= nil then
 			self.m_pGui:InjectScrollInput(pos, Vector2(x, y) * 10.0)
+			return false
 		end
-		return false
 	end)
 end
 function ents.GUI3D:InjectKeyboardInput(key, state)
-	log.info("Injecting keyboard input with key = " .. key .. ", state = " .. state .. " into 3D UI element...")
+	log.info(
+		"Injecting keyboard input with key = "
+			.. key
+			.. ", state = "
+			.. state
+			.. " into 3D UI element '"
+			.. tostring(self:GetEntity())
+			.. "'..."
+	)
 	local elFocus = gui.get_focused_element()
 	self.m_pGui:InjectKeyboardInput(key, state, self.m_keyMods)
 	-- We don't want the element focus to change to any of the 3D elements, so we'll restore the focus back
@@ -400,6 +420,17 @@ function ents.GUI3D:DoInjectMouseInput(bt, state, pos)
 	if pos == nil then
 		return util.EVENT_REPLY_UNHANDLED
 	end
+	log.info(
+		"Injecting mouse input with button = "
+			.. bt
+			.. ", state = "
+			.. state
+			.. ", pos = "
+			.. tostring(pos)
+			.. " into 3D UI element '"
+			.. tostring(self:GetEntity())
+			.. "'..."
+	)
 	local elFocus = gui.get_focused_element()
 	local res = self.m_pGui:InjectMouseInput(pos, bt, state)
 	if res == util.EVENT_REPLY_UNHANDLED then
@@ -413,15 +444,6 @@ function ents.GUI3D:DoInjectMouseInput(bt, state, pos)
 	return res
 end
 function ents.GUI3D:InjectMouseInput(bt, state, pos, useCursor)
-	log.info(
-		"Injecting mouse input with button = "
-			.. bt
-			.. ", state = "
-			.. state
-			.. ", pos = "
-			.. tostring(pos)
-			.. " into 3D UI element..."
-	)
 	if pos == nil then
 		local fGetCursorPos
 		if useCursor then

assets/addons/gui_component/lua/entities/components/gui_3d/client/drag_scrolling.lua

@@ -17,8 +17,16 @@ function Component:UpdateDragScrolling()
 			return
 		end
 		self.m_dragScrollingCursorTracker:Update(newPos)
-		if self.m_dragScrollingCursorTracker:HasExceededMoveThreshold(60) then
+		if self.m_dragScrollingCursorTracker:HasExceededMoveThreshold(60, math.AXIS_Y) then
 			self:StartDragScrolling()
+		elseif self.m_dragScrollingCursorTracker:HasExceededMoveThreshold(60, math.AXIS_X) then
+			-- If the user has dragged the mouse horizontally, we'll assume they want an UI input.
+			-- We need to do this, otherwise interacting with sliders would not be possible.
+			-- This isn't ideal, but other solutions would require changes to the GUI system.
+			local bt = self.m_dragScrollingButton
+			local pos = self.m_dragGetCursorPos()
+			self:StopDragScrolling()
+			self:DoInjectMouseInput(bt, input.STATE_PRESS, pos)
 		end
 	end
 	if self.m_lastDragCursorPos ~= nil then
@@ -51,7 +59,7 @@ function Component:HandleDragScrollingMouseInput(bt, state, fGetCursorPos)
 		return util.EVENT_REPLY_HANDLED
 	end
 	if state == input.STATE_PRESS and self:IsDragScrollingEnabled() then
-		return self:InitDragScrollingMode(fGetCursorPos) and util.EVENT_REPLY_HANDLED or util.EVENT_REPLY_UNHANDLED
+		return self:InitDragScrollingMode(bt, fGetCursorPos) and util.EVENT_REPLY_HANDLED or util.EVENT_REPLY_UNHANDLED
 	end
 	if state == input.STATE_RELEASE and self.m_dragScrollingCursorTracker ~= nil then
 		self.m_dragScrollingCursorTracker = nil
@@ -60,11 +68,12 @@ function Component:HandleDragScrollingMouseInput(bt, state, fGetCursorPos)
 	end
 	return util.EVENT_REPLY_UNHANDLED
 end
-function Component:InitDragScrollingMode(fGetCursorPos)
+function Component:InitDragScrollingMode(bt, fGetCursorPos)
 	local pos = fGetCursorPos()
 	if pos == nil then
 		return false
 	end
+	self.m_dragScrollingButton = bt
 	self.m_dragScrollingCursorTracker = gui.CursorTracker(pos)
 	self.m_dragGetCursorPos = fGetCursorPos
 	return true
@@ -79,6 +88,7 @@ function Component:StartDragScrolling()
 	self.m_lastDragCursorPos = fDragGetCursorPos()
 end
 function Component:StopDragScrolling()
+	self.m_dragScrollingButton = nil
 	self.m_lastDragCursorPos = nil
 	self.m_dragScrollingCursorTracker = nil
 	self.m_dragGetCursorPos = nil

assets/lua/entities/components/click/cl_init.lua

@@ -207,17 +207,15 @@ function ents.ClickComponent.find_entities_in_kdop(planes, filter)
 	local entPl = pl:GetEntity()
 
 	debug.start_profiling_task("click_find_entities_in_kdop")
-	local flags = bit.bor(
-		ents.BvhComponent.BVH_INTERSECTION_FLAG_BIT_RETURN_PRIMITIVES,
-		ents.BvhComponent.BVH_INTERSECTION_FLAG_BIT_DISCONTINUE_ON_FIRST_HIT_PER_MESH
-	)
+	local flags = ents.IntersectionHandlerComponent.INTERSECTION_FLAG_BIT_RETURN_MESHES
 	local results = {}
 	local entToResultIdx = {}
 	local meshMap = {}
-	local function populate_results(c, indices)
-		for _, idx in ipairs(indices) do
-			local ent, subMesh = c:FindPrimitiveMeshInfo(idx)
-			if ent ~= nil then
+	local function populate_results(meshes)
+		for _, meshInfo in ipairs(meshes) do
+			local ent = meshInfo.entity
+			local subMesh = meshInfo.mesh
+			if subMesh ~= nil then
 				local idx = entToResultIdx[ent]
 				if idx == nil then
 					table.insert(results, {
@@ -236,25 +234,28 @@ function ents.ClickComponent.find_entities_in_kdop(planes, filter)
 		end
 	end
 	for ent, c in ents.citerator(ents.COMPONENT_STATIC_BVH_CACHE) do
-		local localPlanes = get_local_planes(planes, ent)
-		local r, indices = c:IntersectionTestKDop(localPlanes, flags)
-		if r ~= false then
-			populate_results(c, indices)
+		local intersectionC = ent:GetComponent(ents.COMPONENT_INTERSECTION_HANDLER)
+		if intersectionC ~= nil then
+			local localPlanes = get_local_planes(planes, ent)
+			local r, meshes = intersectionC:IntersectionTestKDop(localPlanes, flags)
+			if r ~= false then
+				populate_results(meshes)
+			end
 		end
 	end
 
 	for ent, c in
-		ents.citerator(ents.COMPONENT_BVH, {
+		ents.citerator(ents.COMPONENT_INTERSECTION_HANDLER, {
 			ents.IteratorFilterComponent(ents.COMPONENT_CLICK),
 			ents.IteratorFilterComponent(ents.COMPONENT_MODEL),
 			ents.IteratorFilterComponent(ents.COMPONENT_RENDER),
 		})
 	do
 		if should_entity_pass(ent, entPl, filter) then
 			local localPlanes = get_local_planes(planes, ent)
-			local r, indices = c:IntersectionTestKDop(localPlanes, flags)
+			local r, meshes = c:IntersectionTestKDop(localPlanes, flags)
 			if r ~= false then
-				populate_results(c, indices)
+				populate_results(meshes)
 			end
 		end
 	end
@@ -284,18 +285,21 @@ function ents.ClickComponent.raycast(pos, dir, filter, maxDist)
 
 	-- Check static BVH caches
 	for ent, c in ents.citerator(ents.COMPONENT_STATIC_BVH_CACHE) do
-		local hitData = c:IntersectionTest(pos, dir, 0.0, maxDist)
-		if
-			hitData ~= nil
-			and ents.ClickComponent.is_entity_valid(hitData.entity)
-			and (filter == nil or filter(hitData.entity))
-		then
-			if hitData.distance < distClosest then -- and hitData.distance > 0.0) then
-				--debug.print("Clicked actor: ",hitData.entity)
-				distClosest = hitData.distance
-				hitPos = pos + dir * hitData.distance
-				actorClosest = hitData.entity
-				hitDataClosest = hitData
+		local intersectionC = ent:GetComponent(ents.COMPONENT_INTERSECTION_HANDLER)
+		if intersectionC ~= nil then
+			local hitData = intersectionC:IntersectionTest(pos, dir, 0.0, maxDist)
+			if
+				hitData ~= nil
+				and ents.ClickComponent.is_entity_valid(hitData.entity)
+				and (filter == nil or filter(hitData.entity))
+			then
+				if hitData.distance < distClosest then -- and hitData.distance > 0.0) then
+					--debug.print("Clicked actor: ",hitData.entity)
+					distClosest = hitData.distance
+					hitPos = pos + dir * hitData.distance
+					actorClosest = hitData.entity
+					hitDataClosest = hitData
+				end
 			end
 		end
 	end
@@ -321,8 +325,8 @@ function ents.ClickComponent.raycast(pos, dir, filter, maxDist)
 				local lMaxDist = ldir:Length()
 				ldir = ldir / lMaxDist
 
-				local bvhC = ent:GetComponent(ents.COMPONENT_BVH)
-				local hitData = bvhC:IntersectionTest(lpos, ldir, 0.0, lMaxDist)
+				local intersectionHandlerC = ent:GetComponent(ents.COMPONENT_INTERSECTION_HANDLER)
+				local hitData = intersectionHandlerC:IntersectionTest(lpos, ldir, 0.0, lMaxDist)
 				if hitData ~= nil then
 					local clickC = ent:GetComponent(ents.COMPONENT_CLICK)
 					local priority = (clickC ~= nil) and clickC:GetPriority() or 0
@@ -364,7 +368,7 @@ function ents.ClickComponent.raycast(pos, dir, filter, maxDist)
 	local entCache = {}
 	for ent in
 		ents.iterator({
-			ents.IteratorFilterComponent(ents.COMPONENT_BVH),
+			ents.IteratorFilterComponent(ents.COMPONENT_INTERSECTION_HANDLER),
 			ents.IteratorFilterComponent(ents.COMPONENT_CLICK),
 			ents.IteratorFilterComponent(ents.COMPONENT_MODEL),
 			ents.IteratorFilterComponent(ents.COMPONENT_RENDER),
@@ -414,6 +418,7 @@ function ents.ClickComponent.raycast(pos, dir, filter, maxDist)
 end
 function ents.ClickComponent.find_actor_under_cursor(filter)
 	local pos, dir, vpData = ents.ClickComponent.get_ray_data()
+	--print("find_actor_under_cursor: ", pos, dir)
 	if pos == nil then
 		return
 	end

build_scripts/build.py

@@ -724,7 +724,7 @@ def execbuildscript(filepath):
         )
         add_pragma_module(
             name="pr_unirender",
-            commitSha="e082d0a94f01823aa05b61f1ed61658872f1f3a5",
+            commitSha="1f0df83e5d529078b598db974b9906b92145313c",
             repositoryUrl="https://github.com/Silverlan/pr_cycles.git"
         )
         add_pragma_module(
@@ -983,7 +983,7 @@ def download_addon(name,addonName,url,commitId=None):
 curDir = os.getcwd()
 if not skip_repository_updates:
 	if with_pfm:
-		download_addon("PFM","filmmaker","https://github.com/Silverlan/pfm.git","fb881fe5604016b7a3225124bbdeb4a99c545e4c")
+		download_addon("PFM","filmmaker","https://github.com/Silverlan/pfm.git","946fc73a03ec481df24c0ae9ec5daad7f3085c25")
 		download_addon("model editor","tool_model_editor","https://github.com/Silverlan/pragma_model_editor.git","56d46dacb398fa7540e794359eaf1081c9df1edd")
 
 	if with_vr:

build_scripts/scripts/external_libs.py

@@ -13,11 +13,11 @@
 get_submodule("iglfw","https://github.com/Silverlan/iglfw.git","e0531a55f5bdd9c9a1dadfbb7a8a610474d69d19")
 get_submodule("luasystem","https://github.com/Silverlan/luasystem.git","e22584368ce0f9a5c0c223b8a632d968377d1ae3")
 get_submodule("materialsystem","https://github.com/Silverlan/materialsystem.git","d900667907c42e64d70a9e49eab16fcb39073089")
-get_submodule("mathutil","https://github.com/Silverlan/mathutil.git","ef63a91717cb53c74796b3594dc8bd231694caf0")
+get_submodule("mathutil","https://github.com/Silverlan/mathutil.git","9ed30f22da26cfc0b9debdd4e0ac43ffa9e869b8")
 get_submodule("networkmanager","https://github.com/Silverlan/networkmanager.git","68d2f5c")
 get_submodule("panima","https://github.com/Silverlan/panima.git","9a32d345bdee87f5872e9d1b65de5772db996df3")
 get_submodule("prosper","https://github.com/Silverlan/prosper.git","f405b5114f8abaf30ed5d92604e0b14854606cb1")
-get_submodule("sharedutils","https://github.com/Silverlan/sharedutils.git","b308d6261cce0ebb9b8f44be17e72ab917992b3f")
+get_submodule("sharedutils","https://github.com/Silverlan/sharedutils.git","9168116578a13b79faf24171322f3f8f9c23c931")
 get_submodule("util_bsp","https://github.com/Silverlan/util_bsp.git","3c11053")
 get_submodule("util_formatted_text","https://github.com/Silverlan/util_formatted_text.git","3bd9e2de37d0cb14bf8228fde5e25c97698e927b")
 get_submodule("util_image","https://github.com/Silverlan/util_image.git","7a66f93")

build_scripts/scripts/third_party_libs.py

@@ -9,7 +9,7 @@
 third_party_libs_dir = curDir +"/third_party_libs"
 os.chdir(third_party_libs_dir)
 get_submodule("7zpp","https://github.com/Silverlan/7zip-cpp.git","df81447")
-get_submodule("bvh","https://github.com/madmann91/bvh.git","2fd0db6","v1")
+get_submodule("bvh","https://github.com/madmann91/bvh.git","6130db6")
 get_submodule("bzip2","https://github.com/sergiud/bzip2.git","c4a14bb87ee395fb2c69ef5dbb50762fe862517e","cmake")
 get_submodule("clip2tri","https://github.com/raptor/clip2tri.git","f62a734d22733814b8a970ed8a68a4d94c24fa5f")
 get_submodule("cppbepuik","https://github.com/Silverlan/cppbepuik.git","0e76ab441519b24a6142e22d251afdc9bc1e56a2")

core/client/CMakeLists.txt

@@ -53,6 +53,7 @@ add_include_dir(freetype)
 add_include_dir(pr_steamworks)
 add_include_dir(steam_audio)
 add_include_dir(tinygltf)
+add_include_dir(bvh)
 
 add_def(DLLCLIENT_EX)
 add_def(WMS_STATIC)

core/client/include/pragma/entities/components/c_animated_bvh_component.hpp

@@ -23,7 +23,7 @@ namespace pragma {
 		std::vector<std::shared_ptr<ModelSubMesh>> renderMeshes;
 		std::vector<uint16_t> renderMeshIndices;
 		std::vector<MeshData> meshData;
-		std::vector<BvhTriangle> transformedTris;
+		std::vector<bvh::Primitive> transformedTris;
 		std::condition_variable completeCondition;
 		mutable std::mutex completeMutex;
 		uint32_t completeCount = 0;
@@ -52,7 +52,7 @@ namespace pragma {
 		CallbackHandle m_cbRebuildScheduled;
 		CallbackHandle m_cbOnBvhUpdateRequested;
 		CallbackHandle m_cbOnBvhRebuilt;
-		std::shared_ptr<BvhData> m_tmpBvhData = nullptr;
+		std::shared_ptr<bvh::MeshBvhTree> m_tmpBvhData = nullptr;
 		bool m_rebuildScheduled = false;
 		std::atomic<bool> m_cancelled = false;
 		std::atomic<bool> m_busy = false;

core/client/include/pragma/entities/components/c_bvh_component.hpp

@@ -16,6 +16,7 @@ namespace pragma {
 	namespace rendering {
 		struct RenderBufferData;
 	};
+	struct HitInfo;
 	class DLLCLIENT CBvhComponent final : public BaseBvhComponent {
 	  public:
 		static bool ShouldConsiderMesh(const ModelSubMesh &mesh, const rendering::RenderBufferData &bufferData);
@@ -26,7 +27,7 @@ namespace pragma {
 		virtual void OnRemove() override;
 		virtual void OnEntityComponentAdded(BaseEntityComponent &component) override;
 		virtual void OnEntityComponentRemoved(BaseEntityComponent &component) override;
-		virtual bool IntersectionTest(const Vector3 &origin, const Vector3 &dir, float minDist, float maxDist, BvhHitInfo &outHitInfo) const override;
+		virtual bool IntersectionTest(const Vector3 &origin, const Vector3 &dir, float minDist, float maxDist, HitInfo &outHitInfo) const override;
 		using BaseBvhComponent::IntersectionTest;
 	  private:
 		void UpdateBvhStatus();

core/client/include/pragma/entities/components/c_debug_hitbox_component.hpp

@@ -24,8 +24,14 @@ namespace pragma {
 		virtual void OnEntitySpawn() override;
 		virtual void OnRemove() override;
 		virtual void OnTick(double tDelta) override;
+
+		void SetHitboxColor(BoneId boneId, const std::optional<Color> &color);
 	  protected:
+		void InitializeDebugObjects();
+		void ClearDebugObjects();
 		std::vector<std::shared_ptr<DebugRenderer::BaseObject>> m_debugObjects;
+		std::unordered_map<BoneId, Color> m_hitboxColors;
+		bool m_dirty = false;
 	};
 };