From 769c26b45cc2bc91439f5f4f92bb7ac75fadfa91 Mon Sep 17 00:00:00 2001 From: fred-boy Date: Thu, 12 Apr 2018 19:52:16 +0700 Subject: [PATCH] Even better collision --- .../cavecraft/game/GameInputHandler.java | 2 +- .../cavecraft/game/GamePhysics.java | 50 ++++++++++--------- .../cavecraft/game/GameRenderer.java | 1 + .../cavecraft/game/GameWorld.java | 4 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java index aec59d2..102a0f7 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java @@ -51,7 +51,7 @@ public class GameInputHandler { } if (keyCode == Input.Keys.SPACE) { if (gameProc.player.canJump) { - gameProc.player.moveY.add(0, -8); + gameProc.player.moveY.add(0, -7); } else if (!gameProc.player.flyMode) { gameProc.player.flyMode = true; gameProc.player.moveY.setZero(); diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index c91b176..8b79fe0 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -40,25 +40,24 @@ public class GamePhysics { } private boolean checkColl(Rectangle rect) { - int[] ids = new int[6]; - ids[0] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)rect.y/16)); - ids[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16)); - ids[2] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16)); - ids[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16)); - ids[4] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16)); - ids[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16)); - Rectangle[] bl = new Rectangle[6]; - if (ids[0]>0) bl[0] = Items.BLOCKS.getValueAt(ids[0]).getRect((int)(rect.x)/16,(int)rect.y/16); - if (ids[1]>0) bl[1] = Items.BLOCKS.getValueAt(ids[1]).getRect(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16)); - if (ids[2]>0) bl[2] = Items.BLOCKS.getValueAt(ids[2]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16)); - if (ids[3]>0) bl[3] = Items.BLOCKS.getValueAt(ids[3]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16)); - if (ids[4]>0) bl[4] = Items.BLOCKS.getValueAt(ids[4]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16)); - if (ids[5]>0) bl[5] = Items.BLOCKS.getValueAt(ids[5]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16)); - for (int i=0; i<6; i++) { - if (ids[i]>0 && - Items.BLOCKS.getValueAt(ids[i]).collision && - Intersector.overlaps(rect,bl[i])) - return true; + int bl; + int minX = (int) ((rect.x+rect.width/2)/16)-4; + int minY = (int) ((rect.y+rect.height/2)/16)-4; + int maxX = (int) ((rect.x+rect.width/2)/16)+4; + int maxY = (int) ((rect.y+rect.height/2)/16)+4; + if (minX<0) minX=0; + if (minY<0) minY=0; + if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth(); + if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight(); + for (int y=minY; y0 && Items.BLOCKS.getValueAt(bl).collision){ + if (Intersector.overlaps(rect, Items.BLOCKS.getValueAt(bl).getRect(x,y))){ + return true; + } + } + } } return false; } @@ -82,10 +81,15 @@ public class GamePhysics { pl.position.x+pl.texWidth>=gameProc.world.getWidth()*16) pl.position.sub(pl.moveX); if (checkColl(pl.getRect())) { - int d = 0; - if (pl.moveX.x<0) d=1; else if (pl.moveX.x>0) d=-1; - pl.position.x = MathUtils.round(pl.position.x); - while (checkColl(pl.getRect())) pl.position.x+=d; + if (pl.canJump && !pl.flyMode) pl.position.y-=8; + if (checkColl(pl.getRect())) { + if (pl.canJump && !pl.flyMode) pl.position.y+=8; + int d = 0; + if (pl.moveX.x < 0) d = 1; + else if (pl.moveX.x > 0) d = -1; + pl.position.x = MathUtils.round(pl.position.x); + while (checkColl(pl.getRect())) pl.position.x += d; + } } /*if (checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 84060ca..9183c67 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -179,6 +179,7 @@ public class GameRenderer { drawPlayer(gameProc.player); drawWorldForeground(); drawGUI(); + spriteBatch.end(); if (gameProc.ctrlMode==1) { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java index faf0322..7c117b4 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java @@ -1,6 +1,7 @@ package ru.deadsoftware.cavecraft.game; import com.badlogic.gdx.Gdx; +import ru.deadsoftware.cavecraft.Items; public class GameWorld { @@ -66,7 +67,8 @@ public class GameWorld { } public void placeToBackground(int x, int y, int value) { - if (getBackMap(x,y) == 0 || value == 0) setBackMap(x,y,value); + if ((getBackMap(x,y) == 0 || value == 0) && + !Items.BLOCKS.getValueAt(value).foreground) setBackMap(x,y,value); } } -- 2.29.2