diff --git a/assets/level/example.lvl b/assets/level/example.lvl index 48b95ec..db0e357 100644 --- a/assets/level/example.lvl +++ b/assets/level/example.lvl @@ -29,17 +29,17 @@ - - - + + + - - - + + + @@ -54,44 +54,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/src/org/andengine/examples/LevelLoaderExample.java b/src/org/andengine/examples/LevelLoaderExample.java index 2f39390..394efa4 100644 --- a/src/org/andengine/examples/LevelLoaderExample.java +++ b/src/org/andengine/examples/LevelLoaderExample.java @@ -23,6 +23,7 @@ import org.andengine.util.SAXUtils; import org.andengine.util.debug.Debug; import org.andengine.util.level.EntityLoader; +import org.andengine.util.level.LevelUtils; import org.andengine.util.level.constants.LevelConstants; import org.andengine.util.level.simple.SimpleLevelEntityLoaderData; import org.andengine.util.level.simple.SimpleLevelLoader; @@ -48,10 +49,6 @@ public class LevelLoaderExample extends SimpleBaseGameActivity { private static final int CAMERA_HEIGHT = 320; private static final String TAG_ENTITY = "entity"; - private static final String TAG_ENTITY_ATTRIBUTE_X = "x"; - private static final String TAG_ENTITY_ATTRIBUTE_Y = "y"; - private static final String TAG_ENTITY_ATTRIBUTE_WIDTH = "width"; - private static final String TAG_ENTITY_ATTRIBUTE_HEIGHT = "height"; private static final String TAG_ENTITY_ATTRIBUTE_TYPE = "type"; private static final Object TAG_ENTITY_ATTRIBUTE_TYPE_VALUE_BOX = "box"; @@ -132,26 +129,24 @@ public IEntity onLoadEntity(final String pEntityName, final IEntity pParent, fin levelLoader.registerEntityLoader(new EntityLoader(TAG_ENTITY) { @Override public IEntity onLoadEntity(final String pEntityName, final IEntity pParent, final Attributes pAttributes, final SimpleLevelEntityLoaderData pSimpleLevelEntityLoaderData) throws IOException { - final int x = SAXUtils.getIntAttributeOrThrow(pAttributes, TAG_ENTITY_ATTRIBUTE_X); - final int y = SAXUtils.getIntAttributeOrThrow(pAttributes, TAG_ENTITY_ATTRIBUTE_Y); - final int width = SAXUtils.getIntAttributeOrThrow(pAttributes, TAG_ENTITY_ATTRIBUTE_WIDTH); - final int height = SAXUtils.getIntAttributeOrThrow(pAttributes, TAG_ENTITY_ATTRIBUTE_HEIGHT); final String type = SAXUtils.getAttributeOrThrow(pAttributes, TAG_ENTITY_ATTRIBUTE_TYPE); final VertexBufferObjectManager vertexBufferObjectManager = pSimpleLevelEntityLoaderData.getVertexBufferObjectManager(); final AnimatedSprite animatedSprite; if(type.equals(TAG_ENTITY_ATTRIBUTE_TYPE_VALUE_BOX)) { - animatedSprite = new AnimatedSprite(x, y, width, height, LevelLoaderExample.this.mBoxFaceTextureRegion, vertexBufferObjectManager); + animatedSprite = new AnimatedSprite(0, 0, LevelLoaderExample.this.mBoxFaceTextureRegion, vertexBufferObjectManager); } else if(type.equals(TAG_ENTITY_ATTRIBUTE_TYPE_VALUE_CIRCLE)) { - animatedSprite = new AnimatedSprite(x, y, width, height, LevelLoaderExample.this.mCircleFaceTextureRegion, vertexBufferObjectManager); + animatedSprite = new AnimatedSprite(0, 0, LevelLoaderExample.this.mCircleFaceTextureRegion, vertexBufferObjectManager); } else if(type.equals(TAG_ENTITY_ATTRIBUTE_TYPE_VALUE_TRIANGLE)) { - animatedSprite = new AnimatedSprite(x, y, width, height, LevelLoaderExample.this.mTriangleFaceTextureRegion, vertexBufferObjectManager); + animatedSprite = new AnimatedSprite(0, 0, LevelLoaderExample.this.mTriangleFaceTextureRegion, vertexBufferObjectManager); } else if(type.equals(TAG_ENTITY_ATTRIBUTE_TYPE_VALUE_HEXAGON)) { - animatedSprite = new AnimatedSprite(x, y, width, height, LevelLoaderExample.this.mHexagonFaceTextureRegion, vertexBufferObjectManager); + animatedSprite = new AnimatedSprite(0, 0, LevelLoaderExample.this.mHexagonFaceTextureRegion, vertexBufferObjectManager); } else { throw new IllegalArgumentException(); } + LevelUtils.setPosition(pAttributes, animatedSprite); + LevelUtils.setSize(pAttributes, animatedSprite); animatedSprite.animate(200); diff --git a/src/org/andengine/examples/launcher/Example.java b/src/org/andengine/examples/launcher/Example.java index 0c75948..20d85da 100644 --- a/src/org/andengine/examples/launcher/Example.java +++ b/src/org/andengine/examples/launcher/Example.java @@ -27,6 +27,7 @@ import org.andengine.examples.GradientExample; import org.andengine.examples.HullAlgorithmExample; import org.andengine.examples.ImageFormatsExample; +import org.andengine.examples.LevelLoaderExample; import org.andengine.examples.LineExample; import org.andengine.examples.LoadTextureExample; import org.andengine.examples.MenuExample; @@ -133,7 +134,7 @@ enum Example { GRADIENT(GradientExample.class, R.string.example_gradient), HULLALGORITHM(HullAlgorithmExample.class, R.string.example_hullalgorithm), IMAGEFORMATS(ImageFormatsExample.class, R.string.example_imageformats), -// LEVELLOADER(LevelLoaderExample.class, R.string.example_levelloader), + LEVELLOADER(LevelLoaderExample.class, R.string.example_levelloader), LINE(LineExample.class, R.string.example_line), LOADTEXTURE(LoadTextureExample.class, R.string.example_loadtexture), MENU(MenuExample.class, R.string.example_menu), diff --git a/src/org/andengine/examples/launcher/ExampleGroup.java b/src/org/andengine/examples/launcher/ExampleGroup.java index 015228e..8f8cb26 100644 --- a/src/org/andengine/examples/launcher/ExampleGroup.java +++ b/src/org/andengine/examples/launcher/ExampleGroup.java @@ -118,7 +118,7 @@ public enum ExampleGroup { Example.RUNNABLEPOOLUPDATEHANDLER, Example.SVGTEXTUREREGION, Example.XMLLAYOUT, -// Example.LEVELLOADER, + Example.LEVELLOADER, Example.CCBLEVELLOADER ), APP(R.string.examplegroup_app, diff --git a/src/org/andengine/examples/launcher/ExampleLauncher.java b/src/org/andengine/examples/launcher/ExampleLauncher.java index 66744c3..fdadf47 100644 --- a/src/org/andengine/examples/launcher/ExampleLauncher.java +++ b/src/org/andengine/examples/launcher/ExampleLauncher.java @@ -58,7 +58,7 @@ public class ExampleLauncher extends ExpandableListActivity { public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if(!AndEngine.isDeviceSupported()) { + if(!AndEngine.isDeviceSupported(this)) { this.showDialog(ExampleLauncher.DIALOG_DEVICE_NOT_SUPPORTED); }