diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h index f17459296ce..8c31b878a18 100644 --- a/include/JSystem/J2DGraph/J2DOrthoGraph.h +++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h @@ -7,8 +7,8 @@ class J2DOrthoGraph : public J2DGrafContext { public: /* 802E9670 */ J2DOrthoGraph(); - /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); + /* 802E96D0 */ J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near); + /* 802E980C */ void setOrtho(JGeometry::TBox2 const& bounds, f32 far, f32 near); /* 802E987C */ void scissorBounds(JGeometry::TBox2*, JGeometry::TBox2 const*); /* 8000B118 */ virtual ~J2DOrthoGraph() {} @@ -19,9 +19,9 @@ public: f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); } f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); } - void setOrtho(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5) { - JGeometry::TBox2 ortho(param_0, param_1, param_0 + param_2, param_1 + param_3); - setOrtho(ortho, param_4, param_5); + void setOrtho(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near) { + JGeometry::TBox2 ortho(x, y, x + width, y + height); + setOrtho(ortho, far, near); } private: @@ -30,12 +30,11 @@ private: /* 0xD0 */ f32 mFar; }; -void J2DDrawLine(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color, +void J2DDrawLine(f32 x1, f32 y1, f32 x2, f32 y2, JUtility::TColor color, int line_width); -void J2DFillBox(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color); -void J2DFillBox(JGeometry::TBox2 const& param_0, JUtility::TColor param_1); -void J2DDrawFrame(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor param_4, - u8 param_5); -void J2DDrawFrame(JGeometry::TBox2 const& param_0, JUtility::TColor param_1, u8 param_2); +void J2DFillBox(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color); +void J2DFillBox(JGeometry::TBox2 const& box, JUtility::TColor color); +void J2DDrawFrame(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color, u8 line_width); +void J2DDrawFrame(JGeometry::TBox2 const& box, JUtility::TColor color, u8 line_width); #endif /* J2DORTHOGRAPH_H */ diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp index 0c2fe29963b..75d5e32b60d 100644 --- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp @@ -26,11 +26,11 @@ J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) { } /* 802E96D0-802E97B4 2E4010 00E4+00 0/0 7/7 0/0 .text __ct__13J2DOrthoGraphFffffff */ -J2DOrthoGraph::J2DOrthoGraph(f32 left, f32 top, f32 right, f32 bottom, f32 param_4, f32 param_5) - : J2DGrafContext(left, top, right, bottom) { - mOrtho = JGeometry::TBox2(0, 0, right, bottom); - mNear = -param_5; - mFar = -param_4; +J2DOrthoGraph::J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near) + : J2DGrafContext(x, y, width, height) { + mOrtho = JGeometry::TBox2(0, 0, width, height); + mNear = -near; + mFar = -far; this->setLookat(); } @@ -72,41 +72,41 @@ void J2DOrthoGraph::scissorBounds(JGeometry::TBox2* param_0, } /* 802E9998-802E9AC4 2E42D8 012C+00 0/0 6/6 0/0 .text J2DDrawLine__FffffQ28JUtility6TColori */ -void J2DDrawLine(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color, +void J2DDrawLine(f32 x1, f32 y1, f32 x2, f32 y2, JUtility::TColor color, int line_width) { J2DOrthoGraph oGrph; oGrph.setLineWidth(line_width); oGrph.setColor(color); - oGrph.moveTo(param_0, param_1); - oGrph.lineTo(param_2, param_3); + oGrph.moveTo(x1, y1); + oGrph.lineTo(x2, y2); } /* 802E9AC4-802E9B0C 2E4404 0048+00 0/0 10/10 0/0 .text J2DFillBox__FffffQ28JUtility6TColor */ -void J2DFillBox(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color) { - J2DFillBox(JGeometry::TBox2(param_0, param_1, param_0 + param_2, param_1 + param_3), +void J2DFillBox(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color) { + J2DFillBox(JGeometry::TBox2(x, y, x + width, y + height), color); } /* 802E9B0C-802E9B9C 2E444C 0090+00 1/1 0/0 0/0 .text * J2DFillBox__FRCQ29JGeometry8TBox2Q28JUtility6TColor */ -void J2DFillBox(JGeometry::TBox2 const& param_0, JUtility::TColor param_1) { +void J2DFillBox(JGeometry::TBox2 const& box, JUtility::TColor color) { J2DOrthoGraph oGrph; - oGrph.setColor(param_1); - oGrph.fillBox(param_0); + oGrph.setColor(color); + oGrph.fillBox(box); } /* 802E9B9C-802E9BE8 2E44DC 004C+00 0/0 5/5 0/0 .text J2DDrawFrame__FffffQ28JUtility6TColorUc */ -void J2DDrawFrame(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color, +void J2DDrawFrame(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color, u8 line_width) { - J2DDrawFrame(JGeometry::TBox2(param_0, param_1, param_0 + param_2, param_1 + param_3), + J2DDrawFrame(JGeometry::TBox2(x, y, x + width, y + height), color, line_width); } /* 802E9BE8-802E9C88 2E4528 00A0+00 1/1 0/0 0/0 .text * J2DDrawFrame__FRCQ29JGeometry8TBox2Q28JUtility6TColorUc */ -void J2DDrawFrame(JGeometry::TBox2 const& param_0, JUtility::TColor color, u8 line_width) { +void J2DDrawFrame(JGeometry::TBox2 const& box, JUtility::TColor color, u8 line_width) { J2DOrthoGraph oGrph; oGrph.setColor(color); oGrph.setLineWidth(line_width); - oGrph.drawFrame(param_0); + oGrph.drawFrame(box); }