Skip to content

2016 12 19 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willian168 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

2016 12 19 #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
186aa27
correct TURNDOWN
willian168 Dec 20, 2016
1131fa9
碰撞bug修改
willian168 Dec 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions src/ncu/sw/gameServer/ServerGameController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class ServerGameController {

public static ServerGameController getInstance() {
if(ourInstance == null) {
ourInstance = new ServerGameController(200,1,100);
ourInstance = new ServerGameController(200,100,100);
}
return ourInstance;
}
Expand Down Expand Up @@ -126,7 +126,7 @@ private boolean isOverlay(GameObject a, GameObject b) {
}
}
else {//circle is a. rectangle is b.
if(b.getAttribute() == 0) {
if(a.getAttribute() == 0) {
circleBuf = a;
rectangleBuf = b;
}
Expand All @@ -135,7 +135,7 @@ private boolean isOverlay(GameObject a, GameObject b) {
rectangleBuf = a;
}
if(isSameQuadrant(circleBuf,rectangleBuf)) {
if(findClosetCalcDistance(circleBuf,rectangleBuf)>=circleBuf.getHeight()) {
if(findClosetCalcDistance(circleBuf,rectangleBuf) >= circleBuf.getHeight()) {
return false;
}
else {
Expand All @@ -144,7 +144,7 @@ private boolean isOverlay(GameObject a, GameObject b) {
}
else if(((Math.abs(circleBuf.getPositionX()-rectangleBuf.getPositionX())
>=(circleBuf.getWidth() + rectangleBuf.getWidth()/2))
&& (Math.abs(circleBuf.getPositionY()-rectangleBuf.getPositionY())
|| (Math.abs(circleBuf.getPositionY()-rectangleBuf.getPositionY())
>= (circleBuf.getHeight() + rectangleBuf.getHeight()/2)))){
return false;
}
Expand All @@ -157,13 +157,17 @@ else if(((Math.abs(circleBuf.getPositionX()-rectangleBuf.getPositionX())
private double findClosetCalcDistance(GameObject a, GameObject b) {
double min = Double.POSITIVE_INFINITY;
double [] buf = new double [4];
buf[0] = calcDistance(a.getPositionX(),a.getPositionY(),(b.getPositionX() - b.getWidth()/2),(b.getPositionY() - b.getHeight()/2)); // left up
buf[1] = calcDistance(a.getPositionX(),a.getPositionY(),(b.getPositionX()+b.getWidth()/2),(b.getPositionY() - b.getHeight()/2)); //right up
buf[2] = calcDistance(a.getPositionX(),a.getPositionY(),(b.getPositionX()-b.getWidth()/2),(b.getPositionY() + b.getHeight()/2)); //left down
buf[3] = calcDistance(a.getPositionX(),a.getPositionY(),(b.getPositionX()+b.getWidth()/2),(b.getPositionY() + b.getHeight()/2)); //Right down
for(int i=0;i<buf.length;i++) {
if(buf[i]<min) {
min =buf[i];
buf[0] = calcDistance(a.getPositionX(), a.getPositionY(),
(b.getPositionX() - b.getWidth()/2), (b.getPositionY() - b.getHeight()/2)); // left up
buf[2] = calcDistance(a.getPositionX(), a.getPositionY(),
(b.getPositionX() - b.getWidth()/2), (b.getPositionY() + b.getHeight()/2)); //left down
buf[3] = calcDistance(a.getPositionX(), a.getPositionY(),
(b.getPositionX() + b.getWidth()/2), (b.getPositionY() + b.getHeight()/2)); //Right down
buf[1] = calcDistance(a.getPositionX(), a.getPositionY(),
(b.getPositionX() + b.getWidth()/2), (b.getPositionY() - b.getHeight()/2)); //right up
for(int i=0; i<buf.length; i++) {
if(buf[i] < min) {
min = buf[i];
}
}
return min;
Expand All @@ -176,14 +180,14 @@ private boolean isSameQuadrant(GameObject a, GameObject b) {
int rightX = b.getPositionX() + b.getWidth()/2 - circleX;
int rightY = b.getPositionY() + b.getHeight()/2 - circleY;

if(leftX>0 &&rightX>0) {
if((leftY>0 && rightY>0)|| (leftY<0 && rightY<0)){
if( leftX>0 && rightX>0 ){
if( (leftY>0 && rightY>0) || (leftY<0 && rightY<0) ){
return true;
}
return false;
}
else if(leftX<0&& rightX<0) {
if((leftY>0 && rightY>0)|| (leftY<0 && rightY<0)){
else if( leftX<0 && rightX<0 ){
if(( leftY>0 && rightY>0) || (leftY<0 && rightY<0) ){
return true;
}
return false;
Expand Down Expand Up @@ -396,7 +400,7 @@ public void playerMove(String id, int direction ) {
bufcmd.getPlayerArrayList().add(player);
}
else {
player.setPosition(player.getPositionX() - speed,player.getPositionY() - speed);
player.setPosition(player.getPositionX() ,player.getPositionY() - speed);
}
break;
case TURNWESTSOUTH :
Expand Down Expand Up @@ -458,13 +462,17 @@ private boolean isCanMove(Player a) {
ArrayList<Obstacle> obstacleArrayList = cmd.getObstacleArrayList();
ArrayList<Item> itemArrayList = cmd.getItemArrayList();
ArrayList<Player> playerArrayList = cmd.getPlayerArrayList();
//if (true) return true;
for(int i = 0; i<obstacleArrayList.size();i++) {
if( isOverlay(obstacleArrayList.get(i), a)) {
System.out.println("Obstacle " +
obstacleArrayList.get(i).getPositionX() + " " + obstacleArrayList.get(i).getPositionY());
return false;
}
}
for(int i = 0; i<playerArrayList.size();i++) {
if( isOverlay( playerArrayList.get(i), a) &&( playerArrayList.get(i) != a )) {
System.out.println("Player");
return false;
}
}
Expand Down