From 99dafda4b9aee622416c2675bebaa94f44d8f84f Mon Sep 17 00:00:00 2001 From: Hannes Janetzek <hannes.janetzek@gmail.com> Date: Sun, 17 Feb 2013 17:18:11 +0100 Subject: [PATCH] move TriangleJNI --- jni/TriangleJni.c | 2 +- src/org/{quake/triangle => oscim/jni}/TriangleJNI.java | 2 +- src/org/oscim/renderer/layer/ExtrusionLayer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/org/{quake/triangle => oscim/jni}/TriangleJNI.java (98%) diff --git a/jni/TriangleJni.c b/jni/TriangleJni.c index c379b727..064286fc 100644 --- a/jni/TriangleJni.c +++ b/jni/TriangleJni.c @@ -41,7 +41,7 @@ compare_dups (const void *a, const void *b) typedef struct triangulateio TriangleIO; -jint Java_org_quake_triangle_TriangleJNI_triangulate(JNIEnv *env, jclass c, +jint Java_org_oscim_jni_TriangleJNI_triangulate(JNIEnv *env, jclass c, jobject point_buf, jint num_rings, jobject indice_buf, diff --git a/src/org/quake/triangle/TriangleJNI.java b/src/org/oscim/jni/TriangleJNI.java similarity index 98% rename from src/org/quake/triangle/TriangleJNI.java rename to src/org/oscim/jni/TriangleJNI.java index 2083fbf1..fc6332dd 100644 --- a/src/org/quake/triangle/TriangleJNI.java +++ b/src/org/oscim/jni/TriangleJNI.java @@ -1,4 +1,4 @@ -package org.quake.triangle; +package org.oscim.jni; import java.nio.FloatBuffer; import java.nio.ShortBuffer; diff --git a/src/org/oscim/renderer/layer/ExtrusionLayer.java b/src/org/oscim/renderer/layer/ExtrusionLayer.java index 2d82daa9..7c1448ac 100644 --- a/src/org/oscim/renderer/layer/ExtrusionLayer.java +++ b/src/org/oscim/renderer/layer/ExtrusionLayer.java @@ -20,11 +20,11 @@ import java.nio.FloatBuffer; import java.nio.ShortBuffer; import org.oscim.core.Tile; +import org.oscim.jni.TriangleJNI; import org.oscim.renderer.BufferObject; import org.oscim.renderer.GLRenderer; import org.oscim.utils.LineClipper; import org.oscim.view.MapView; -import org.quake.triangle.TriangleJNI; import android.opengl.GLES20; import android.util.Log;