stuff'n'changes

master
Mike Schwörer 7 years ago
parent 26badd541b
commit 84b46fb6ed
  1. 46
      android/assets/spritesheet.agdtexdef
  2. BIN
      android/assets/spritesheet.png
  3. 17
      android/assets/standard_hud.agdxml
  4. 28
      core/src/de/samdev/cannonshooter/level/StandardLevel.java
  5. BIN
      data/spritesheet.pdn

@ -13,12 +13,12 @@
<array_2d coordinates_offset="2048,0" identifier="tex_chess_figures" width="512" height="256" size_x="4" size_y="8" />
</flatten_array>
<group coordinates_offset="1742,2424">
<texture identifier="img_speed_0" coordinates="1333,0 343,304" />
<texture identifier="img_speed_1" coordinates=" 304,0 343,304" />
<texture identifier="img_speed_2" coordinates=" 647,0 343,304" />
<texture identifier="img_speed_3" coordinates=" 990,0 343,304" />
<texture identifier="img_close" coordinates=" 0,0 343,304" />
<group coordinates_offset="2200,2304">
<texture identifier="img_close" coordinates=" 0,0 100,90" />
<texture identifier="img_speed_1" coordinates="100,0 100,90" />
<texture identifier="img_speed_2" coordinates="200,0 100,90" />
<texture identifier="img_speed_3" coordinates="300,0 100,90" />
<texture identifier="img_speed_0" coordinates="400,0 100,90" />
</group>
<!-- ########################################### -->
@ -26,24 +26,24 @@
<gui>
<textureprovider identifier="guiprovider_hud">
<MenuButton>
<group coordinates_offset="2046, 2304">
<texture identifier="pad-topleft" coordinates="00,00 32,32" />
<texture identifier="pad-top" coordinates="59,00 01,32" />
<texture identifier="pad-topright" coordinates="87,00 32,32" />
<texture identifier="pad-right" coordinates="87,59 32,01" />
<texture identifier="pad-bottomright" coordinates="87,87 32,32" />
<texture identifier="pad-bottom" coordinates="59,87 01,32" />
<texture identifier="pad-bottomleft" coordinates="00,87 32,32" />
<texture identifier="pad-left" coordinates="00,59 32,01" />
<group coordinates_offset="2167, 2348">
<texture identifier="pad-topleft" coordinates="00,00 8,8" />
<texture identifier="pad-top" coordinates="15,00 1,8" />
<texture identifier="pad-topright" coordinates="23,00 8,8" />
<texture identifier="pad-right" coordinates="23,15 8,1" />
<texture identifier="pad-bottomright" coordinates="23,23 8,8" />
<texture identifier="pad-bottom" coordinates="15,23 1,8" />
<texture identifier="pad-bottomleft" coordinates="00,23 8,8" />
<texture identifier="pad-left" coordinates="00,15 8,1" />
<texture identifier="pad-northleft" coordinates="32,00 26,32" />
<texture identifier="pad-northright" coordinates="61,00 26,32" />
<texture identifier="pad-easttop" coordinates="87,32 32,26" />
<texture identifier="pad-eastbottom" coordinates="87,61 32,26" />
<texture identifier="pad-southleft" coordinates="32,87 26,32" />
<texture identifier="pad-southright" coordinates="61,87 26,32" />
<texture identifier="pad-westtop" coordinates="00,32 32,26" />
<texture identifier="pad-westbottom" coordinates="00,61 32,26" />
<texture identifier="pad-northleft" coordinates="08,00 6,8" />
<texture identifier="pad-northright" coordinates="17,00 6,8" />
<texture identifier="pad-easttop" coordinates="23,08 8,6" />
<texture identifier="pad-eastbottom" coordinates="23,17 8,6" />
<texture identifier="pad-southleft" coordinates="08,23 6,8" />
<texture identifier="pad-southright" coordinates="17,23 6,8" />
<texture identifier="pad-westtop" coordinates="00,08 8,6" />
<texture identifier="pad-westbottom" coordinates="00,17 8,6" />
</group>
<state appendix="NORMAL" coordinates_offset="2171, 2309">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 167 KiB

@ -4,24 +4,29 @@
<grid.columndefinitions>
<columndefinition width="10"/>
<columndefinition width="60"/>
<columndefinition width="10"/>
<columndefinition width="40"/>
<columndefinition width="60"/>
<columndefinition width="10"/>
<columndefinition width="60"/>
<columndefinition width="10"/>
<columndefinition width="60"/>
<columndefinition width="1*"/>
<columndefinition width="60"/>
<columndefinition width="10"/>
</grid.columndefinitions>
<grid.rowdefinitions>
<rowdefinition height="10"/>
<rowdefinition height="53"/>
<rowdefinition height="54"/>
<columndefinition width="1*"/>
</grid.rowdefinitions>
<button grid.row="1" grid.column="1" image="img_speed_0" />
<button grid.row="1" grid.column="3" image="img_speed_1" />
<button grid.row="1" grid.column="5" image="img_speed_2" />
<button grid.row="1" grid.column="7" image="img_speed_3" />
<button grid.row="1" grid.column="1" image="img_speed_0" onClicked="setSpeed_0" />
<button grid.row="1" grid.column="3" image="img_speed_1" onClicked="setSpeed_1" />
<button grid.row="1" grid.column="5" image="img_speed_2" onClicked="setSpeed_2" />
<button grid.row="1" grid.column="7" image="img_speed_3" onClicked="setSpeed_3" />
<button grid.row="1" grid.column="9" image="img_close" onClicked="exitLevel" />
</grid>
</frame>

@ -12,6 +12,7 @@ import de.samdev.absgdx.framework.layer.GameLayer;
import de.samdev.absgdx.framework.map.TileMap;
import de.samdev.absgdx.framework.map.background.RepeatingBackground;
import de.samdev.absgdx.framework.map.mapscaleresolver.ShowCompleteMapScaleResolver;
import de.samdev.absgdx.framework.menu.elements.MenuBaseElement;
import de.samdev.absgdx.framework.util.exceptions.AgdxmlParsingException;
import de.samdev.cannonshooter.Textures;
import de.samdev.cannonshooter.entities.Cannon;
@ -35,11 +36,13 @@ public class StandardLevel extends GameLayer {
initMap();
/*
try {
setHUDFromAgdxml(Gdx.files.internal("standard_hud.agdxml"), Textures.spritesheet, new BitmapFont(Gdx.files.internal("consolefont.fnt")));
} catch (AgdxmlParsingException e) {
throw new RuntimeException(e);
}
*/
//setTimeMultiplier(3);
}
@ -75,4 +78,29 @@ public class StandardLevel extends GameLayer {
public void onUpdate(float arg0) {
//
}
@SuppressWarnings("unused") // event listener
public void setSpeed_0(MenuBaseElement element, String identifier) {
setTimeMultiplier(1);
}
@SuppressWarnings("unused") // event listener
public void setSpeed_1(MenuBaseElement element, String identifier) {
setTimeMultiplier(1);
}
@SuppressWarnings("unused") // event listener
public void setSpeed_2(MenuBaseElement element, String identifier) {
setTimeMultiplier(2);
}
@SuppressWarnings("unused") // event listener
public void setSpeed_3(MenuBaseElement element, String identifier) {
setTimeMultiplier(3);
}
@SuppressWarnings("unused") // event listener
public void exitLevel(MenuBaseElement element, String identifier) {
Gdx.app.exit();
}
}

Binary file not shown.
Loading…
Cancel
Save