From 39d3b767d9f0ae8dc96fadbed8a4bcde4b705266 Mon Sep 17 00:00:00 2001 From: raven02 Date: Tue, 1 Jan 2013 23:12:45 +0800 Subject: [PATCH] Fix ambient color in SW Transform --- GPU/GLES/TransformPipeline.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index b05f0aa690..82d548c4f8 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -372,9 +372,9 @@ void TransformDrawEngine::SoftwareTransformAndDraw( 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[0] = ((gstate.materialambient >> 16) & 0xFF) / 255.f; + c0[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f; + c0[2] = (gstate.materialambient & 0xFF) / 255.f; c0[3] = (gstate.materialalpha & 0xFF) / 255.f; } @@ -431,9 +431,9 @@ void TransformDrawEngine::SoftwareTransformAndDraw( if (reader.hasColor0()) { reader.ReadColor0(unlitColor); } else { - unlitColor[0] = (gstate.materialambient & 0xFF) / 255.f; - unlitColor[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f; - unlitColor[2] = ((gstate.materialambient >> 16) & 0xFF) / 255.f; + unlitColor[0] = ((gstate.materialambient >> 16) & 0xFF) / 255.f; + unlitColor[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f; + unlitColor[2] = (gstate.materialambient & 0xFF) / 255.f; unlitColor[3] = (gstate.materialalpha & 0xFF) / 255.f; } float litColor0[4]; @@ -462,9 +462,9 @@ void TransformDrawEngine::SoftwareTransformAndDraw( 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[0] = ((gstate.materialambient >> 16) & 0xFF) / 255.f; + c0[1] = ((gstate.materialambient >> 8) & 0xFF) / 255.f; + c0[2] = (gstate.materialambient & 0xFF) / 255.f; c0[3] = (gstate.materialalpha & 0xFF) / 255.f; } }