Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ambient material color when no color in the vertex

Browse Source 
Fixes color in celshading demo
This commit is contained in:
Florent Castelli committed 2012-11-25 17:45:50 +01:00
1 parent 4b67f22072
commit 2f39496ec5
2 files changed
+23 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/GLES/TransformPipeline.cpp
+22 -8
View File
@@ -269,10 +269,18 @@ void TransformAndDrawPrim(void *verts, void *inds, int prim, int vertexCount, Li
// Do not touch the coordinates or the colors. No lighting.
for (int j=0; j<3; j++)
v[j] = decoded[index].pos[j];
// TODO : check if has color
for (int j=0; j<4; j++) {
c0[j] = decoded[index].color[j] / 255.0f;
c1[j] = 0.0f;
if(dec.hasColor()) {
for (int j=0; j<4; j++) {
c0[j] = decoded[index].color[j] / 255.0f;
c1[j] = 0.0f;
}
}
else
{
c0[0] = (gstate.materialambient & 0xFF) / 255.f;
c0[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f;
c0[2] = ((gstate.materialambient >> 16) & 0xFF) / 255.f;
c0[3] = (gstate.materialalpha & 0xFF) / 255.f;
}
// TODO : check if has uv
@@ -343,10 +351,16 @@ void TransformAndDrawPrim(void *verts, void *inds, int prim, int vertexCount, Li
}
else
{
// no lighting? copy the color.
for (int j = 0; j < 4; j++) {
c0[j] = unlitColor[j];
c1[j] = 0.0f;
if(dec.hasColor()) {
for (int j = 0; j < 4; j++) {
c0[j] = unlitColor[j];
c1[j] = 0.0f;
}
} else {
c0[0] = (gstate.materialambient & 0xFF) / 255.f;
c0[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f;
c0[2] = ((gstate.materialambient >> 16) & 0xFF) / 255.f;
c0[3] = (gstate.materialalpha & 0xFF) / 255.f;
}
}
}
GPU/GLES/VertexDecoder.h
+1
View File
@@ -56,6 +56,7 @@ public:
~VertexDecoder() {}
void SetVertexType(u32 fmt);
void DecodeVerts(DecodedVertex *decoded, const void *verts, const void *inds, int prim, int count, int *indexLowerBound, int *indexUpperBound) const;
bool hasColor() const { return col != 0; }
private:
u32 fmt;