Merge pull request cocos2d#6 from minggo/iss1583-update-js

CocosDragonJS MoonWarriors and TestJavascript work ok on Android

Author: James Chen

cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java

@@ -116,9 +116,10 @@ public void onSensorChanged(final SensorEvent pSensorEvent) {
 			final float tmp = x;
 			x = y;
 			y = -tmp;
-		}
-
-		Cocos2dxAccelerometer.onSensorChanged(x, y, z, pSensorEvent.timestamp);
+		}		
+		
+		Cocos2dxGLSurfaceView.queueAccelerometer(x,y,z,pSensorEvent.timestamp);
+		
 		/*
 		if(BuildConfig.DEBUG) {
 			Log.d(TAG, "x = " + pSensorEvent.values[0] + " y = " + pSensorEvent.values[1] + " z = " + pSensorEvent.values[2]);
@@ -132,9 +133,10 @@ public void onAccuracyChanged(final Sensor pSensor, final int pAccuracy) {
 
 	// ===========================================================
 	// Methods
+        // Native method called from Cocos2dxGLSurfaceView (To be in the same thread)
 	// ===========================================================
-
-	private static native void onSensorChanged(final float pX, final float pY, final float pZ, final long pTimestamp);
+    
+	public static native void onSensorChanged(final float pX, final float pY, final float pZ, final long pTimestamp);
 
 	// ===========================================================
 	// Inner and Anonymous Classes

cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java

@@ -117,6 +117,16 @@ public void handleMessage(final Message msg) {
 	// Getter & Setter
 	// ===========================================================
 
+
+       public static void queueAccelerometer(final float x, final float y, final float z, final long timestamp) {	
+	   mCocos2dxGLSurfaceView.queueEvent(new Runnable() {
+		@Override
+		    public void run() {
+			    Cocos2dxAccelerometer.onSensorChanged(x, y, z, timestamp);
+		}
+	    });
+	}
+
 	public void setCocos2dxRenderer(final Cocos2dxRenderer renderer) {
 		this.mCocos2dxRenderer = renderer;
 		this.setRenderer(this.mCocos2dxRenderer);

cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java

@@ -79,23 +79,32 @@ public void onSurfaceChanged(final GL10 pGL10, final int pWidth, final int pHeig
 
 	@Override
 	public void onDrawFrame(final GL10 gl) {
+		/*
+		 * FPS controlling algorithm is not accurate, and it will slow down FPS
+		 * on some devices. So comment FPS controlling code.
+		 */
+		
+		/*
 		final long nowInNanoSeconds = System.nanoTime();
 		final long interval = nowInNanoSeconds - this.mLastTickInNanoSeconds;
+		*/
 
 		// should render a frame when onDrawFrame() is called or there is a
 		// "ghost"
 		Cocos2dxRenderer.nativeRender();
 
+		/*
 		// fps controlling
 		if (interval < Cocos2dxRenderer.sAnimationInterval) {
 			try {
 				// because we render it before, so we should sleep twice time interval
-				Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) * 2 / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND);
+				Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND);
 			} catch (final Exception e) {
 			}
 		}
 
 		this.mLastTickInNanoSeconds = nowInNanoSeconds;
+		*/
 	}
 
 	// ===========================================================

samples/CocosDragonJS/proj.android/build_native.sh

@@ -49,6 +49,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR/../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
+RESROUCE_ROOT="$APP_ROOT/../TestJavascript/cocos2d-js-tests/games/CocosDragonJS/Published files iOS"
+BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
 
 echo
 echo "Paths"
@@ -69,10 +71,10 @@ fi
 mkdir "$APP_ANDROID_ROOT"/assets
 
 # copy "Resources" into "assets"
-cp -rf "$APP_ROOT"/Resources/* "$APP_ANDROID_ROOT"/assets
+cp -rf "$RESROUCE_ROOT"/* "$APP_ANDROID_ROOT"/assets
 
 # copy bindings/*.js into assets' root
-cp -f "$APP_ROOT"/bindings/*.js "$APP_ANDROID_ROOT"/assets
+cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
 
 echo "Using prebuilt externals"
 echo

samples/MoonWarriors/proj.android/build_native.sh

@@ -48,6 +48,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR/../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
+RESROUCE_ROOT="$APP_ROOT/../TestJavascript/cocos2d-js-tests/games/MoonWarriors/res"
+BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
 
 echo
 echo "Paths"
@@ -65,29 +67,16 @@ fi
 mkdir "$APP_ANDROID_ROOT"/assets
 
 
-# copy resources
-for file in "$APP_ROOT"/Resources/*
-do
-if [ -d "$file" ]; then
-	cp -rf "$file" "$APP_ANDROID_ROOT"/assets
-fi
-
-
-if [ -f "$file" ]; then
-    cp "$file" "$APP_ANDROID_ROOT"/assets
-fi
-done
+# copy "Resources" into "assets"
+cp -rf "$RESROUCE_ROOT" "$APP_ANDROID_ROOT"/assets
 
+# copy MoonWarriors js
+cp -rf "$RESROUCE_ROOT"/../src "$APP_ANDROID_ROOT"/assets
+# copy MoonWarriors-native.js
+cp "$RESROUCE_ROOT"/../MoonWarriors-native.js "$APP_ANDROID_ROOT"/assets
 
-rm -f "$APP_ANDROID_ROOT"/assets/Images/landscape-1024x1024-rgba8888.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_image_rgba4444.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_1021x1024_a8.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_1021x1024_rgb888.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_1021x1024_rgba4444.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_1021x1024_rgba8888.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/test_image_rgba4444.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/texture1024x1024_rgba4444.pvr.gz
-rm -f "$APP_ANDROID_ROOT"/assets/Images/PlanetCute-1024x1024-rgba4444.pvr.gz
+# copy bindings/*.js into assets' root
+cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
 
 
 echo "Using prebuilt externals"

samples/TestJavascript/proj.android/build_native.sh

@@ -48,6 +48,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR/../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
+BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
 
 echo
 echo "Paths"
@@ -69,13 +70,16 @@ mkdir "$APP_ANDROID_ROOT"/assets
 mkdir "$APP_ANDROID_ROOT"/assets/res
 
 # copy "cocos2d-js-tests/res" into "assets/res"
-cp -rf "$APP_ROOT"/cocos2d-js-tests/res "$APP_ANDROID_ROOT"/assets
+cp -rf "$APP_ROOT"/cocos2d-js-tests/tests/res "$APP_ANDROID_ROOT"/assets
 
 # copy src/**/*.js from cocos2d-js-tests into assets' root
-cp -rf "$APP_ROOT"/cocos2d-js-tests/src "$APP_ANDROID_ROOT"/assets
+cp -rf "$APP_ROOT"/cocos2d-js-tests/tests "$APP_ANDROID_ROOT"/assets
+
+# copy root js
+cp -rf "$APP_ROOT"/cocos2d-js-tests/tests/*.js "$APP_ANDROID_ROOT"/assets
 
 # copy bindings/*.js into assets' root
-cp -f "$APP_ROOT"/bindings/*.js "$APP_ANDROID_ROOT"/assets
+cp -f "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets
 
 echo "Using prebuilt externals"
 echo

scripting/javascript/bindings/cocos2d_specifics.cpp

@@ -790,7 +790,9 @@ void JSScheduleWrapper::scheduleFunc(float dt) const
         return;
     }
 
-    if(!JSVAL_IS_VOID(jsCallback)  && !JSVAL_IS_VOID(jsThisObj)) {
+    if(!jsCallback.isNullOrUndefined() || !jsThisObj.isNullOrUndefined()) {
+        JSAutoCompartment ac(cx, JSVAL_TO_OBJECT(jsThisObj));
+                
         JS_CallFunctionValue(cx, JSVAL_TO_OBJECT(jsThisObj), jsCallback, 1, &data, &retval);
     }