AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make CLineRenderer supply verts in clip-space

This commit is contained in:
Jack Andersen 2018-06-23 15:01:29 -10:00
parent 19ffd74468
commit 4ddec7e10c
5 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Graphics/CGraphics.cpp
View File

@ -468,6 +468,12 @@ zeus::CVector3f CGraphics::ProjectModelPointToViewportSpace(const zeus::CVector3
return GetPerspectiveProjectionMatrix(true).multiplyOneOverW(pt); return GetPerspectiveProjectionMatrix(true).multiplyOneOverW(pt);
} }
zeus::CVector3f CGraphics::ProjectModelPointToViewportSpace(const zeus::CVector3f& point, float& wOut)
{
zeus::CVector3f pt = g_GXModelView * point;
return GetPerspectiveProjectionMatrix(true).multiplyOneOverW(pt, wOut);
}
void CGraphics::SetViewportResolution(const zeus::CVector2i& res) void CGraphics::SetViewportResolution(const zeus::CVector2i& res)
{ {
g_Viewport.x8_width = res.x; g_Viewport.x8_width = res.x;

1
Runtime/Graphics/CGraphics.hpp
View File

@ -290,6 +290,7 @@ public:
static SClipScreenRect ClipScreenRectFromMS(const zeus::CVector3f& p1, const zeus::CVector3f& p2); static SClipScreenRect ClipScreenRectFromMS(const zeus::CVector3f& p1, const zeus::CVector3f& p2);
static SClipScreenRect ClipScreenRectFromVS(const zeus::CVector3f& p1, const zeus::CVector3f& p2); static SClipScreenRect ClipScreenRectFromVS(const zeus::CVector3f& p1, const zeus::CVector3f& p2);
static zeus::CVector3f ProjectModelPointToViewportSpace(const zeus::CVector3f& point); static zeus::CVector3f ProjectModelPointToViewportSpace(const zeus::CVector3f& point);
static zeus::CVector3f ProjectModelPointToViewportSpace(const zeus::CVector3f& point, float& wOut);
static void SetViewportResolution(const zeus::CVector2i& res); static void SetViewportResolution(const zeus::CVector2i& res);
static void SetViewport(int leftOff, int bottomOff, int width, int height); static void SetViewport(int leftOff, int bottomOff, int width, int height);

67
Runtime/Graphics/CLineRenderer.cpp
View File

@ -133,13 +133,15 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
return; return;
float adjWidth = width / 480.f; float adjWidth = width / 480.f;
zeus::CVector3f projPt = CGraphics::ProjectModelPointToViewportSpace(position); float w;
zeus::CVector3f projPt = CGraphics::ProjectModelPointToViewportSpace(position, w);
if (m_mode == EPrimitiveMode::LineLoop) if (m_mode == EPrimitiveMode::LineLoop)
{ {
if (m_nextVert == 0) if (m_nextVert == 0)
{ {
m_firstPos = projPt; m_firstPos = projPt;
m_firstW = w;
m_secondPos = projPt; m_secondPos = projPt;
m_firstUV = uv; m_firstUV = uv;
m_firstColor = color; m_firstColor = color;
@ -172,14 +174,14 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
if (m_nextVert & 1) if (m_nextVert & 1)
{ {
g_StaticLineVertsTex.push_back(g_StaticLineVertsTex.back()); g_StaticLineVertsTex.push_back(g_StaticLineVertsTex.back());
g_StaticLineVertsTex.push_back({m_lastPos + dvb, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dvb, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back(g_StaticLineVertsTex.back()); g_StaticLineVertsTex.push_back(g_StaticLineVertsTex.back());
g_StaticLineVertsTex.push_back({m_lastPos - dvb, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dvb, m_lastW), m_lastColor, m_lastUV});
} }
else else
{ {
g_StaticLineVertsTex.push_back({m_lastPos + dva, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dva, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back({m_lastPos - dva, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dva, m_lastW), m_lastColor, m_lastUV});
} }
} }
else else
@ -192,8 +194,8 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
m_lastPos.toVec2f() - dvb, projPt.toVec2f() - dvb); m_lastPos.toVec2f() - dvb, projPt.toVec2f() - dvb);
intersect2.z = m_lastPos.z; intersect2.z = m_lastPos.z;
g_StaticLineVertsTex.push_back({intersect1, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect1, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back({intersect2, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect2, m_lastW), m_lastColor, m_lastUV});
} }
} }
else else
@ -203,14 +205,14 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
if (m_nextVert & 1) if (m_nextVert & 1)
{ {
g_StaticLineVertsNoTex.push_back(g_StaticLineVertsNoTex.back()); g_StaticLineVertsNoTex.push_back(g_StaticLineVertsNoTex.back());
g_StaticLineVertsNoTex.push_back({m_lastPos + dvb, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dvb, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back(g_StaticLineVertsNoTex.back()); g_StaticLineVertsNoTex.push_back(g_StaticLineVertsNoTex.back());
g_StaticLineVertsNoTex.push_back({m_lastPos - dvb, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dvb, m_lastW), m_lastColor});
} }
else else
{ {
g_StaticLineVertsNoTex.push_back({m_lastPos + dva, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dva, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back({m_lastPos - dva, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dva, m_lastW), m_lastColor});
} }
} }
else else
@ -223,8 +225,8 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
m_lastPos.toVec2f() - dvb, projPt.toVec2f() - dvb); m_lastPos.toVec2f() - dvb, projPt.toVec2f() - dvb);
intersect2.z = m_lastPos.z; intersect2.z = m_lastPos.z;
g_StaticLineVertsNoTex.push_back({intersect1, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect1, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back({intersect2, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect2, m_lastW), m_lastColor});
} }
} }
} }
@ -237,18 +239,19 @@ void CLineRenderer::AddVertex(const zeus::CVector3f& position, const zeus::CColo
dv.x /= CGraphics::g_ProjAspect; dv.x /= CGraphics::g_ProjAspect;
if (m_textured) if (m_textured)
{ {
g_StaticLineVertsTex.push_back({m_lastPos + dv, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dv, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back({m_lastPos - dv, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dv, m_lastW), m_lastColor, m_lastUV});
} }
else else
{ {
g_StaticLineVertsNoTex.push_back({m_lastPos + dv, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dv, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back({m_lastPos - dv, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dv, m_lastW), m_lastColor});
} }
} }
m_lastPos2 = m_lastPos; m_lastPos2 = m_lastPos;
m_lastPos = projPt; m_lastPos = projPt;
m_lastW = w;
m_lastUV = uv; m_lastUV = uv;
m_lastColor = color; m_lastColor = color;
m_lastWidth = adjWidth; m_lastWidth = adjWidth;
@ -284,13 +287,13 @@ void CLineRenderer::Render(const zeus::CColor& moduColor)
if (m_textured) if (m_textured)
{ {
g_StaticLineVertsTex.push_back({intersect1, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect1, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back({intersect2, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect2, m_lastW), m_lastColor, m_lastUV});
} }
else else
{ {
g_StaticLineVertsNoTex.push_back({intersect1, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect1, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back({intersect2, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect2, m_lastW), m_lastColor});
} }
} }
{ {
@ -316,13 +319,13 @@ void CLineRenderer::Render(const zeus::CColor& moduColor)
if (m_textured) if (m_textured)
{ {
g_StaticLineVertsTex.push_back({intersect1, m_firstColor, m_firstUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect1, m_firstW), m_firstColor, m_firstUV});
g_StaticLineVertsTex.push_back({intersect2, m_firstColor, m_firstUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(intersect2, m_firstW), m_firstColor, m_firstUV});
} }
else else
{ {
g_StaticLineVertsNoTex.push_back({intersect1, m_firstColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect1, m_firstW), m_firstColor});
g_StaticLineVertsNoTex.push_back({intersect2, m_firstColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(intersect2, m_firstW), m_firstColor});
} }
} }
} }
@ -339,8 +342,8 @@ void CLineRenderer::Render(const zeus::CColor& moduColor)
{} {}
else else
{ {
g_StaticLineVertsTex.push_back({m_lastPos + dv, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dv, m_lastW), m_lastColor, m_lastUV});
g_StaticLineVertsTex.push_back({m_lastPos - dv, m_lastColor, m_lastUV}); g_StaticLineVertsTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dv, m_lastW), m_lastColor, m_lastUV});
} }
} }
else else
@ -349,8 +352,8 @@ void CLineRenderer::Render(const zeus::CColor& moduColor)
{} {}
else else
{ {
g_StaticLineVertsNoTex.push_back({m_lastPos + dv, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos + dv, m_lastW), m_lastColor});
g_StaticLineVertsNoTex.push_back({m_lastPos - dv, m_lastColor}); g_StaticLineVertsNoTex.push_back({zeus::CVector4f::ToClip(m_lastPos - dv, m_lastW), m_lastColor});
} }
} }
} }
@ -361,13 +364,15 @@ void CLineRenderer::Render(const zeus::CColor& moduColor)
m_uniformBuf.access() = SDrawUniform{moduColor}; m_uniformBuf.access() = SDrawUniform{moduColor};
if (m_textured) if (m_textured)
{ {
memmove(m_vertBufTex.access(), g_StaticLineVertsTex.data(), sizeof(SDrawVertTex) * g_StaticLineVertsTex.size()); memmove(m_vertBufTex.access(), g_StaticLineVertsTex.data(),
sizeof(SDrawVertTex) * g_StaticLineVertsTex.size());
CGraphics::SetShaderDataBinding(m_shaderBind); CGraphics::SetShaderDataBinding(m_shaderBind);
CGraphics::DrawArray(0, g_StaticLineVertsTex.size()); CGraphics::DrawArray(0, g_StaticLineVertsTex.size());
} }
else else
{ {
memmove(m_vertBufNoTex.access(), g_StaticLineVertsNoTex.data(), sizeof(SDrawVertNoTex) * g_StaticLineVertsNoTex.size()); memmove(m_vertBufNoTex.access(), g_StaticLineVertsNoTex.data(),
sizeof(SDrawVertNoTex) * g_StaticLineVertsNoTex.size());
CGraphics::SetShaderDataBinding(m_shaderBind); CGraphics::SetShaderDataBinding(m_shaderBind);
CGraphics::DrawArray(0, g_StaticLineVertsNoTex.size()); CGraphics::DrawArray(0, g_StaticLineVertsNoTex.size());
} }

2
Runtime/Graphics/CLineRenderer.hpp
View File

@ -52,12 +52,14 @@ private:
zeus::CVector2f m_firstUV; zeus::CVector2f m_firstUV;
zeus::CColor m_firstColor; zeus::CColor m_firstColor;
float m_firstWidth; float m_firstWidth;
float m_firstW;
zeus::CVector3f m_lastPos; zeus::CVector3f m_lastPos;
zeus::CVector3f m_lastPos2; zeus::CVector3f m_lastPos2;
zeus::CVector2f m_lastUV; zeus::CVector2f m_lastUV;
zeus::CColor m_lastColor; zeus::CColor m_lastColor;
float m_lastWidth; float m_lastWidth;
float m_lastW;
static rstl::reserved_vector<SDrawVertTex, 1024> g_StaticLineVertsTex; static rstl::reserved_vector<SDrawVertTex, 1024> g_StaticLineVertsTex;
static rstl::reserved_vector<SDrawVertNoTex, 1024> g_StaticLineVertsNoTex; static rstl::reserved_vector<SDrawVertNoTex, 1024> g_StaticLineVertsNoTex;

2
specter

@ -1 +1 @@
Subproject commit 88a4a52d82f0a60e46181d0bf60e4d4d2ceee02c Subproject commit 1b3e19f74ccb55d4c20a8caf2f9c2a4ca06de335