gui in worlds intersection method

ucpu · May 6, 2023 · f25dffd · f25dffd
1 parent 122c9b1
commit f25dffd
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 10 deletions.
diff --git a/sources/include/cage-simple/guiInWorld.h b/sources/include/cage-simple/guiInWorld.h
@@ -20,6 +20,8 @@ namespace cage
 	class GuiInWorld : private Immovable
 	{
 	public:
+		bool intersects(const Line &ray) const;
+		Vec3 intersection(const Line &ray) const;
 		void update(const Line &ray, bool interact);
 		void cleanUp();
 		GuiManager *guiManager();

diff --git a/sources/libsimple/guiInWorld.cpp b/sources/libsimple/guiInWorld.cpp
@@ -48,31 +48,49 @@ namespace cage
 				cleanUp();
 			}
 
-			void update(const Line &ray, bool interact)
+			struct Intersection
 			{
-				guiMan->prepare();
+				Vec3 c;
+				Vec2 n;
+				Vec2 p;
+				bool intersects = false;
+			};
 
+			CAGE_FORCE_INLINE Intersection detect(const Line &ray) const
+			{
+				Intersection res;
 				const Transform tr = config.renderEntity->value<TransformComponent>();
 				const Plane pl = Plane(tr.position, tr.orientation * Vec3(0, 0, -1));
-				const Vec3 c = intersection(pl, ray) - tr.position;
+				res.c = cage::intersection(pl, ray) - tr.position;
 				const Vec3 r = tr.orientation * Vec3(-1, 0, 0); // the rendered texture is horizontally swapped (see texture coordinates on the render mesh)
 				const Vec3 u = tr.orientation * Vec3(0, -1, 0); // the gui has Y axis going top-down, the world has Y going bottom-up
-				const Vec2 n = Vec2(dot(c, r), dot(c, u)) / tr.scale * Vec2(1, Real(config.resolution[0]) / Real(config.resolution[1])) * 0.5 + 0.5; // 0*0 .. 1*1
-				const Vec2 p = n * Vec2(config.resolution); // 0*0 .. w*h
-				if (c.valid() && n[0] >= 0 && n[0] <= 1 && n[1] >= 0 && n[1] <= 1)
+				res.n = Vec2(dot(res.c, r), dot(res.c, u)) / tr.scale * Vec2(1, Real(config.resolution[0]) / Real(config.resolution[1])) * 0.5 + 0.5; // 0*0 .. 1*1
+				res.p = res.n * Vec2(config.resolution); // 0*0 .. w*h
+				res.intersects = res.c.valid() && res.n[0] >= 0 && res.n[0] <= 1 && res.n[1] >= 0 && res.n[1] <= 1;
+				if (!res.intersects)
+					res.c = Vec3::Nan();
+				return res;
+			}
+
+			void update(const Line &ray, bool interact)
+			{
+				guiMan->prepare();
+
+				const auto i = detect(ray);
+				if (i.intersects)
 				{
 					if (interact)
 					{
-						guiMan->handleInput(GenericInput{ InputMouse{ .position = p, .buttons = MouseButtonsFlags::Left }, InputClassEnum::MousePress });
-						guiMan->handleInput(GenericInput{ InputMouse{ .position = p, .buttons = MouseButtonsFlags::Left }, InputClassEnum::MouseRelease });
+						guiMan->handleInput(GenericInput{ InputMouse{ .position = i.p, .buttons = MouseButtonsFlags::Left }, InputClassEnum::MousePress });
+						guiMan->handleInput(GenericInput{ InputMouse{ .position = i.p, .buttons = MouseButtonsFlags::Left }, InputClassEnum::MouseRelease });
 					}
 					else
-						guiMan->handleInput(GenericInput{ InputMouse{ .position = p }, InputClassEnum::MouseMove });
+						guiMan->handleInput(GenericInput{ InputMouse{ .position = i.p }, InputClassEnum::MouseMove });
 				}
 				else
 				{
 					guiMan->focus(0);
-					guiMan->handleInput(GenericInput{ InputMouse(), InputClassEnum::MouseMove });
+					guiMan->handleInput(GenericInput{ InputMouse{ .position = Vec2(-1) }, InputClassEnum::MouseMove });
 				}
 
 				auto q = guiMan->finish();
@@ -178,6 +196,18 @@ namespace cage
 		};
 	}
 
+	bool GuiInWorld::intersects(const Line &ray) const
+	{
+		GuiInWorldImpl *impl = (GuiInWorldImpl *)this;
+		return impl->detect(ray).intersects;
+	}
+
+	Vec3 GuiInWorld::intersection(const Line &ray) const
+	{
+		GuiInWorldImpl *impl = (GuiInWorldImpl *)this;
+		return impl->detect(ray).c;
+	}
+
 	void GuiInWorld::update(const Line &ray, bool interact)
 	{
 		GuiInWorldImpl *impl = (GuiInWorldImpl *)this;