diff --git a/core/src/fr/evolving/UI/Transhower.java b/core/src/fr/evolving/UI/Transhower.java index c8670b0..e27ba83 100644 --- a/core/src/fr/evolving/UI/Transhower.java +++ b/core/src/fr/evolving/UI/Transhower.java @@ -84,12 +84,12 @@ public class Transhower extends Actor { float change=0; boolean dir=false; if (keepaspectratio) { - change=Math.abs(deltax-deltay); - if (change<0) { + change=deltax-deltay; + if (change>0) { deltay=deltax; dir=true; } - else if (change>0) { + else if (change<0) { deltax=deltay; dir=false; } @@ -105,12 +105,12 @@ public class Transhower extends Actor { float sizey=AssetLoader.height/(this.getHeight()/deltay); float decx = -this.getX()/AssetLoader.width*sizex; float decy = -this.getY()/AssetLoader.height*sizey; - if (change!=0) + if (keepaspectratio && change!=0) if (dir) - decy=decy-change/2; + decy=decy-Math.abs(change/2); else - decx=decx-change/2; - Gdx.app.debug("wirechem-Transhower", "Camera dec:"+decx+","+decy+" view:"+sizex+","+sizey+" change:"+change+","+dir); + decx=decx-Math.abs(change/2); + Gdx.app.debug("wirechem-Transhower", "Camera delta:"+deltax+","+deltay+" dec:"+decx+","+decy+" view:"+sizex+","+sizey+" change:"+change+","+dir); camera.setToOrtho(false, sizex, sizey); camera.translate(decx,decy); } diff --git a/core/src/fr/evolving/screens/LevelScreen.java b/core/src/fr/evolving/screens/LevelScreen.java index 1067e4a..7050695 100644 --- a/core/src/fr/evolving/screens/LevelScreen.java +++ b/core/src/fr/evolving/screens/LevelScreen.java @@ -271,7 +271,7 @@ public class LevelScreen implements Screen { } public LevelScreen(Worlds aworlds) { - test=new Transhower(AssetLoader.getTransmuter("<>"),Transmuter.Angular.A90,true, new Color(0,1f,0f,1f)); + test=new Transhower(AssetLoader.getTransmuter("--"),Transmuter.Angular.A270,true, new Color(0,1f,0f,1f)); test.setPosition(1920/2, 70); test.setWidth(512); test.setHeight(512);