Merge branch 'master' into integration

ant/host-source/source/project/external/adcolony/manifest_permissions.xml

@@ -2,4 +2,4 @@
 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 <uses-permission android:name="android.permission.INTERNET" />
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-<uses-permission android:name="android.permission.GET_TASKS"/>
+<!-- <uses-permission android:name="android.permission.GET_TASKS"/> -->

ant/host-source/source/project/src/moai/adcolony/MoaiAdColony.java

@@ -32,6 +32,22 @@ public static void onCreate ( Activity activity ) {
 
 		sActivity = activity;
 	}
+
+	//----------------------------------------------------------------//
+	public static void onPause ( ) {
+
+		MoaiLog.i ( "MoaiAdColony onPause: Notifying AdColony" );
+
+		AdColony.setAppStatus ( true );
+	}
+
+	//----------------------------------------------------------------//
+	public static void onResume ( ) {
+
+		MoaiLog.i ( "MoaiAdColony onResume: Notifying AdColony" );
+
+		AdColony.setAppStatus ( false );
+	}
 
 	//================================================================//
 	// AdColony JNI callback methods
@@ -90,4 +106,10 @@ public void onAdColonyVideoFinished () {
 
 		AKUNotifyAdColonyVideoComplete ();
 	}
+
+	//----------------------------------------------------------------//
+	public void onAdColonyVideoStarted () {
+
+		// TODO: Notify
+	}
 }

ant/libmoai/jni/src/moai.cpp

@@ -494,7 +494,7 @@
 	}
 
 	//----------------------------------------------------------------//
-	extern "C" void Java_@PACKAGE_UNDERSCORED@_MoaiView_AKUSetScreenDpi ( JNIEnv* env, jclass obj, jint dpi ) {
+	extern "C" void Java_com_ziplinegames_moai_Moai_AKUSetScreenDpi ( JNIEnv* env, jclass obj, jint dpi ) {
 
 		AKUSetScreenDpi ( dpi );
 	}

src/moaicore/MOAIGfxDevice.cpp

@@ -1580,35 +1580,48 @@ void MOAIGfxDevice::UpdateFinalColor () {
 //----------------------------------------------------------------//
 void MOAIGfxDevice::UpdateCpuVertexMtx () {
 
-	// Used signed, so we can roll "under" to -1 without an extra range check
-	int start = this->mVertexMtxInput;
-	int finish = this->mVertexMtxOutput;
-
-	// The matrices are being multiplied A*B*C, but the common case is that
-	// B and C are static throughout all/most of a frame. Thus, we can
-	// capitalize on the associativity of matrix multiplication by caching
-	// (B*C) and save a matrix mult in the common case (assuming they haven't
-	// changed since the last update request).
-
-	int i = finish - 1;
+	u32 start = this->mVertexMtxInput;
+	u32 finish = this->mVertexMtxOutput;
 
-	if ( this->mCpuVertexTransformCache [ i ]) {
-		while ( i >= start && this->mCpuVertexTransformCache [ i ]) {
-			--i;
-		}
-		this->mCpuVertexTransformMtx = this->mCpuVertexTransformCacheMtx [ i + 1 ];
-	}
-	else {
-		this->mCpuVertexTransformMtx.Ident();
-	}
+	this->mCpuVertexTransformMtx.Ident ();
 
-	for ( ; i >= start; --i ) {
-		this->mCpuVertexTransformMtx.Prepend ( this->mVertexTransforms [ i ]);
-		this->mCpuVertexTransformCacheMtx [ i ] = this->mCpuVertexTransformMtx;
-		this->mCpuVertexTransformCache [ i ] = true;
+	for ( u32 i = start; i < finish; ++i ) {
+		this->mCpuVertexTransformMtx.Append ( this->mVertexTransforms [ i ]);
 	}
-
 	this->mCpuVertexTransform = !this->mCpuVertexTransformMtx.IsIdent ();
+
+	#ifdef USE_VTX_MTX_CACHE
+
+		// Used signed, so we can roll "under" to -1 without an extra range check
+		int start = this->mVertexMtxInput;
+		int finish = this->mVertexMtxOutput;
+
+		// The matrices are being multiplied A*B*C, but the common case is that
+		// B and C are static throughout all/most of a frame. Thus, we can
+		// capitalize on the associativity of matrix multiplication by caching
+		// (B*C) and save a matrix mult in the common case (assuming they haven't
+		// changed since the last update request).
+
+		int i = finish - 1;
+
+		if ( this->mCpuVertexTransformCache [ i ]) {
+			while ( i >= start && this->mCpuVertexTransformCache [ i ]) {
+				--i;
+			}
+			this->mCpuVertexTransformMtx = this->mCpuVertexTransformCacheMtx [ i + 1 ];
+		}
+		else {
+			this->mCpuVertexTransformMtx.Ident();
+		}
+
+		for ( ; i >= start; --i ) {
+			this->mCpuVertexTransformMtx.Prepend ( this->mVertexTransforms [ i ]);
+			this->mCpuVertexTransformCacheMtx [ i ] = this->mCpuVertexTransformMtx;
+			this->mCpuVertexTransformCache [ i ] = true;
+		}
+
+		this->mCpuVertexTransform = !this->mCpuVertexTransformMtx.IsIdent ();
+	#endif
 }
 
 //----------------------------------------------------------------//

src/moaiext-iphone/MOAIKeyboardIOS.h

@@ -12,7 +12,37 @@
 // MOAIKeyboardIOS
 //================================================================//
 /**	@name	MOAIKeyboardIOS
-	@text	Wrapper for the native keyboard.
+	@text	<p>Wrapper for the native keyboard. This is a first pass
+			of the keyboard functionality and is missing some
+			important features (such as spell check) that will be
+			added in the near future. We also need to trap the
+			keyboard notifications that tell us the position and
+			dimensions of the keyboard.</p>
+			
+			<p>The decision to divorce the keyboard from the text
+			input field was deliberate. We're not ready (and may never
+			be ready) to own a binding to a full set of native UI
+			widgets. In future releases we'll give better was to
+			connect the software keyboard to a MOAITextBox. This will
+			give better integration of editable text fields with
+			Moai. Even though this is more work up front, it means
+			it will be easier in the long run to keep editable text
+			synchronized with everything else in a scene.</p>
+			
+			<p>The other short term limitation we face is complex
+			text layout for languages such as Arabic. Since we aren't
+			displaying native text fields, input is limited to what
+			MOAITextBox can display. Support for complex text layout
+			is something we want to handle down the road, but until
+			then we're going to be limited.</p>
+			
+			<p>If the keyboard (as written) doesn't meet your needs,
+			if should be straightforward to adapt it into a native
+			text field class that does. You'd need to change it from
+			a singleton to a factory/instance type and add some API to
+			position it on the screen, but otherwise most of the
+			callbacks are already handled.</p>
+			
 	
 	@const	EVENT_INPUT
 	@const	EVENT_RETURN