Skip to content

Commit

Permalink
Merge pull request #109 from group22DKE/remove_2d_stuff
Browse files Browse the repository at this point in the history
refactor and remove all 2d objects
  • Loading branch information
S010MON authored Jun 20, 2021
2 parents d6e2523 + 50859be commit 9a18536
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 1,335 deletions.
30 changes: 14 additions & 16 deletions app/src/main/java/src/land/LanderObject.java
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
package src.land;

import src.peng.Vector2d;
import src.peng.Vector3d;

public class LanderObject {
public class LanderObject
{

public double direction;
public Vector2d position;
public double time;
private double angle;
private Vector3d position;

public LanderObject(Vector2d position, double direction, double time) {
public LanderObject(Vector3d position, double angle)
{
this.position = position;
this.direction = direction;
this.time = time;
this.angle = angle;
}

public Vector2d getPosition() {
public Vector3d getPosition()
{
return this.position;
}

public double getDirection() {
return this.direction;
}

public double getTime() {
return this.time;
public double getAngle()
{
return this.angle;
}

public boolean equals(Object o)
{
LanderObject v = (LanderObject) o;
if((v.time == this.time) && (v.direction == this.direction) && (v.position.equals(position)))
if((v.angle == this.angle) && (v.position.equals(position)))
{
return true;
}
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/src/land/LanderSettings.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package src.land;

import java.time.LocalDateTime;

import src.peng.Vector2d;
import src.univ.CelestialBody;

public class LanderSettings
{
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/src/land/LandingModule.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
package src.land;

import java.util.ArrayList;

import src.peng.State;
import src.peng.StateInterface;
import src.peng.Vector2d;
import src.univ.CelestialBody;

public class LandingModule {

public double fuel;
Expand Down
113 changes: 0 additions & 113 deletions app/src/main/java/src/peng/NewtonGravity2d.java

This file was deleted.

95 changes: 0 additions & 95 deletions app/src/main/java/src/peng/Rate2d.java

This file was deleted.

Loading

0 comments on commit 9a18536

Please sign in to comment.