catch up

Templates/SalmonWallpaperTemplate/src/fishrungames/wallpapertemplate/GLWallpaperService.java

@@ -18,6 +18,9 @@ import android.service.wallpaper.WallpaperService;
 import android.util.Log;
 import android.view.SurfaceHolder;
 
+import fishrungames.engine.EngineWrapper;
+
+
 
 public class GLWallpaperService extends WallpaperService {
 	private static final String TAG = "GLWallpaperService";
@@ -654,7 +657,7 @@ class GLThread extends Thread {
 	
 						long currentTimeStamp = c.getTimeInMillis();
 				
-						JniWrapper.Update(currentTimeStamp - lastTimeStamp);
+						EngineWrapper.Update(currentTimeStamp - lastTimeStamp);
 					
 						lastTimeStamp = currentTimeStamp;
 

Templates/SalmonWallpaperTemplate/src/fishrungames/wallpapertemplate/JniWrapper.java

@@ -18,12 +18,6 @@ public class JniWrapper
 	
 	public static native void Init(int width, int height);
 	
-	public static native void Update(long dt);
-	
-	public static native void OnTapMove(float x, float y);
-	
 	public static native void SetOffset(float offsetX, float offsetY);
 	
-	public static native void SetOrientation(int isLandscape);
-	
 }

Templates/SalmonWallpaperTemplate/src/fishrungames/wallpapertemplate/MainWallpaperService.java

@@ -19,7 +19,7 @@ import android.view.SurfaceHolder;
 
 //import com.seb.SLWP.SLWP.GlEngine.DownloadTask;
 
-import fishrungames.engine.FileWrapper;
+import fishrungames.engine.EngineWrapper;
 
 public class MainWallpaperService extends GLWallpaperService implements
 		OnSharedPreferenceChangeListener {
@@ -30,7 +30,7 @@ public class MainWallpaperService extends GLWallpaperService implements
 	 */
 	static
 	{
-		FileWrapper.LoadSalmonEngineLibrary();
+		EngineWrapper.LoadSalmonEngineLibrary();
 		JniWrapper.LoadLibrary();
 	}
 
@@ -81,8 +81,8 @@ public class MainWallpaperService extends GLWallpaperService implements
 		
 		PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
 
-		FileWrapper.SetActivityInstance(this);
-		FileWrapper.SetupEnviroment();
+		EngineWrapper.SetActivityInstance(this);
+		EngineWrapper.SetupEnviroment();
 		
 		String apkFilePath = null;
 		ApplicationInfo appInfo = null;
@@ -98,7 +98,7 @@ public class MainWallpaperService extends GLWallpaperService implements
 		    }
 		apkFilePath = appInfo.sourceDir;
 		
-		FileWrapper.SetupApkFilePath(apkFilePath);
+		EngineWrapper.SetupApkFilePath(apkFilePath);
 		
 		Init();
 	}