diff options
| author | Chris Craik <ccraik@google.com> | 2014-07-23 18:19:28 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-07-24 16:41:13 +0000 |
| commit | 058fc640017c90120c599d378a4cbc55668b05b7 (patch) | |
| tree | 37f480e607d1f39de8cec06b205eb0e146cc9551 /core/jni/android_view_ThreadedRenderer.cpp | |
| parent | 753d849b2ad14cdacfe6b194d8aa7fc27874e385 (diff) | |
| download | frameworks_base-058fc640017c90120c599d378a4cbc55668b05b7.zip frameworks_base-058fc640017c90120c599d378a4cbc55668b05b7.tar.gz frameworks_base-058fc640017c90120c599d378a4cbc55668b05b7.tar.bz2 | |
Connect shadow style attributes to renderer
bug:15859361
Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.
Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
Diffstat (limited to 'core/jni/android_view_ThreadedRenderer.cpp')
| -rw-r--r-- | core/jni/android_view_ThreadedRenderer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index 988d461..ec08a4f 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -219,9 +219,11 @@ static void android_view_ThreadedRenderer_pauseSurface(JNIEnv* env, jobject claz static void android_view_ThreadedRenderer_setup(JNIEnv* env, jobject clazz, jlong proxyPtr, jint width, jint height, - jfloat lightX, jfloat lightY, jfloat lightZ, jfloat lightRadius) { + jfloat lightX, jfloat lightY, jfloat lightZ, jfloat lightRadius, + jint ambientShadowAlpha, jint spotShadowAlpha) { RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr); - proxy->setup(width, height, Vector3(lightX, lightY, lightZ), lightRadius); + proxy->setup(width, height, Vector3(lightX, lightY, lightZ), lightRadius, + ambientShadowAlpha, spotShadowAlpha); } static void android_view_ThreadedRenderer_setOpaque(JNIEnv* env, jobject clazz, @@ -358,7 +360,7 @@ static JNINativeMethod gMethods[] = { { "nInitialize", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_initialize }, { "nUpdateSurface", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_updateSurface }, { "nPauseSurface", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_pauseSurface }, - { "nSetup", "(JIIFFFF)V", (void*) android_view_ThreadedRenderer_setup }, + { "nSetup", "(JIIFFFFII)V", (void*) android_view_ThreadedRenderer_setup }, { "nSetOpaque", "(JZ)V", (void*) android_view_ThreadedRenderer_setOpaque }, { "nSyncAndDrawFrame", "(JJJF)I", (void*) android_view_ThreadedRenderer_syncAndDrawFrame }, { "nDestroyCanvasAndSurface", "(J)V", (void*) android_view_ThreadedRenderer_destroyCanvasAndSurface }, |