almost all of dolphin matched (#2036)

* TRK full match

* remove trk asm

* ar done

* cleanup some dolphin headers

* more dolphin cleanup

* cleanup / GD fully matched

* almost all of GX fully matched

* GX / Mtx full matched

* most of OS done

* pad done

* most of VI

* remove asm

* forgot couple vec funcs

* couple JUtility matches

32 files changed, 54 insertions, 61 deletions

diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h
index 1d41b50983..b2e49ced53 100644
--- a/include/JSystem/J2DGraph/J2DGrafContext.h
+++ b/include/JSystem/J2DGraph/J2DGrafContext.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JGeometry.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 #include "dolphin/types.h"
 
 class J2DGrafContext {
diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index 26b6bb6c19..6e6a605bfa 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -4,7 +4,7 @@
 #include "JSystem/JGeometry.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/gx/GXEnum.h"
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 
 class J2DAnmBase;
 class J2DAnmColor;
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index 1244020b19..4de6ad07a7 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/gx/GXEnum.h"
 #include "dolphin/gx/GXStruct.h"
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 
 struct J2DTextureSRTInfo {
     /* 0x00 */ f32 field_0x0;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index a8048a1b2c..297d79fadc 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 #include "dolphin/types.h"
 
 enum J3DMdlFlag {
diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index 2ff7131106..1a10836999 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -2,7 +2,7 @@
 #define J3DGD_H
 
 #include "dolphin/gd/GDBase.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx.h"
 
 inline void J3DGDWrite_u8(u8 param) {
     __GDWrite(param);
@@ -31,8 +31,8 @@ inline void J3DGDWriteBPCmd(u32 cmd) {
 }
 
 inline void J3DFifoLoadBPCmd(u32 cmd) {
-    GFX_FIFO(u8) = 0x61;
-    GFX_FIFO(u32) = cmd;
+    GXWGFifo.u8 = 0x61;
+    GXWGFifo.u32 = cmd;
 }
 
 inline void J3DGDWriteXFCmd(u16 addr, u32 cmd) {
@@ -49,17 +49,17 @@ inline void J3DGDWriteXFCmdHdr(u16 addr, u8 len) {
 }
 
 inline void J3DFifoWriteXFCmdHdr(u16 addr, u8 len) {
-    GFX_FIFO(u8) = 0x10;
-    GFX_FIFO(u16) = len - 1;
-    GFX_FIFO(u16) = addr;
+    GXWGFifo.u8 = 0x10;
+    GXWGFifo.u16 = len - 1;
+    GXWGFifo.u16 = addr;
 }
 
 inline void J3DGXCmd1f32ptr(f32* value) {
-    GFX_FIFO(u32) = *(u32*)value;
+    GXWGFifo.u32 = *(u32*)value;
 }
 
 inline void J3DGXCmd1f32(f32 value) {
-    GFX_FIFO(u32) = *(u32*)&value;
+    GXWGFifo.u32 = *(u32*)&value;
 }
 
 inline void J3DGDWriteCPCmd(u8 reg, u32 value) {
@@ -104,9 +104,9 @@ void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32);
 void J3DFifoLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
 
 static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
-    GFX_FIFO(u8) = cmd;
-    GFX_FIFO(u16) = indx;
-    GFX_FIFO(u16) = addr;
+    GXWGFifo.u8 = cmd;
+    GXWGFifo.u16 = indx;
+    GXWGFifo.u16 = addr;
 }
 
 inline void J3DGDSetNumChans(u8 numChans) {
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index afa53214db..e045b31edc 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -3,7 +3,7 @@
 

 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"

 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"

-#include "dolphin/gx/GX.h"

+#include "dolphin/gx.h"

 #include "dolphin/types.h"

 

 class J3DCurrentMtxInfo {

@@ -13,15 +13,15 @@ public:
 };

 

 static inline void J3DFifoWriteCPCmd(u8 cmd, u32 param) {

-    GFX_FIFO(u8) = GX_CMD_LOAD_CP_REG;

-    GFX_FIFO(u8) = cmd;

-    GFX_FIFO(u32) = param;

+    GXWGFifo.u8 = GX_CMD_LOAD_CP_REG;

+    GXWGFifo.u8 = cmd;

+    GXWGFifo.u32 = param;

 }

 

 static inline void J3DFifoWriteXFCmd(u16 cmd, u16 len) {

-    GFX_FIFO(u8) = GX_CMD_LOAD_XF_REG;

-    GFX_FIFO(u16) = (len - 1);

-    GFX_FIFO(u16) = cmd;

+    GXWGFifo.u8 = GX_CMD_LOAD_XF_REG;

+    GXWGFifo.u16 = (len - 1);

+    GXWGFifo.u16 = cmd;

 }

 

 class J3DCurrentMtx : public J3DCurrentMtxInfo {

@@ -44,8 +44,8 @@ public:
         J3DFifoWriteCPCmd(0x30, getMtxIdxRegA());  // CP_MATINDEX_A

         J3DFifoWriteCPCmd(0x40, getMtxIdxRegB());  // CP_MATINDEX_B

         J3DFifoWriteXFCmd(0x1018, 2);

-        GFX_FIFO(u32) = getMtxIdxRegA();

-        GFX_FIFO(u32) = getMtxIdxRegB();

+        GXWGFifo.u32 = getMtxIdxRegA();

+        GXWGFifo.u32 = getMtxIdxRegB();

     }

 

     void setCurrentTexMtx(u8 param_1, u8 param_2, u8 param_3, u8 param_4,

diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index 824ab06de0..222d35a0a1 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -1,7 +1,7 @@
 #ifndef J3DSHAPEMTX_H
 #define J3DSHAPEMTX_H
 
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 
 class J3DTexMtx;
 class J3DTexGenBlock;
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index 1932113cb1..06fb45e5b0 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -2,7 +2,7 @@
 #define J3DSTRUCT_H
 
 #include "dolphin/gx/GXStruct.h"
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 #include "dolphin/mtx/mtx44.h"
 #include "dolphin/mtx/vec.h"
 
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index a7a3469938..774f303fc1 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -1,7 +1,7 @@
 #ifndef J3DSYS_H
 #define J3DSYS_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx.h"
 #include "dolphin/types.h"
 
 // Perhaps move to a new J3DEnum.h?
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index a37ceb8006..c0741a4d0a 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -3,7 +3,7 @@
 

 #include "JSystem/J3DGraphBase/J3DStruct.h"

 #include "JSystem/JUtility/JUTTexture.h"

-#include "dolphin/mtx/mtx.h"

+#include "dolphin/mtx.h"

 #include "dolphin/types.h"

 

 class J3DTexture {

diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 5cd4601ef5..5ffe0a73d9 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -2,7 +2,7 @@
 #define J3DTRANSFORM_H
 
 #include "JSystem/JGeometry.h"
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 
 struct J3DTextureSRTInfo;
 
diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
index 1ebc2614bb..2770e348ba 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
@@ -2,7 +2,7 @@
 #define J3DMODELLOADER_H

 

 #include "dolphin/types.h"

-#include "dolphin/mtx/mtx.h"

+#include "dolphin/mtx.h"

 

 class J3DModelData;

 class J3DMaterialTable;

diff --git a/include/JSystem/J3DU/J3DUClipper.h b/include/JSystem/J3DU/J3DUClipper.h
index 8e41a7ae89..e5df65b192 100644
--- a/include/JSystem/J3DU/J3DUClipper.h
+++ b/include/JSystem/J3DU/J3DUClipper.h
@@ -1,7 +1,7 @@
 #ifndef J3DUCLIPPER_H
 #define J3DUCLIPPER_H
 
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 #include "dolphin/types.h"
 
 class J3DUClipper {
diff --git a/include/JSystem/JAudio2/dspproc.h b/include/JSystem/JAudio2/dspproc.h
index 50b438de27..4330bc177d 100644
--- a/include/JSystem/JAudio2/dspproc.h
+++ b/include/JSystem/JAudio2/dspproc.h
@@ -1,7 +1,7 @@
 #ifndef DSPPROC_H
 #define DSPPROC_H
 
-#include "dolphin/dsp/dsp.h"
+#include "dolphin/dsp.h"
 
 void DsyncFrame2ch(u32 param_0, u32 param_1, u32 param_2);
 void DsyncFrame4ch(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4);
diff --git a/include/JSystem/JAudio2/osdsp_task.h b/include/JSystem/JAudio2/osdsp_task.h
index c27f585f0c..3252dadd65 100644
--- a/include/JSystem/JAudio2/osdsp_task.h
+++ b/include/JSystem/JAudio2/osdsp_task.h
@@ -1,22 +1,12 @@
 #ifndef OSDSP_TASK_H
 #define OSDSP_TASK_H
 
-#include "dolphin/os/OSInterrupt.h"
+#include "dolphin/dsp.h"
 
 struct DSPTaskInfo;
 
 extern DSPTaskInfo* DSP_prior_task;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void __DSPHandler(OSInterrupt interrupt, OSContext* context);
-
-#ifdef __cplusplus
-}
-#endif
-
 void DsyncFrame2(u32 param_0, u32 param_1, u32 param_2);
 
 #endif /* OSDSP_TASK_H */
diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h
index e7552610d1..5d18293601 100644
--- a/include/JSystem/JGadget/linklist.h
+++ b/include/JSystem/JGadget/linklist.h
@@ -104,6 +104,9 @@ struct TLinkList : public TNodeLinkList {
             TNodeLinkList::const_iterator::operator++();
             return *this;
         }
+
+        friend bool operator==(const_iterator a, const_iterator b) { return a == b; }
+        friend bool operator!=(const_iterator a, const_iterator b) { return !(a == b); }
     };
 
     TLinkListNode* Element_toNode(T* element) const { return &element->ocObject_; }
diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h
index e1d959b5ae..8cf3213d4e 100644
--- a/include/JSystem/JKernel/JKRAramPiece.h
+++ b/include/JSystem/JKernel/JKRAramPiece.h
@@ -2,7 +2,7 @@
 #define JKRARAMPIECE_H
 
 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/ar/arq.h"
+#include "dolphin/arq.h"
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSMutex.h"
 
diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h
index 442ef026c6..9281ac3267 100644
--- a/include/JSystem/JKernel/JKRDvdFile.h
+++ b/include/JSystem/JKernel/JKRDvdFile.h
@@ -2,7 +2,7 @@
 #define JKRDVDFILE_H
 
 #include "JSystem/JKernel/JKRFile.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/dvd.h"
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSMutex.h"
 
diff --git a/include/JSystem/JKernel/JKRFileFinder.h b/include/JSystem/JKernel/JKRFileFinder.h
index 7a8e8f41f0..24a88e6d24 100644
--- a/include/JSystem/JKernel/JKRFileFinder.h
+++ b/include/JSystem/JKernel/JKRFileFinder.h
@@ -1,7 +1,7 @@
 #ifndef JKRFILEFINDER_H
 #define JKRFILEFINDER_H
 
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/dvd.h"
 
 class JKRFileFinder {
 public:
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index e305ccc744..2ce474db6a 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -1,7 +1,7 @@
 #ifndef JMATH_H
 #define JMATH_H
 
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 
 void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
 void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
diff --git a/include/JSystem/JParticle/JPADrawInfo.h b/include/JSystem/JParticle/JPADrawInfo.h
index c0643214a4..f241d73a27 100644
--- a/include/JSystem/JParticle/JPADrawInfo.h
+++ b/include/JSystem/JParticle/JPADrawInfo.h
@@ -1,7 +1,7 @@
 #ifndef JPADRAWINFO_H
 #define JPADRAWINFO_H
 
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 
 class JPADrawInfo {
 public:
diff --git a/include/JSystem/JParticle/JPAMath.h b/include/JSystem/JParticle/JPAMath.h
index 0451090843..68701359ce 100644
--- a/include/JSystem/JParticle/JPAMath.h
+++ b/include/JSystem/JParticle/JPAMath.h
@@ -1,7 +1,7 @@
 #ifndef JPAMATH_H
 #define JPAMATH_H
 
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 #include "JSystem/JGeometry.h"
 
 void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]);
diff --git a/include/JSystem/JStage/JSGObject.h b/include/JSystem/JStage/JSGObject.h
index 6d700ffd1b..742406b8b0 100644
--- a/include/JSystem/JStage/JSGObject.h
+++ b/include/JSystem/JStage/JSGObject.h
@@ -1,7 +1,7 @@
 #ifndef JSGOBJECT_H
 #define JSGOBJECT_H
 
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 
 namespace JStage {
     struct TObject {
diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h
index 91fcae46a6..26fb5f5d4e 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-control.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-control.h
@@ -4,7 +4,7 @@
 #include "JSystem/JStudio/JStudio/fvb.h"
 #include "JSystem/JStudio/JStudio/stb.h"
 #include "JSystem/JStudio/JStudio/ctb.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx.h"
 #include "dolphin/mtx/vec.h"
 
 namespace JStudio {
diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h
index 8281c5af32..d28aadf119 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-math.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-math.h
@@ -1,7 +1,7 @@
 #ifndef JSTUDIO_MATH_H
 #define JSTUDIO_MATH_H
 
-#include "dolphin/mtx/mtxvec.h"
+#include "dolphin/mtx.h"
 
 namespace JStudio {
 namespace math {
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 30a6f62b8b..f7e9c2a39c 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -2,7 +2,7 @@
 #define JUTASSERT_H
 
 #include "dolphin/types.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os.h"
 
 #ifdef DEBUG
 #define JUT_ASSERT(LINE, COND)                                                                     \
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index bbf2829d34..e45bde9ddc 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -94,7 +94,7 @@ private:
 
 private:
     /* 0x20 */ u32 field_0x20;
-    /* 0x24 */ u32 mMaxLines;
+    /* 0x24 */ int mMaxLines;
     /* 0x28 */ u8* mBuf;
     /* 0x2C */ bool field_0x2c;
     /* 0x30 */ int field_0x30;
diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h
index 583e7c88c7..f5f4ac2709 100644
--- a/include/JSystem/JUtility/JUTDirectFile.h
+++ b/include/JSystem/JUtility/JUTDirectFile.h
@@ -1,7 +1,7 @@
 #ifndef JUTDIRECTFILE_H
 #define JUTDIRECTFILE_H
 
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/dvd.h"
 
 #define JUTDF_BUFSIZE (0x800)
 
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index 5e326217da..568731bdb1 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "dolphin/os/OSTime.h"
-#include "dolphin/pad/Pad.h"
+#include "dolphin/pad.h"
 #include "dolphin/types.h"
 
 typedef void (*callbackFn)(int, void*);
@@ -195,9 +195,9 @@ public:
     struct CRumble {
         CRumble(JUTGamePad* pad) { clear(pad); }
 
-        static PADMask sChannelMask[4];
+        static u32 sChannelMask[4];
         static bool mStatus[4];
-        static PADMask mEnabled;
+        static u32 mEnabled;
 
         enum ERumble {
             VAL_0 = 0,
diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h
index 6304ec0a5e..831a799432 100644
--- a/include/JSystem/JUtility/JUTGraphFifo.h
+++ b/include/JSystem/JUtility/JUTGraphFifo.h
@@ -1,7 +1,7 @@
 #ifndef JUTGRAPHFIFO_H
 #define JUTGRAPHFIFO_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx.h"
 
 class JUTGraphFifo {
 public:
diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h
index 1cf622b515..1030b7f2b8 100644
--- a/include/JSystem/JUtility/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo.h
@@ -4,7 +4,7 @@
 #include "dolphin/gx/GXStruct.h"
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSTime.h"
-#include "dolphin/vi/vi.h"
+#include "dolphin/vi.h"
 
 typedef u8 (*Pattern)[2];
 
diff --git a/include/JSystem/TPosition3.hh b/include/JSystem/TPosition3.hh
index 3ff7bb5b23..6bde151d05 100644
--- a/include/JSystem/TPosition3.hh
+++ b/include/JSystem/TPosition3.hh
@@ -1,7 +1,7 @@
 #ifndef TPOSITION3_H
 #define TPOSITION3_H
 
-#include "dolphin/mtx/mtx.h"
+#include "dolphin/mtx.h"
 #include "JSystem/JMath/JMath.h"
 
 namespace JGeometry {