diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-03 15:12:28 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-03 15:12:28 -0700 |
| commit | 411c77df9e0ef419df8a3fdb18c9ef331aad9335 (patch) | |
| tree | a9a795669ae031f2d2e161572118cf1c9a943e53 /opengl | |
| parent | a6cfdb1c73e732c87fc9e5bb795dd4009251a07e (diff) | |
| parent | 5de674e1cbd6e43b6d7954ccacf5cd709b30265d (diff) | |
| download | frameworks_base-411c77df9e0ef419df8a3fdb18c9ef331aad9335.zip frameworks_base-411c77df9e0ef419df8a3fdb18c9ef331aad9335.tar.gz frameworks_base-411c77df9e0ef419df8a3fdb18c9ef331aad9335.tar.bz2 | |
am 5de674e1: Merge change 3013 into donut
Merge commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d'
* commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d':
Adding missing callback onJsConfirm to dismiss any confirmation dialogs
fix a bug in GL lighting where the specular component could be ommited when vertex material was disabled.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/light.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libagl/light.cpp b/opengl/libagl/light.cpp index 25c41d0..bc9449c 100644 --- a/opengl/libagl/light.cpp +++ b/opengl/libagl/light.cpp @@ -318,6 +318,11 @@ void lightVertexMaterial(ogles_context_t* c, vertex_t* v) vmul3(l.implicitAmbient.v, material.ambient.v, l.ambient.v); vmul3(l.implicitDiffuse.v, material.diffuse.v, l.diffuse.v); vmul3(l.implicitSpecular.v, material.specular.v, l.specular.v); + // this is just a flag to tell if we have a specular component + l.implicitSpecular.v[3] = + l.implicitSpecular.r | + l.implicitSpecular.g | + l.implicitSpecular.b; } // emission and ambient for the whole scene vmla3( c->lighting.implicitSceneEmissionAndAmbient.v, |