From fe345cf7e8a488bc103a2834f51dc90d861eeebe Mon Sep 17 00:00:00 2001
From: blobt <klm777x7@gmai.com>
Date: Thu, 11 Feb 2021 17:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E7=BA=BF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/3dMath/v15/.suo | Bin 38400 -> 38912 bytes
 GMath.cpp           |  12 ++++++++++++
 GMath.h             |   3 +++
 main.cpp            |  14 +++++++-------
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.vs/3dMath/v15/.suo b/.vs/3dMath/v15/.suo
index 7e1982f71e23220e9362071f91b9664b6fe5b931..e36491f91230e60016829fbc714742445eff0651 100644
GIT binary patch
delta 1213
zcma)5&ubGw6yBL`Vz%A2KNF)SO@F4rwlT4-9!#;4RMS$L7NSr*SfN$KldvAeA}Uye
z)VzxqFZC)?Gv`_%IS2)-AoOM{{sSHsu?St?+w9iOq2R#B%)EK;d*8e_v-E~9t?`uv
zyr1*=r6x)8Ns`17`=)8)Br&)vUw=2BXGK262BDKjl(n6YD_5m$783Wo(+tWy2}WIF
zJc!;HWNP-@XwN5bK88SYNwIC@m&J7hq6I<OXf(rZ`E@vhmT`n1QMH@q1g<9$`!8m<
zNlKk1rRmqB@)eZQg;H`%mC<3)4uaWO4;V*M%5mG!iZ^K;ZNptBV#KyO{EmVS+kO&f
z6>${NjtC>V;i)gJII1ooU)pmS?WpNTsXpt4tolc@6jKy2lL(<V7kDw6hO##adUVE8
znRGiCQI(Yf0S<xGTb06`(pB$}+JbUd(qnZ5_If9YNa)c#^F>@No@LsIz0n-=IW4f_
zb$_9ls)$NgiWP$um13yL2l9*{X75NdNcXRoG8v|x!qaY-2k1jNtIK19GW;Ij)L0Lm
zQc)ZZFnaRvWw{#?Tmii|?;CI(dS2q@+9ASF5Rp(v95P`E8pv>&tp8}^IgRz9rMJd6
z{+U?}QI{2r1PZ2VCud}Oeh!HTa1(^RzD>0sSI%p+x@5#uR*aQ3iL}?|z>`ua%kYD^
zRO*qfYRQJ%7%Ytpz}U!#L(8X0B*PsK|69yLF`ki6W3+P#(Bszagb~ki`<gk;>Z$ue
zU?fALsePD1#hU;<TqxN>#n{BxMx`DZY1E7G+-?I?#QwvZJaC?VkTrg8T*Nh1DRUp5
z%}>L|qE~#n<>w)KoYk?g{v8+el<B9`A%uB{@zt|@b(zDNa|>c&>Q&H7P0Kv6Nfg+*
l5fe`qzp=p3L9*SA3%I5hx|2PQ@Rn){db71DR^-*^-oGxgsjvV5

delta 1216
zcmbVL%}*0S6yKRH?JjKPt1T5;T4-tf0Bnhh3J9c&fEo%3i6<=)@gwnKTuw%<7Y*72
z?z?)bS7UVN<OvcukeG-hBpyh_KR^=?jlqM|_ex8bcyp3pX6DUr=KbEsWZv=28@?D1
za;Y@xB&iygwBIch3S@P_Jvse;W}2D&GHZY~9#Vg9f4JW)ePM@To=-s1k$}AOvvvr{
zT?o8afT^A+<Q?&mnv%g?n*F7@31=12fM`UJHyS#wQG`^Fs6{j*0&quu?e*en1Tlu#
z;}#0LFQ>LimK!#BSUDf_^r5PVn0Ka_Mx29kT>UC(q=PmLs!=7UVYFPpT~m-`&{-?a
z8X|~jM|cn|u%IN>Q@A3A7x_u|DDK8f78J5&RgXCpii;@41Q^<;;;<QnQJ>{jKxdka
z)^bYrsKKn|^KtNn-)a<doBdiotT8jZ;x1<6pA+l!7*j$vJ{Y}OOGhs!&}cspM(;Xv
zGtx)FRdhyDRqPmAVB>BC;#@WR<f>v%z@Mg3jgmn1DD#EUnq_8eO^MiykdI9(l)5qt
zjKQqwNm6?Vqj{Ran)i&^v#NC>r^Ch*`5ug}TL!s(308OlmiuI})2=Y9Q|B^Oy{rn1
z?i3`WgMtqab65!sKqjGU3NomZ_WkCQ0jP_Ly}pc2!YYr0(UB^?J=7&LzxaK&g)s(C
z`i_gC(PdsyImu)Sq3p2cIlYU(0g3TBapU4EX8Ko)<#VF3;?utl$<S314jf_S+h7E<
zX1D&IA&9!@Nv0h|CkL`@3j}sLKDwnSGN^PFDKRW&94!?cgIVjGrxNjIt?)efQRAea
zu0Mts*Ct?TR)y{K5%F~PEAz#uJB#DnQa`SXyoV*8Q+%59^1w!!g7X%FnwdTgwYw->
zVmx=7TN55trP9z)MexdZ7d%U6Kutdqu9;t)DPs5fP427O_ZJ@^-}L`=o4<t+cS+JZ
Ry(03rG@di%oaxLh^1r{{g!=#h

diff --git a/GMath.cpp b/GMath.cpp
index dd8b1d9..ff5810d 100644
--- a/GMath.cpp
+++ b/GMath.cpp
@@ -1084,3 +1084,15 @@ GVector3 GLine::GetDir() const
 {
 	return v;
 }
+
+bool GLine::IsOnLine(const GPoint3 & q)
+{
+	return EQ_ZERO(dist(q, *this), PRECISION);
+}
+
+float dist(const GPoint3 & q, const GLine & l)
+{
+	GVector3 u = q - l.p;
+	GVector3 p = proj(u, l.v);
+	return norm(u - p);
+}
\ No newline at end of file
diff --git a/GMath.h b/GMath.h
index ff9532a..8d7efd2 100644
--- a/GMath.h
+++ b/GMath.h
@@ -222,4 +222,7 @@ public:
 
 	GVector3 GetPt() const;
 	GVector3 GetDir() const;
+
+	bool IsOnLine(const GPoint3& q);
+	friend float dist(const GPoint3& q, const GLine& l);
 };
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index d004704..cad1ad6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,15 +2,15 @@
 
 int main() {
 
-	GLine l(GPoint3(0.0f, 0.0f, 0.0f), GVector3(1.0, 0.0f, 0.0f));
-	
-	GPoint3 p = l(2.0f);
+	GLine l(GPoint3(0.0f, 0.0f, 0.0f), GVector3(1.0f, 0.0f, 0.0f));
+	GPoint3 q(0.0f, 0.0f, 1.0f);
 
-	l.SetPt(GPoint3(0.0f, 0.0f, 1.0f));
-	l.SetDir(GVector3(1.0f, 0.0f, 0.0f));
+	float d = dist(q, l);
 
-	GPoint3 q = l(1.0f);
+	cout << d << endl;
 
-	cout << q << endl;
+	bool b = l.IsOnLine(GPoint3(0.0f, 0.0f, 0.0f));
+	bool b2 = l.IsOnLine(GPoint3(0.5f, 0.0f, 0.0f));
+	bool b3 = l.IsOnLine(GPoint3(0.5f, 0.5f, 0.0f));
 	return 0;
 }
\ No newline at end of file