back-port of texture-padding feature from GLES2 branch

.classpath

@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1,13 @@
+target/**
+bin/**
+doc/**
+gen/**
+.DS_Store
+Thumbs.db
+gdb.setup
+gdbserver
+.svn
+.hg
+local.properties
+.settings
+AndEngine.iml

build.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="AndEngine" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

proguard.cfg

@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}

default.properties → project.properties

@@ -1,14 +1,14 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
+android.library=true
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
 target=android-8
-android.library=true

src/org/anddev/andengine/engine/Engine.java

@@ -448,6 +448,10 @@ protected void convertSurfaceToSceneTouchEvent(final Camera pCamera, final Touch
 		pCamera.convertSurfaceToSceneTouchEvent(pSurfaceTouchEvent, this.mSurfaceWidth, this.mSurfaceHeight);
 	}
 
+	protected void convertSceneToSurfaceTouchEvent(final Camera pCamera, final TouchEvent pSurfaceTouchEvent) {
+		pCamera.convertSceneToSurfaceTouchEvent(pSurfaceTouchEvent, this.mSurfaceWidth, this.mSurfaceHeight);
+	}
+
 	public void onLoadComplete(final Scene pScene) {
 		this.setScene(pScene);
 	}

src/org/anddev/andengine/engine/camera/Camera.java

@@ -372,16 +372,19 @@ public void convertSurfaceToSceneTouchEvent(final TouchEvent pSurfaceTouchEvent,
 		final float relativeX;
 		final float relativeY;
 
+		final float surfaceTouchEventX = pSurfaceTouchEvent.getX();
+		final float surfaceTouchEventY = pSurfaceTouchEvent.getY();
+
 		final float rotation = this.mRotation;
 		if(rotation == 0) {
-			relativeX = pSurfaceTouchEvent.getX() / pSurfaceWidth;
-			relativeY = pSurfaceTouchEvent.getY() / pSurfaceHeight;
+			relativeX = surfaceTouchEventX / pSurfaceWidth;
+			relativeY = surfaceTouchEventY / pSurfaceHeight;
 		} else if(rotation == 180) {
-			relativeX = 1 - (pSurfaceTouchEvent.getX() / pSurfaceWidth);
-			relativeY = 1 - (pSurfaceTouchEvent.getY() / pSurfaceHeight);
+			relativeX = 1 - (surfaceTouchEventX / pSurfaceWidth);
+			relativeY = 1 - (surfaceTouchEventY / pSurfaceHeight);
 		} else {
-			VERTICES_TOUCH_TMP[VERTEX_INDEX_X] = pSurfaceTouchEvent.getX();
-			VERTICES_TOUCH_TMP[VERTEX_INDEX_Y] = pSurfaceTouchEvent.getY();
+			VERTICES_TOUCH_TMP[VERTEX_INDEX_X] = surfaceTouchEventX;
+			VERTICES_TOUCH_TMP[VERTEX_INDEX_Y] = surfaceTouchEventY;
 
 			MathUtils.rotateAroundCenter(VERTICES_TOUCH_TMP, rotation, pSurfaceWidth / 2, pSurfaceHeight / 2);
 
@@ -404,6 +407,36 @@ private void convertAxisAlignedSurfaceToSceneTouchEvent(final TouchEvent pSurfac
 		pSurfaceTouchEvent.set(x, y);
 	}
 
+	public void convertSceneToSurfaceTouchEvent(final TouchEvent pSceneTouchEvent, final int pSurfaceWidth, final int pSurfaceHeight) {
+		this.convertAxisAlignedSceneToSurfaceTouchEvent(pSceneTouchEvent, pSurfaceWidth, pSurfaceHeight);
+
+		final float rotation = this.mRotation;
+		if(rotation == 0) {
+			/* Nothing to do. */
+		} else if(rotation == 180) {
+			pSceneTouchEvent.set(pSurfaceWidth - pSceneTouchEvent.getX(), pSurfaceHeight - pSceneTouchEvent.getY());
+		} else {
+			VERTICES_TOUCH_TMP[VERTEX_INDEX_X] = pSceneTouchEvent.getX();
+			VERTICES_TOUCH_TMP[VERTEX_INDEX_Y] = pSceneTouchEvent.getY();
+
+			MathUtils.revertRotateAroundCenter(VERTICES_TOUCH_TMP, rotation, pSurfaceWidth >> 1, pSurfaceHeight >> 1);
+
+			pSceneTouchEvent.set(VERTICES_TOUCH_TMP[VERTEX_INDEX_X], VERTICES_TOUCH_TMP[VERTEX_INDEX_Y]);
+		}
+	}
+
+	private void convertAxisAlignedSceneToSurfaceTouchEvent(final TouchEvent pSceneTouchEvent, final int pSurfaceWidth, final int pSurfaceHeight) {
+		final float minX = this.getMinX();
+		final float maxX = this.getMaxX();
+		final float minY = this.getMinY();
+		final float maxY = this.getMaxY();
+
+		final float relativeX = (pSceneTouchEvent.getX() - minX) / (maxX - minX);
+		final float relativeY = (pSceneTouchEvent.getY() - minY) / (maxY - minY);
+
+		pSceneTouchEvent.set(relativeX * pSurfaceWidth, relativeY * pSurfaceHeight);
+	}
+
 	// ===========================================================
 	// Inner and Anonymous Classes
 	// ===========================================================

src/org/anddev/andengine/entity/Entity.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 import javax.microedition.khronos.opengles.GL10;
 
@@ -516,6 +517,48 @@ public IEntity findChild(final IEntityMatcher pEntityMatcher) {
 		return this.mChildren.find(pEntityMatcher);
 	}
 
+
+	@Override
+	public ArrayList<IEntity> query(final IEntityMatcher pEntityMatcher) {
+		return this.query(pEntityMatcher, new ArrayList<IEntity>());
+	}
+
+	@Override
+	public <L extends List<IEntity>> L query(final IEntityMatcher pEntityMatcher, final L pResult) {
+		final int childCount = this.getChildCount();
+		for(int i = 0; i < childCount; i++) {
+			final IEntity item = this.mChildren.get(i);
+			if(pEntityMatcher.matches(item)) {
+				pResult.add(item);
+			}
+
+			item.query(pEntityMatcher, pResult);
+		}
+
+		return pResult;
+	}
+
+	@Override
+	public <S extends IEntity> ArrayList<S> queryForSubclass(final IEntityMatcher pEntityMatcher) throws ClassCastException {
+		return this.queryForSubclass(pEntityMatcher, new ArrayList<S>());
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <L extends List<S>, S extends IEntity> L queryForSubclass(final IEntityMatcher pEntityMatcher, final L pResult) throws ClassCastException {
+		final int childCount = this.getChildCount();
+		for(int i = 0; i < childCount; i++) {
+			final IEntity item = this.mChildren.get(i);
+			if(pEntityMatcher.matches(item)) {
+				pResult.add((S)item);
+			}
+
+			item.queryForSubclass(pEntityMatcher, pResult);
+		}
+
+		return pResult;
+	}
+
 	@Override
 	public boolean swapChildren(final IEntity pEntityA, final IEntity pEntityB) {
 		return this.swapChildren(this.getChildIndex(pEntityA), this.getChildIndex(pEntityB));

src/org/anddev/andengine/entity/IEntity.java

@@ -1,6 +1,8 @@
 package org.anddev.andengine.entity;
 
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 
 import org.anddev.andengine.engine.Engine;
 import org.anddev.andengine.engine.handler.IUpdateHandler;
@@ -168,6 +170,30 @@ public interface IEntity extends IDrawable, IUpdateHandler {
 	public boolean setChildIndex(final IEntity pEntity, final int pIndex);
 
 	public IEntity findChild(final IEntityMatcher pEntityMatcher);
+	/**
+	 * @param pEntityMatcher
+	 * @return all children (recursively!) that match the supplied {@link IEntityMatcher}.
+	 */
+	public ArrayList<IEntity> query(final IEntityMatcher pEntityMatcher);
+	/**
+	 * @param pEntityMatcher
+	 * @param pResult the {@link List} to put the result into.
+	 * @return all children (recursively!) that match the supplied {@link IEntityMatcher}.
+	 */
+	public <L extends List<IEntity>> L query(final IEntityMatcher pEntityMatcher, final L pResult);
+	/**
+	 * @param pEntityMatcher
+	 * @return all children (recursively!) that match the supplied {@link IEntityMatcher}.
+	 * @throws ClassCastException when the supplied {@link IEntityMatcher} matched a {@link IEntity} that was not of the requested subtype.
+	 */
+	public <S extends IEntity> ArrayList<S> queryForSubclass(IEntityMatcher pEntityMatcher) throws ClassCastException;
+	/**
+	 * @param pEntityMatcher
+	 * @param pResult the {@link List} to put the result into.
+	 * @return all children (recursively!) that match the supplied {@link IEntityMatcher}.
+	 * @throws ClassCastException when the supplied {@link IEntityMatcher} matched a {@link IEntity} that was not of the requested subtype.
+	 */
+	public <L extends List<S>, S extends IEntity> L queryForSubclass(final IEntityMatcher pEntityMatcher, final L pResult) throws ClassCastException;
 
 	public boolean swapChildren(final int pIndexA, final int pIndexB);
 	public boolean swapChildren(final IEntity pEntityA, final IEntity pEntityB);

src/org/anddev/andengine/entity/modifier/AlphaModifier.java

@@ -44,7 +44,7 @@ protected AlphaModifier(final AlphaModifier pAlphaModifier) {
 	}
 
 	@Override
-	public AlphaModifier clone(){
+	public AlphaModifier deepCopy(){
 		return new AlphaModifier(this);
 	}
 

src/org/anddev/andengine/entity/modifier/ColorModifier.java

@@ -44,7 +44,7 @@ protected ColorModifier(final ColorModifier pColorModifier) {
 	}
 
 	@Override
-	public ColorModifier clone(){
+	public ColorModifier deepCopy(){
 		return new ColorModifier(this);
 	}