sigonasr2
/
RabiClone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Collision grid setup and render test

Browse Source 
Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
main
sigonasr2 3 years ago
parent b58aa91eea
commit 82b25fbc17
5 changed files with 272 additions and 237 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      maps/world1.map
  2. 2
      src/sig/RabiClone.java
  3. 4
      src/sig/map/Tile.java
  4. 44
      src/sig/objects/LevelRenderer.java
  5. 79
      src/sig/objects/Player.java

BIN
maps/world1.map
View File

Binary file not shown.

2
src/sig/RabiClone.java
Unescape View File

@ -58,6 +58,8 @@ public class RabiClone {
static long lastReportedTime = System.currentTimeMillis(); static long lastReportedTime = System.currentTimeMillis();
public static long TIME = 0; public static long TIME = 0;
public static boolean COLLISION[] = new boolean[BASE_WIDTH*BASE_HEIGHT];
public static void main(String[] args) { public static void main(String[] args) {
System.setProperty("sun.java2d.transaccel", "True"); System.setProperty("sun.java2d.transaccel", "True");
System.setProperty("sun.java2d.d3d", "True"); System.setProperty("sun.java2d.d3d", "True");

4
src/sig/map/Tile.java
Unescape View File

@ -5,8 +5,8 @@ public enum Tile {
WALL(0,0,CollisionType.BLOCK), WALL(0,0,CollisionType.BLOCK),
FLOOR(1,0,CollisionType.BLOCK), FLOOR(1,0,CollisionType.BLOCK),
PLATFORM_LEDGE(2,0,CollisionType.BLOCK), PLATFORM_LEDGE(2,0,CollisionType.BLOCK),
INVISIBLE_WALL(0,0,true,CollisionType.BLOCK), INVISIBLE_WALL(0,0,true,CollisionType.NONE),
HIGHLIGHTED_TILE(3,0,CollisionType.BLOCK), HIGHLIGHTED_TILE(3,0,CollisionType.NONE),
SMALL_SLOPE_LEFT(0,1,CollisionType.SLOPE), SMALL_SLOPE_LEFT(0,1,CollisionType.SLOPE),
SMALL_SLOPE_RIGHT(1,1,CollisionType.SLOPE), SMALL_SLOPE_RIGHT(1,1,CollisionType.SLOPE),
BIG_SLOPE_LEFT1(2,1,CollisionType.SLOPE), BIG_SLOPE_LEFT1(2,1,CollisionType.SLOPE),

44
src/sig/objects/LevelRenderer.java
Unescape View File

@ -1,15 +1,19 @@
package sig.objects; package sig.objects;
import java.util.Arrays;
import sig.RabiClone; import sig.RabiClone;
import sig.engine.Alpha; import sig.engine.Alpha;
import sig.engine.AnimatedObject; import sig.engine.AnimatedObject;
import sig.engine.Font; import sig.engine.Font;
import sig.engine.Object; import sig.engine.Object;
import sig.engine.PaletteColor;
import sig.engine.Panel; import sig.engine.Panel;
import sig.engine.Sprite; import sig.engine.Sprite;
import sig.engine.Transform; import sig.engine.Transform;
import sig.engine.String; import sig.engine.String;
import sig.map.Background; import sig.map.Background;
import sig.map.CollisionType;
import sig.map.Map; import sig.map.Map;
import sig.map.Tile; import sig.map.Tile;
@ -21,7 +25,38 @@ public class LevelRenderer extends Object{
} }
@Override @Override
public void update(double updateMult) {} public void update(double updateMult) {
Arrays.fill(RabiClone.COLLISION, false);
CreateCollisionGrid();
}
private void CreateCollisionGrid() {
for (int y=(int)(this.getY()/Tile.TILE_HEIGHT);y<(int)(RabiClone.BASE_HEIGHT/Tile.TILE_HEIGHT+this.getY()/Tile.TILE_HEIGHT+1);y++) {
if (y<0||y>Map.MAP_HEIGHT) {
continue;
}
for (int x=(int)(0+this.getX()/Tile.TILE_WIDTH);x<(int)(RabiClone.BASE_WIDTH/Tile.TILE_WIDTH+this.getX()/Tile.TILE_WIDTH+1);x++) {
if (x<0||x>Map.MAP_WIDTH) {
continue;
}
if (RabiClone.CURRENT_MAP.getTile(x,y).getCollision()==CollisionType.BLOCK||RabiClone.CURRENT_MAP.getTile(x,y).getCollision()==CollisionType.SLOPE) {
byte[] spritesheet = Sprite.TILE_SHEET.getBi_array();
int tileX = RabiClone.CURRENT_MAP.getTile(x,y).getSpriteSheetX()*Tile.TILE_WIDTH;
int tileY = RabiClone.CURRENT_MAP.getTile(x,y).getSpriteSheetY()*Tile.TILE_HEIGHT;
for (int yy=0;yy<Tile.TILE_HEIGHT;yy++) {
for (int xx=0;xx<Tile.TILE_WIDTH;xx++) {
if (spritesheet[(tileY+yy)*Sprite.TILE_SHEET.getCanvasWidth()+(tileX+xx)]!=(byte)32) {
int xpos=(int)(x*Tile.TILE_WIDTH-this.getX()+xx),ypos=(int)(y*Tile.TILE_HEIGHT-this.getY()+yy);
if (xpos>=0&&xpos<RabiClone.BASE_WIDTH&&ypos>=0&&ypos<RabiClone.BASE_HEIGHT) {
RabiClone.COLLISION[ypos*RabiClone.BASE_WIDTH+xpos]=true;
}
}
}
}
}
}
}
}
@Override @Override
public void draw(byte[] p) { public void draw(byte[] p) {
@ -44,6 +79,13 @@ public class LevelRenderer extends Object{
Draw_Text(4,4,new String(RabiClone.player.x_velocity),Font.PROFONT_12); Draw_Text(4,4,new String(RabiClone.player.x_velocity),Font.PROFONT_12);
Draw_Text(4,4+Font.PROFONT_12.getGlyphHeight(),new String(RabiClone.player.slide_time3),Font.PROFONT_12); Draw_Text(4,4+Font.PROFONT_12.getGlyphHeight(),new String(RabiClone.player.slide_time3),Font.PROFONT_12);
} }
for (int y=0;y<RabiClone.BASE_HEIGHT;y++) {
for (int x=0;x<RabiClone.BASE_WIDTH;x++) {
if (RabiClone.COLLISION[y*RabiClone.BASE_WIDTH+x]) {
p[y*RabiClone.BASE_WIDTH+x]=(byte)PaletteColor.CRIMSON.ordinal();
}
}
}
} }
@Override @Override

79
src/sig/objects/Player.java
Unescape View File

@ -65,13 +65,14 @@ public class Player extends AnimatedObject{
final static long slideBufferTime = TimeUtils.millisToNanos(200); final static long slideBufferTime = TimeUtils.millisToNanos(200);
long slidePressed = -1; long slidePressed = -1;
boolean onSlope = false;
public Player(Panel panel) { public Player(Panel panel) {
super(Sprite.ERINA, 5, panel); super(Sprite.ERINA, 5, panel);
setX(RabiClone.BASE_WIDTH / 2 - getAnimatedSpr().getWidth() / 2); setX(RabiClone.BASE_WIDTH / 2 - getAnimatedSpr().getWidth() / 2);
setY(RabiClone.BASE_HEIGHT * (2 / 3d) - getAnimatedSpr().getHeight() / 2); setY(RabiClone.BASE_HEIGHT * (2 / 3d) - getAnimatedSpr().getHeight() / 2);
} }
@Override @Override
public void update(double updateMult) { public void update(double updateMult) {
super.update(updateMult); super.update(updateMult);
@ -105,12 +106,10 @@ public class Player extends AnimatedObject{
setAnimatedSpr(Sprite.ERINA_WALK); setAnimatedSpr(Sprite.ERINA_WALK);
if (x_velocity > 0) { if (x_velocity > 0) {
facing_direction = RIGHT; facing_direction = RIGHT;
} else } else if (x_velocity < 0) {
if (x_velocity<0) {
facing_direction = LEFT; facing_direction = LEFT;
} }
} } else {
else{
setAnimatedSpr(Sprite.ERINA); setAnimatedSpr(Sprite.ERINA);
} }
break; break;
@ -150,8 +149,7 @@ public class Player extends AnimatedObject{
facing_direction == RIGHT && x_velocity > sliding_velocity * 0.5) { facing_direction == RIGHT && x_velocity > sliding_velocity * 0.5) {
x_velocity -= sliding_acceleration * updateMult; x_velocity -= sliding_acceleration * updateMult;
} }
} else } else if (KeyHeld(Action.MOVE_RIGHT) && !KeyHeld(Action.MOVE_LEFT)) {
if (KeyHeld(Action.MOVE_RIGHT)&&!KeyHeld(Action.MOVE_LEFT)) {
if (facing_direction == LEFT && x_velocity < -sliding_velocity * 0.5 || if (facing_direction == LEFT && x_velocity < -sliding_velocity * 0.5 ||
facing_direction == RIGHT && x_velocity < sliding_velocity * 1.5) { facing_direction == RIGHT && x_velocity < sliding_velocity * 1.5) {
x_velocity += sliding_acceleration * updateMult; x_velocity += sliding_acceleration * updateMult;
@ -172,7 +170,6 @@ public class Player extends AnimatedObject{
// System.out.println(state); // System.out.println(state);
} }
@Override @Override
protected void KeyReleased(Action a) { protected void KeyReleased(Action a) {
if (a == Action.JUMP) { if (a == Action.JUMP) {
@ -182,8 +179,7 @@ public class Player extends AnimatedObject{
if (state != State.SLIDE) { if (state != State.SLIDE) {
if ((a == Action.MOVE_LEFT) && (KeyHeld(Action.MOVE_RIGHT))) { if ((a == Action.MOVE_LEFT) && (KeyHeld(Action.MOVE_RIGHT))) {
facing_direction = RIGHT; facing_direction = RIGHT;
} else } else if ((a == Action.MOVE_RIGHT) && (KeyHeld(Action.MOVE_LEFT))) {
if((a==Action.MOVE_RIGHT)&&(KeyHeld(Action.MOVE_LEFT))){
facing_direction = LEFT; facing_direction = LEFT;
} }
} }
@ -244,24 +240,22 @@ public class Player extends AnimatedObject{
} }
} }
private void performSlide() { private void performSlide() {
slide_time = RabiClone.TIME; slide_time = RabiClone.TIME;
slide_time2 = System.nanoTime(); slide_time2 = System.nanoTime();
if (facing_direction) { if (facing_direction) {
x_velocity = sliding_velocity; x_velocity = sliding_velocity;
} } else {
else{
x_velocity = -sliding_velocity; x_velocity = -sliding_velocity;
} }
state = State.SLIDE; state = State.SLIDE;
} }
private void handleCameraRoomMovement() { private void handleCameraRoomMovement() {
int tileX = (int) (getX()) / Tile.TILE_WIDTH; int tileX = (int) (getX()) / Tile.TILE_WIDTH;
int tileY = (int) (getY()) / Tile.TILE_HEIGHT; int tileY = (int) (getY()) / Tile.TILE_HEIGHT;
double newX=RabiClone.level_renderer.getX(),newY=RabiClone.level_renderer.getY(); //By default we use a fixed view. double newX = RabiClone.level_renderer.getX(), newY = RabiClone.level_renderer.getY(); // By default we use a
// fixed view.
View currentView = RabiClone.CURRENT_MAP.getView(tileX, tileY); View currentView = RabiClone.CURRENT_MAP.getView(tileX, tileY);
if (currentView != lastCameraView) { if (currentView != lastCameraView) {
lastCameraView = currentView; lastCameraView = currentView;
@ -346,7 +340,6 @@ public class Player extends AnimatedObject{
RabiClone.level_renderer.setY(newY < 0 ? 0 : newY); RabiClone.level_renderer.setY(newY < 0 ? 0 : newY);
} }
private void handleMovementPhysics(double updateMult) { private void handleMovementPhysics(double updateMult) {
int right = KeyHeld(Action.MOVE_RIGHT)?1:0; int right = KeyHeld(Action.MOVE_RIGHT)?1:0;
int left = KeyHeld(Action.MOVE_LEFT)?1:0; int left = KeyHeld(Action.MOVE_LEFT)?1:0;
@ -364,6 +357,7 @@ public class Player extends AnimatedObject{
:y_velocity+y_acceleration*updateMult; :y_velocity+y_acceleration*updateMult;
double displacement_y = y_velocity*updateMult; double displacement_y = y_velocity*updateMult;
double displacement_x = x_velocity*updateMult; double displacement_x = x_velocity*updateMult;
boolean sideCollision = false; boolean sideCollision = false;
for(int i=0;i<4;i++){ for(int i=0;i<4;i++){
double check_distance_x = (displacement_x/4)*(i+1); double check_distance_x = (displacement_x/4)*(i+1);
@ -416,7 +410,7 @@ public class Player extends AnimatedObject{
&& getY()+check_distance_y>ySlopeCollisionPoint(checked_tile_bottom_center)) && getY()+check_distance_y>ySlopeCollisionPoint(checked_tile_bottom_center))
{ {
moveUpSlope(checked_tile_bottom_center); moveUpSlope(checked_tile_bottom_center);
collisionOccured = groundCollision(check_distance_y); collisionOccured = groundCollision(0);
break; break;
} }
//System.out.println((int)getX()/Tile.TILE_WIDTH); //System.out.println((int)getX()/Tile.TILE_WIDTH);
@ -441,51 +435,47 @@ public class Player extends AnimatedObject{
} }
} else { } else {
if (!sideCollision) { if (!sideCollision) {
Tile checked_tile_bottom_center = RabiClone.CURRENT_MAP.getTile((int)(getX())/Tile.TILE_WIDTH, (int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT);
handleKeyboardMovement(updateMult, right-left, horizontal_friction, horizontal_drag); handleKeyboardMovement(updateMult, right-left, horizontal_friction, horizontal_drag);
this.setX(this.getX()+displacement_x); this.setX(this.getX()+displacement_x);
if(displacement_x>0){
if(checked_tile_bottom_center==Tile.SMALL_SLOPE_RIGHT){
setY(getY()+displacement_x);
System.out.println("We're in RIGHT.");
}
}
else{
if(checked_tile_bottom_center==Tile.SMALL_SLOPE_LEFT){
setY(getY()-displacement_x);
System.out.println("We're in it for LEFT.");
}
} }
} }
} }
}
private double ySlopeCollisionPoint(Tile tile) { private double ySlopeCollisionPoint(Tile tile) {
switch (tile) { switch (tile) {
case BIG_SLOPE_LEFT1: case BIG_SLOPE_LEFT1:
return -(getX()%Tile.TILE_WIDTH/2)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4); return -(getX() % Tile.TILE_WIDTH / 2)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4);
case BIG_SLOPE_LEFT2: case BIG_SLOPE_LEFT2:
return -(getX()%Tile.TILE_WIDTH/2)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)-Tile.TILE_WIDTH/2; return -(getX() % Tile.TILE_WIDTH / 2)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4) - Tile.TILE_WIDTH / 2;
case BIG_SLOPE_RIGHT1: case BIG_SLOPE_RIGHT1:
return (getX()%Tile.TILE_WIDTH/2)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)-Tile.TILE_WIDTH; return (getX() % Tile.TILE_WIDTH / 2)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4) - Tile.TILE_WIDTH;
case BIG_SLOPE_RIGHT2: case BIG_SLOPE_RIGHT2:
return (getX()%Tile.TILE_WIDTH/2)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)-Tile.TILE_WIDTH+Tile.TILE_WIDTH/2; return (getX() % Tile.TILE_WIDTH / 2)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4) - Tile.TILE_WIDTH + Tile.TILE_WIDTH / 2;
case SMALL_SLOPE_LEFT: case SMALL_SLOPE_LEFT:
return -(getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4); return -(getX() % Tile.TILE_WIDTH)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4);
case SMALL_SLOPE_RIGHT: case SMALL_SLOPE_RIGHT:
return (getX()%Tile.TILE_WIDTH)+(int)(getY()+getAnimatedSpr().getHeight()/2)/Tile.TILE_HEIGHT*Tile.TILE_HEIGHT+(getAnimatedSpr().getHeight()/2-4)-Tile.TILE_WIDTH; return (getX() % Tile.TILE_WIDTH)
+ (int) (getY() + getAnimatedSpr().getHeight() / 2) / Tile.TILE_HEIGHT * Tile.TILE_HEIGHT
+ (getAnimatedSpr().getHeight() / 2 - 4) - Tile.TILE_WIDTH;
} }
return 0; return 0;
} }
private void moveUpSlope(Tile checked_tile_bottom_center) { private void moveUpSlope(Tile checked_tile_bottom_center) {
setY(ySlopeCollisionPoint(checked_tile_bottom_center)); setY(ySlopeCollisionPoint(checked_tile_bottom_center));
} }
@ -503,7 +493,6 @@ public class Player extends AnimatedObject{
return collisionOccured; return collisionOccured;
} }
private void handleKeyboardMovement(double updateMult, int movement, double friction, double drag) { private void handleKeyboardMovement(double updateMult, int movement, double friction, double drag) {
if (movement != 0 && Math.abs(x_velocity) < WALKING_SPEED_LIMIT) { if (movement != 0 && Math.abs(x_velocity) < WALKING_SPEED_LIMIT) {
x_acceleration = drag * (movement); x_acceleration = drag * (movement);
@ -522,13 +511,15 @@ public class Player extends AnimatedObject{
} }
@Override @Override
public void draw(byte[] p) {} public void draw(byte[] p) {
}
@Override @Override
public String toString() { public String toString() {
return "Player [facing_direction=" + (facing_direction?"RIGHT":"LEFT") + ", groundCollision=" + groundCollision + ", jumpCount=" return "Player [facing_direction=" + (facing_direction ? "RIGHT" : "LEFT") + ", groundCollision="
+ jumpCount + ", x_velocity=" + x_velocity + ", y_velocity=" + y_velocity + ", x=" + getX() + ", y=" + getY() + "]"; + groundCollision + ", jumpCount="
+ jumpCount + ", x_velocity=" + x_velocity + ", y_velocity=" + y_velocity + ", x=" + getX() + ", y="
+ getY() + "]";
} }
} }

Write Preview
Loading…
Cancel
Save