MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Implement flat shading.

Browse Source
This commit is contained in:
Sergey Lipskiy 2014-12-18 19:38:43 +06:00
parent 284f5ca7b1
commit 4599527921
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenGL.cpp
View File

@ -267,6 +267,27 @@ void OGLRender::addTriangle(int _v0, int _v1, int _v2)
triangles.elements[triangles.num++] = _v0;
triangles.elements[triangles.num++] = _v1;
triangles.elements[triangles.num++] = _v2;
if ((gSP.geometryMode & G_SHADE) == 0) {
// Prim shading
for (u32 i = triangles.num - 3; i < triangles.num; ++i) {
SPVertex & vtx = triangles.vertices[triangles.elements[i]];
vtx.flat_r = gDP.primColor.r;
vtx.flat_g = gDP.primColor.g;
vtx.flat_b = gDP.primColor.b;
vtx.flat_a = vtx.a;
}
} else if ((gSP.geometryMode & G_SHADING_SMOOTH) == 0) {
// Flat shading
SPVertex & vtx0 = triangles.vertices[_v0];
for (u32 i = triangles.num - 3; i < triangles.num; ++i) {
SPVertex & vtx = triangles.vertices[triangles.elements[i]];
vtx.flat_r = vtx0.r;
vtx.flat_g = vtx0.g;
vtx.flat_b = vtx0.b;
vtx.flat_a = vtx.a;
}
}
}
#define ORKIN_BLENDMODE
@ -687,10 +708,17 @@ void OGLRender::_prepareDrawTriangle(bool _dma)
_setTexCoordArrays();
}
const bool updateColorArrays = m_bFlatColors != (!RSP.bLLE && (gSP.geometryMode & G_SHADING_SMOOTH) == 0);
if (updateColorArrays)
m_bFlatColors = !m_bFlatColors;
if (updateArrays) {
SPVertex * pVtx = _dma ? triangles.dmaVertices.data() : &triangles.vertices[0];
glVertexAttribPointer(SC_POSITION, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->x);
glVertexAttribPointer(SC_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->r);
if (m_bFlatColors)
glVertexAttribPointer(SC_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->flat_r);
else
glVertexAttribPointer(SC_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->r);
glVertexAttribPointer(SC_TEXCOORD0, 2, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->s);
if (config.enableHWLighting) {
glEnableVertexAttribArray(SC_NUMLIGHTS);
@ -701,6 +729,12 @@ void OGLRender::_prepareDrawTriangle(bool _dma)
_updateViewport();
glEnable(GL_SCISSOR_TEST);
currentCombiner()->updateRenderState();
} else if (updateColorArrays) {
SPVertex * pVtx = _dma ? triangles.dmaVertices.data() : &triangles.vertices[0];
if (m_bFlatColors)
glVertexAttribPointer(SC_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->flat_r);
else
glVertexAttribPointer(SC_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(SPVertex), &pVtx->r);
}
currentCombiner()->updateColors();

3
OpenGL.h
View File

@ -87,7 +87,7 @@ public:
#endif // __TRIBUFFER_OPT
private:
OGLRender() : m_bImageTexture(false) {}
OGLRender() : m_bImageTexture(false), m_bFlatColors(false) {}
OGLRender(const OGLRender &);
friend class OGLVideo;
@ -133,6 +133,7 @@ private:
RENDER_STATE m_renderState;
GLVertex m_rect[4];
bool m_bImageTexture;
bool m_bFlatColors;
};
class OGLVideo

2
gSP.h
View File

@ -21,6 +21,7 @@ if \
( \
( \
(video().getRender().getTrianglesCount() > 1000) || \
((gSP.geometryMode & G_SHADING_SMOOTH) == 0) || \
( \
(RSP.nextCmd != G_NOOP) && \
(RSP.nextCmd != G_RDPNOOP) && \
@ -73,6 +74,7 @@ struct SPVertex
f32 x, y, z, w;
f32 nx, ny, nz, __pad0;
f32 r, g, b, a;
f32 flat_r, flat_g, flat_b, flat_a;
f32 s, t;
u8 HWLight;
s16 flag;