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

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

diff --git a/.vs/3dMath/v15/.suo b/.vs/3dMath/v15/.suo
index c81a293870d600882399d8f1d98bec38c7d2f086..ba305557f9ad229369239bce88eae6d3cfc87875 100644
GIT binary patch
delta 1925
zcmcgtUrbwN6z_L?FTE|dUFo0Ej?NWUSSgj=OBraw7FjEFP_|-NG$HEv=Vrpg;u_;{
z!6sW`GO8K(yl65LMIY2HnsFbDFFFS=hAAa3viO4WX)z`)rkd3m<~jHFPEhu?c#>bg
z?>p!F^E>};^Ow2&hunoOCSKXUjbk3D=XSYnuYG=Mhh>!oEhurA;-=WA@H@9Gxp4g`
z;vNbN#v)L%MvrbsMHQmDVsKW*KxM4O(T?ySyohx=jgrE-8&QMUhS-4!A;{Ja@2TF|
zV;QldqJW#BNaGW@=tdkwBoThZlZZ5ePLZt74z8)(q$_{-yP+WZ5J8*n!y#DkDiuFy
zV@u_b;fE~@H+Y}KSCr%^goTh$hm&4|3?JE9vF^q(jPM~O1bOrbjtvO7z^7P`aYC*k
zhKCUJU>}aiZdG-p*d^$8c;OkxI9tCmm}IJy7AZWmjreFesmQk4M6onCK~B0MS~n@2
zSw4&kSn1deGH16FF<hgj+ffVd5U&M7x0o78IvL$!W=Ib~E>P6nH`8Y*g9S)AeD{ye
zccqzV!wdf*QCCpoixP#I!g60<YA;GuD#`|>@D?tHwQ{eGQ+-KT;1tL;Wnqz%g^Or;
zS}Xf(Ol?@uEm!+_xYKZ*kD<kMNbTnt2W4eRqIan1%=ffXTaj(SB7Veak#QfT$J`6K
zeM6A;#SJ=8_VyW6d|Cb4jfJt1S1c`3sq43_v_#>RSVoGYqR~`R;z}`zscnn@;RmI*
zBSz3SXDm@rWdV*J3_In0a$Hf)^o&fNn#h1G`yn$S!pF_cVtd?BLtY-Tx-1M<TAJq+
zrnaWdxInHI!<aY#+}>`1Q6ribVH6i<;q>0uRS#yJ`j2|f42AF}E*PBl^h<ki*0jL{
zB~MWjQ9-?H?uXK@kml}5Flr{q)fVRZ_y?8KveQE4`mcJze6*sL`pUetx*r!*Cn%r{
zOlaeWFS7Zr1^tmKYVN27{;dDnEDP;UgZKdNUuF-_R|)WCY7r7OwzyTYT}<P8JbpWs
zB1skO9PVaL?fKz)TlHCt90lBJnTDCs!+Ji~#-bpO<>CD3G}y*nY?DQU@fSIPzCi~x
zc6^lc-=$*F<@T3NsHbm4iq6_?y#ph;6RjtLb6F04Yz}C(lS?c_c0<IgOE@t<P;?C_
zgU7WOp87<zQ$k7X4}mNdh}R&i6W1@6_Y+yFGo7sV$ILG*_^oa-ewHh9`gmHkzxJGC
zPR5LX0S?18faRZZwkdKv(QY(E7BzLYv6Cmyyei9TN2h!BwYPsbR_=@>&R?368h?5T
z-c`55vmM{N`7hr8=K8ss)Mqz;yHy{bnM8w6yo@w|74)v~Yq{A1Hy_RauTOSn7@L5v
c9=qpGx~^S&=jV}@>5o1T-*~P@g5u-y-~H%t-v9sr

delta 1873
zcmd5+O>7fa5Z?E^-q>c>Ho*=dvO_`$#bpD#g;0=8Me!=-w@w8@MQIC#R8gxOsJa)T
zRI#EUh_R}8r-vTes)}+zDu*Vks#1Gsh;!*BF&7S0;=mb+9u^f)gFCZclckE%OAme0
z?7TN`X5Kg7o419Vyl{(8WtlR2D8}KW)DabOQ;%nAciDD95axHm2p?hJ!(+ZIN@##P
z#V*iz7@WY)o)j9kpww{0QK!8*Ig%}cI^@mU;Zt$5wgFeoD91c&E9w}^bM)>&-R8|H
zng&dT3`m3$<qKKXi5bq9FN|8!aP%@Ou7z<aD7*}^spDJ=rmQEce-qwXMomYHC`pu!
zC{YwDggiH+CRkzA1e2f<eA*-U&&%(05j?gDapj>uB!VfvNBAO!)trELBZISN3}(qk
zLy8v$cQV^;Q?9c0_e;#ua!}!V@CytS;EHxarc-zL(tx8?VNuc~Kx3-_&(g=B(yfEJ
zqhAi7X_wD8_%$wu?5FKb%z7=SFv>-jOS%rJ506ab6k!uusn*60n2D-LM7+3mGg-1)
zD~iiTr{B}bE<<I@q3LGsftLvUiU1?p@wL#SH`l?@QxH$>g^GmGQ+ZcAsl3AWVDMId
zelwj{+-9SuYv7ZpyZ%t%+1B6O(D`1`e)2|Wy)xT90vdfu1c2GTE^Bkw3rt?Yqo`lF
z5D-9D--`6A+GyX0!=HVWhx?P;m}VJ^ZlTmL4S=>|L>ch51)18a%eMng+p^;NsXlA)
zD_jh~)1G|j6`vW*-Tg8l?)Dp<!xL;AuI#yHsX>s`j;P+N>UBuR(GSW)t#ETPBWn$y
zh!qOznLtp8VcD7K9%j9|DARlF@#VFhZB@1w-l|)kAFk}e#aJ3v@%4CSq3@UUk;$LB
zRXO>?Hw#bTyHX3hU%ac{)0DB9<P7_9<@cip&z-(a0YnmwPA&+a;Jdwr6+Q~O&6c#y
z@=3;WaNDW@KYQ5PZOA%?__=jSA(qxAWiDG`)RC5f?MlbcBPZ>)yt7kg_#YE(@%ku}
z1-9<p!fCZTrmeDj3NyW6S3j^{-FL7~`#;!)BWG2Z-yespHL+UDTwfv?rcR;}gY>|g
zEN-74=xo|Bj^)u43<#gYjf-!?uR{{tzm$RSr2-T$jzQC4l)bcLe>wOuk2G=_V_sC)
z{$NPrEf48O;Eg|VjztQ_YW&jGz0>=+&4wSa^ek=_T-U_>&!~xO`a!xG?AnQB?0<mR
wUb>p(ZQr^u>z@TwS(G|d`>$&g|9+RX$pimoo8BmKcyMYQuQ+N?l`gZt0U+&;UjP6A

diff --git a/GMath.cpp b/GMath.cpp
index e8f164f..7d09e3a 100644
--- a/GMath.cpp
+++ b/GMath.cpp
@@ -1039,3 +1039,26 @@ float Det(const GMatrix & m)
 	return ret;
 }
 
+GLine::GLine(const GPoint3 & _p, const GVector3 & _v)
+{
+	p = _p;
+	v = _v;
+}
+
+GLine::GLine(const GLine & copy)
+{
+	p = copy.p;
+	v = copy.v;
+}
+
+GLine & GLine::operator=(const GLine & rhs)
+{
+	p = rhs.p;
+	v = rhs.v;
+	return *this;
+}
+
+GPoint3 GLine::operator()(const float t) const
+{
+	return p + v*t;
+}
diff --git a/GMath.h b/GMath.h
index f18bfa5..9dc7475 100644
--- a/GMath.h
+++ b/GMath.h
@@ -18,6 +18,11 @@
 
 using namespace std;
 
+class GVector3;
+class GVector;
+class GMatrix;
+typedef GVector3 GPoint3;
+
 class GVector3 {
 private:
 	float v[3];
@@ -74,7 +79,6 @@ public:
 	const float operator [](const int& idx) const;//下标获取分量
 };
 
-class GMatrix;
 class GVector {
 public:
 	//GVector 1~2
@@ -192,11 +196,24 @@ public:
 	friend int Rank(const GMatrix& m);//获取矩阵的秩
 	friend int Nullity(const GMatrix& m);//获取矩阵的零化度
 
-	friend GMatrix Mij(const GMatrix& m, int r, int c); //计算余子式
+	friend GMatrix Mij(const GMatrix& m, int r, int c); //计算余子式矩阵
 	friend float Det(const GMatrix& m);
 
 private:
 	int r;
 	int c;
 	float *m;
+};
+
+class GLine {
+private:
+	// l(t) = p + t*v;
+	GPoint3 p;//端点
+	GVector3 v;//方向
+public:
+	GLine(const GPoint3& _p = GPoint3(0.0f, 0.0f, 0.0f), const GVector3& _v = GVector3(0.0f, 0.0f, 0.0f));
+	GLine(const GLine& copy);
+
+	GLine& operator =(const GLine& rhs);
+	GPoint3 operator ()(const float t) const;
 };
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 4c5d295..720e3a7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,16 +2,10 @@
 
 int main() {
 
-	float f1[] = { 
-		1.0f, 4.0f, -8.0,
-		0.0f, 2.0f, 9.0,
-		0.0f, 6.0f, 1.0f
-	};
-
-	GMatrix M1(3,3, f1);
-	cout << M1 << endl;
-
-	cout << Det(M1) << endl;
+	GLine l(GPoint3(0.0f, 0.0f, 0.0f), GVector3(1.0, 0.0f, 0.0f));
 	
+	GPoint3 p = l(2.0f);
+
+	cout << p << endl;
 	return 0;
 }
\ No newline at end of file