From ed18a6e6999d55cbaba7a27c896a294c6e716b12 Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmai.com>
Date: Fri, 12 Feb 2021 13:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E7=BA=BF=E4=B8=8E=E5=B9=B3=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A4=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/3dMath/v15/.suo | Bin 36864 -> 39936 bytes
 GMath.cpp           |  21 +++++++++++++++++++++
 GMath.h             |   6 ++++++
 main.cpp            |  11 +++++++----
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.vs/3dMath/v15/.suo b/.vs/3dMath/v15/.suo
index 521fac9d27acb147025742b7cf0ef17b49cf151e..ed7b39461a9173fb34da11887f9e48f94bb6ecd8 100644
GIT binary patch
delta 950
zcmb7CO-xfk5PrMwwY<W<(n5<3X`w};1d3^(Q4^z9`f4~3DY5Z_mST{DqAB=DJotk~
zPf7xvgBMK<dhueEy?Dbw4<sh2iHXLO7cZWA*dwvd*7r#9=inrhnf+#F=bPDGctRIm
z)1^d&Dz^9(C4#Oz|EN~05>;VV+w-dMh?M9EQ6WY<UB$VGsPb8QnlKGB`cW~t3S+Tu
z5Nc1V1%WnHFKWOJy3u-2{iuyL7DQ{<zK*sTRkr14wF)8qvX`fL?d2VXd?E*7o^C<9
z;T{aDaS#nr5|hLrr8Bs$=@3Udq9<KAfzlx(%Y_7s+7~vV<)8ISs-X~cCBGfQ7JFyZ
zPLi#Ia?8lMU{j5A(UPOOLsCx2tzcHI&Aq>_07U2`Y_=X=Z7)+OA5VY?kHSXaC|`&S
z6I~AHTn(Zl%Os(OdeAzt#I^2iveHFY_R&(W`P3XDVD{bBon_UwYjuXXuctyv@l9QB
z*twL8I8#f}GV4RIcUK_F$ZBGP8bs#GzD^B@KyKG$U=2Rhl7}*byg8X{G?Xq(md~|Q
zV1=_x9^^YYAQ#8p6V{GM{g7Owe1vP}Hd!4qiN-JtAI|TE1oeQGegFeUrup>A7rIAo
zR*JzRqhFh_=`S&F!TmF*U~SyP^W$#XHYfjCO)6`*(U*DV4Lirpx6TEr|BIcWC<oqr
zLqE&K1ZynK{9`Gli+`?=c&9E*PtMO+6V~NoCX?jeD{lYq9OVvMW&i)=xHv#zc|62J
k`M2cnWOZNKyT1PT`()qE=g;)Tyr1EtUxh+!s!qp#0(prt2LJ#7

delta 900
zcmb7C&1+LZ5P!RQdEKP@(j+u(l~&UaLYrz#)6k1hf{i_ureN?AwN*3+jbh>Trr5g`
zGy{6jgX9kobU{2>Avt(z6DZW9hk`dLvL_G5nIzAoM+biF?0oHSW_J4%-+s%VC*gBW
zM2w(eNW(BV;!m^L#KT~)X%4^Nc*Dwkh1oF9&wA^x4}Tu1O@4(zEt~}Hna&Ji<NzXo
zh#)YzY2oQZgb`GY#E<$Af^-{Cfe0bgHS?IUFf@2nEWG@9WE`>u*y5|O<e39)9f<Rt
zBxqci0^Jv7QQ`#|A>olJ;2fSSBJDkcVL|e|*htE8y!0dJarI5y^Vp2xbr?bKw@Nv3
zAFAOw<=A<znC<Z>9nN!T+?s?W_bDf`=8=@t8v=UdK%732bE?jzi5BYp-y3>yUscDv
zOb{X0s&q!Oa-t@wGa5tJk&vu1!7EW-nc|gcUXEqWI0kgd#PUqIQ=~4e_Ojsj%$}fz
zyQSjN^C4N~cFWZ30zJ6aVoF<Z<H4DKWzMIv%W5E<_S<X%eZB91Gn#9cqFuXLN-x%#
zB!(y3$OM@(V;N@Bf?e|9T;8c%;*h#nRK?|Y!bd-X#IMG3-~0Vkf_P@1z|*U%uv_q{
z8wHCG6=<q0Io>UyP9H1#xD#Wkz3UMk`q7CnjKr5;sE;bWF8$@wS3#fJr3*TaP0XNW
zve)X&?v(G=WbX&2(JGDG2;9C?yt!3!)}8wgmr^MecwmKm#FRv|iT9y8g7{zJ&r<v^
Dzwj}R

diff --git a/GMath.cpp b/GMath.cpp
index 4264ba8..dc2810f 100644
--- a/GMath.cpp
+++ b/GMath.cpp
@@ -1132,3 +1132,24 @@ GVector3 GPlane::GetNormal() const
 {
 	return n;
 }
+
+float dist(const GPlane & pi, const GPoint3 & p)
+{
+	float D;
+	D = (p*pi.n + pi.d) / norm(pi.n);
+	return D;
+}
+
+bool intersect_line_plane(GPoint3 & p, const GLine & l, const GPlane & pi)
+{
+	//如果直线的方向和平面的法线垂直，则直线和平面平行，没有交点
+	if (EQ_ZERO((l.v*pi.n), PRECISION)) {
+		return false;
+	}
+
+	float t = -(l.p*pi.n + pi.d) / (l.v * pi.n);
+
+	p = l(t);
+
+	return true;
+}
diff --git a/GMath.h b/GMath.h
index 72a6879..102ed3c 100644
--- a/GMath.h
+++ b/GMath.h
@@ -226,6 +226,8 @@ public:
 
 	bool IsOnLine(const GPoint3& q);
 	friend float dist(const GPoint3& q, const GLine& l);
+
+	friend bool intersect_line_plane(GPoint3& p, const GLine& l, const GPlane& pi);
 };
 
 class GPlane {
@@ -241,4 +243,8 @@ public:
 
 	GPlane& operator =(const GPlane& rhs);
 	GVector3 GetNormal() const;
+
+	friend float dist(const GPlane& pi, const GPoint3& p);
+
+	friend bool intersect_line_plane(GPoint3& p, const GLine& l, const GPlane& pi);
 };
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 055bc8f..7fe3e78 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,11 +2,14 @@
 
 int main() {
 
-	GPlane PI1(GVector3(0.0f, 0.0f, 1.0f), GPoint3(0.0f, 0.0f, 0.0f));
-	GPlane PI2(GPoint3(1.0,0.0f,0.0f), GPoint3(0.0, 1.0f, 0.0f), GPoint3(0.0, 0.0f, 1.0f));
+	GPlane PI(1.0f, 1.0f, 1.0f, -1.0);
+	GLine l(GPoint3(0.0f, 0.0f, 0.0f), GVector3(1.0f, 1.0f, 1.0f));
 
-	GPlane PI = PI1;
-	cout << PI.GetNormal() << endl;
+	GPoint3 p;
+
+	bool ret = intersect_line_plane(p, l, PI);
+
+	cout << p << endl;
 
 	return 0;
 }
\ No newline at end of file