Przeglądaj źródła

Some fixes to java files

mikymod 12 lat temu
rodzic
commit
12f1029781

+ 4 - 2
android/src/crown/android/CrownActivity.java

@@ -76,7 +76,9 @@ public class CrownActivity extends Activity
 		mSensor = new CrownSensor(this);
 		
         mWindow = (SurfaceView)findViewById(R.id.crown_window);
-        CrownLib.setWindow(mWindow);
+        CrownLib.setWindow(mWindow.getHolder().getSurface());
+
+		CrownLib.init();
     }
 
 //-----------------------------------------------------------------------------------
@@ -136,4 +138,4 @@ public class CrownActivity extends Activity
 	{
 		return context.getPackageManager().hasSystemFeature("android.hardware.touchscreen.multitouch");
 	}
-}
+}

+ 3 - 2
android/src/crown/android/CrownLib.java

@@ -31,7 +31,8 @@ import android.view.Surface;
 public class CrownLib
 {
 	static 
-	{	
+	{
+		System.loadLibrary("luajit-5.1");
 		System.loadLibrary("crown");
 	}
 	
@@ -50,6 +51,6 @@ public class CrownLib
 	public static native void 		pushFloatEvent(int type, float a, float b, float c, float d);
 
 	// Window functions
-	public static native void		setWindow(SurfaceView window);
+	public static native void		setWindow(Surface window);
 	public static native void 		setDisplaySize(int width, int height);
 }