From 908d0fbb2ea26226165cd42f12abf0d27e4a3f53 Mon Sep 17 00:00:00 2001 From: Kevin Rushforth Date: Fri, 29 Sep 2006 18:04:13 +0000 Subject: Merged dev-1_5 branch back to MAIN trunk git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@701 ba19aa83-45c5-6ac9-afd3-db810772062c --- src/native/ogl/Lights.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/native/ogl/Lights.c') diff --git a/src/native/ogl/Lights.c b/src/native/ogl/Lights.c index db0c54f..2acece8 100644 --- a/src/native/ogl/Lights.c +++ b/src/native/ogl/Lights.c @@ -27,9 +27,9 @@ const float black[4] = { 0.0f, 0.0f, 0.0f, 1.0f }; JNIEXPORT -void JNICALL Java_javax_media_j3d_DirectionalLightRetained_updateLight( +void JNICALL Java_javax_media_j3d_NativePipeline_updateDirectionalLight( JNIEnv *env, - jobject light, + jobject obj, jlong ctxInfo, jint lightSlot, jfloat red, @@ -70,9 +70,9 @@ void JNICALL Java_javax_media_j3d_DirectionalLightRetained_updateLight( } JNIEXPORT -void JNICALL Java_javax_media_j3d_PointLightRetained_updateLight( +void JNICALL Java_javax_media_j3d_NativePipeline_updatePointLight( JNIEnv *env, - jobject light, + jobject obj, jlong ctxInfo, jint lightSlot, jfloat red, @@ -114,9 +114,9 @@ void JNICALL Java_javax_media_j3d_PointLightRetained_updateLight( } JNIEXPORT -void JNICALL Java_javax_media_j3d_SpotLightRetained_updateLight( +void JNICALL Java_javax_media_j3d_NativePipeline_updateSpotLight( JNIEnv *env, - jobject light, + jobject obj, jlong ctxInfo, jint lightSlot, jfloat red, -- cgit v1.2.3