Merge branch 'Gameplay' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git into Gameplay
This commit is contained in:
@ -1,4 +1,7 @@
|
||||
package Frames;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import Hitboxes.*;
|
||||
/**
|
||||
* Main class for frames
|
||||
* @author Victor Azra
|
||||
@ -6,9 +9,47 @@ package Frames;
|
||||
*/
|
||||
public class Frame {
|
||||
|
||||
//TODO: to implement
|
||||
private Double move_y;
|
||||
private Double move_x;
|
||||
private ArrayList<Passive_HitBox> passHitBox;
|
||||
private ArrayList<Active_HitBox> actHitBox;
|
||||
private ArrayList<Passive_throw_HitBox> passThrowHitBox;
|
||||
private ArrayList<Active_throw_Hitbox> actThrowHitBox;
|
||||
private Push_HitBox pushHitBox;
|
||||
|
||||
public Frame() {
|
||||
//TODO : to implement
|
||||
this.move_y = 0.0;
|
||||
this.move_x = 0.0;
|
||||
this.passHitBox = new ArrayList<Passive_HitBox>();
|
||||
this.actHitBox = new ArrayList<Active_HitBox>();
|
||||
this.passThrowHitBox = new ArrayList<Passive_throw_HitBox>();
|
||||
this.actThrowHitBox = new ArrayList<Active_throw_Hitbox>();
|
||||
this.pushHitBox = new Push_HitBox();
|
||||
}
|
||||
|
||||
public Frame(Double move_y, Double move_x, ArrayList<Passive_HitBox> passHitBox, ArrayList<Active_HitBox> actHitBox,
|
||||
ArrayList<Passive_throw_HitBox> passThrowHitBox, ArrayList<Active_throw_Hitbox> actThrowHitBox,
|
||||
Push_HitBox pushHitBox) {
|
||||
this.move_y = move_y;
|
||||
this.move_x = move_x;
|
||||
this.passHitBox = passHitBox;
|
||||
this.actHitBox = actHitBox;
|
||||
this.passThrowHitBox = passThrowHitBox;
|
||||
this.actThrowHitBox = actThrowHitBox;
|
||||
this.pushHitBox = pushHitBox;
|
||||
}
|
||||
|
||||
/*
|
||||
* Mainly use for projectiles
|
||||
*/
|
||||
public Frame(Double move_y, Double move_x, ArrayList<Passive_HitBox> passHitBox, ArrayList<Active_HitBox> actHitBox) {
|
||||
this.move_y = move_y;
|
||||
this.move_x = move_x;
|
||||
this.passHitBox = passHitBox;
|
||||
this.actHitBox = actHitBox;
|
||||
this.passThrowHitBox = new ArrayList<Passive_throw_HitBox>();
|
||||
this.actThrowHitBox = new ArrayList<Active_throw_Hitbox>();
|
||||
this.pushHitBox = new Push_HitBox();
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user