mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-24 13:39:48 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Engine instantiation and added input processor for testing purposes

Browse Source
This commit is contained in:
Collin Smith 2019-11-26 15:27:13 -08:00
parent 6dd75af2f7
commit 0617942f3e
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/com/riiablo/screen/ClientScreen.java
View File

@ -5,6 +5,8 @@ import com.badlogic.ashley.core.EntitySystem;
import com.badlogic.gdx.Application;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.ScreenAdapter;
import com.badlogic.gdx.assets.AssetDescriptor;
import com.badlogic.gdx.audio.Sound;
@ -19,6 +21,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.Touchable;
import com.badlogic.gdx.scenes.scene2d.ui.Touchpad;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.scenes.scene2d.utils.UIUtils;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Disposable;
@ -132,6 +135,7 @@ public class ClientScreen extends ScreenAdapter implements LoadingScreen.Loadabl
final AssetDescriptor<Map> mapDescriptor = new AssetDescriptor<>("Act 1", Map.class, MapLoader.MapParameters.of(0, 0, 0));
Map map;
IsometricCamera iso;
InputProcessor testingInputProcessor;
public EscapePanel escapePanel;
public ControlPanel controlPanel;
@ -362,6 +366,50 @@ public class ClientScreen extends ScreenAdapter implements LoadingScreen.Loadabl
}
};
testingInputProcessor = new InputAdapter() {
private final float ZOOM_AMOUNT = 0.1f;
@Override
public boolean scrolled(int amount) {
switch (amount) {
case -1:
if (UIUtils.ctrl()) {
renderer.zoom(Math.max(0.20f, renderer.zoom() - ZOOM_AMOUNT));
}
break;
case 1:
if (UIUtils.ctrl()) {
renderer.zoom(Math.min(5.00f, renderer.zoom() + ZOOM_AMOUNT));
}
break;
default:
}
return true;
}
@Override
public boolean keyDown(int keycode) {
switch (keycode) {
case Input.Keys.TAB:
if (UIUtils.shift()) {
RenderSystem.RENDER_DEBUG_WALKABLE = RenderSystem.RENDER_DEBUG_WALKABLE == 0 ? 1 : 0;
} else {
RenderSystem.RENDER_DEBUG_GRID++;
if (RenderSystem.RENDER_DEBUG_GRID > RenderSystem.DEBUG_GRID_MODES) {
RenderSystem.RENDER_DEBUG_GRID = 0;
}
}
return true;
default:
return false;
}
}
};
renderer = new RenderSystem(Riiablo.batch);
iso = renderer.iso();
scaledStage = new Stage(new ScreenViewport(iso), Riiablo.batch);
@ -609,6 +657,7 @@ public class ClientScreen extends ScreenAdapter implements LoadingScreen.Loadabl
Keys.Quests.addStateListener(mappedKeyStateListener);
Keys.SwapWeapons.addStateListener(mappedKeyStateListener);
Keys.Stash.addStateListener(mappedKeyStateListener);
Riiablo.input.addProcessor(testingInputProcessor);
Riiablo.input.addProcessor(stage);
Riiablo.input.addProcessor(scaledStage);
Riiablo.client.addScreenBoundsListener(screenBoundsListener = new Client.ScreenBoundsListener() {
@ -701,6 +750,7 @@ public class ClientScreen extends ScreenAdapter implements LoadingScreen.Loadabl
Keys.Quests.removeStateListener(mappedKeyStateListener);
Keys.SwapWeapons.removeStateListener(mappedKeyStateListener);
Keys.Stash.removeStateListener(mappedKeyStateListener);
Riiablo.input.removeProcessor(testingInputProcessor);
Riiablo.input.removeProcessor(stage);
Riiablo.input.removeProcessor(scaledStage);
Riiablo.client.removeScreenBoundsListener(screenBoundsListener);

2
tools/src/com/riiablo/map/MapViewer.java
View File

@ -169,7 +169,7 @@ public class MapViewer extends ApplicationAdapter {
shapes = new ShapeRenderer();
Gdx.gl.glClearColor(0.3f, 0.3f, 0.3f, 1.0f);
Riiablo.engine2 = engine = new Engine(null);
Riiablo.engine2 = engine = new Engine();
Riiablo.engine = new com.riiablo.entity.Engine();
RenderSystem.RENDER_DEBUG_SUBTILE = true;