Skip to content

Commit

Permalink
Merge branch 'master' into Logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukasbischof
lukasbischof committed Dec 22, 2016
2 parents ef2f5f2 + bab2fb4 commit 1834f0f
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 92 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ bin/*
.idea\*
.idea*
.idea/workspace.xml
*.log
*.log
.classpath
1 change: 1 addition & 0 deletions src/logic/algorithm/PathFinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ private void findAdditionalGraphNodesWithPerpendicularLineAtPointOfInterception(
continue;
}

System.out.println("player: " + playerPosition + ", inter: aaa" + interception);
if (!quadController.testLineForObstacles(playerPosition, interception)) {
Node node = new Node(interception);
node.connectTo(connection.getEnd());
Expand Down
10 changes: 4 additions & 6 deletions src/main/Driver.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.system.MemoryUtil.*;
import static org.lwjgl.glfw.Callbacks.*;
import static org.lwjgl.system.MemoryUtil.NULL;

Expand Down Expand Up @@ -60,15 +59,14 @@ public void init(){
rend = new Renderer(this);
user = new User(this);
running = true;

}


public void graficInit(){
if (Platform.get() == Platform.MACOSX) {
java.awt.Toolkit.getDefaultToolkit();
}

if(!glfwInit()){
System.err.println("Initialisierung fehlgeschlagen!");
}
Expand Down Expand Up @@ -98,14 +96,14 @@ public void graficInit(){
(vidmode.width() - width) / 2,
(vidmode.height() - height) / 2
);

glfwMakeContextCurrent(windows);
glfwSwapInterval(1);
glfwShowWindow(windows);
GL.createCapabilities();
glViewport(0, 0, width, height);
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);

System.out.println("OpenGL version " + glGetString(GL_VERSION));
shaderMan = ShaderManager.getInstance();
}
Expand Down Expand Up @@ -139,7 +137,7 @@ public void run(){
running = false;
}
}

glfwFreeCallbacks(windows);
glfwDestroyWindow(windows);
glfwTerminate();
Expand Down
4 changes: 4 additions & 0 deletions src/view/Renderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.util.ArrayList;

import org.lwjgl.opengl.GL11;

import logic.Index2D;
import logic.Quad;
import main.Driver;
Expand All @@ -20,6 +22,8 @@ public Renderer(Driver driver) {

public void render() {

GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);

for (Quad quady : getQuads()) {

Index2D indy = quady.getIndex();
Expand Down
7 changes: 4 additions & 3 deletions src/view/controller/Movement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ public boolean move(Node nd, int direction) {
switch (direction) {
case 0:
if (isThereNoObstacle(posX, posY + 0.01)) {
if ((posY += 0.01) > 1.0) {
if ((posY += 0.01) > 0.99) {
posY = 0.99;
}
}
break;
case 1:
if (isThereNoObstacle(posX + 0.01, posY)) {
if ((posX += 0.01) > 1.0) {
if ((posX += 0.01) > 0.99) {
posX = 0.99;
}
}
Expand All @@ -60,7 +60,8 @@ public boolean move(Node nd, int direction) {
default:
return false;
}
nd.setPoint(new Point(posX, posY));
nd.setPoint(new Point(posX, posY));

return true;
}

Expand Down
162 changes: 81 additions & 81 deletions src/view/controller/User.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,86 +13,86 @@
import static org.lwjgl.glfw.GLFW.*;

public class User {
private Driver driver;
private ArrayList<Point> points;
private int pointsCount;

public User(Driver driver) {
this.driver = driver;
points = null;

if (points == null) {
points = getGame().getPathForMonster().getPoints();
points.remove(0);
points.remove(points.size()-1);
}
}

public void update() {
if (points == null) {
points = getGame().getPathForMonster().getPoints();
points.remove(0);
points.remove(points.size() - 1);
}
else if(getGame().getMonster().getPoint().getX() != points.get(points.size()-1).getX() && getGame().getMonster().getPoint().getY() != points.get(points.size()-1).getY()){
if (pointsCount == 0) {
getMove().setupMonsterMovement(getGame().getMonster(), points.get(0));
getMove().moveTo(getGame().getMonster(), points.get(0));
pointsCount++;
}
else if(pointsCount < 120 && pointsCount != 0){
getMove().moveTo(getGame().getMonster(), points.get(0));
pointsCount++;
}
else{
pointsCount = 0;
points.remove(0);
}

if (points.size() == 0) {
points = null;
}
}
else{
points = null;
}

if (KeyboardInput.isKeyDown(GLFW_KEY_W)) {
getMove().move(getGame().getPlayer(), UP);
if(getGame().getQuadController().testLineForObstacles(getGame().getMonster().getPoint(), getGame().getPlayer().getPoint())){
points = null;
}
}
if (KeyboardInput.isKeyDown(GLFW_KEY_S)) {
getMove().move(getGame().getPlayer(), DOWN);
if(getGame().getQuadController().testLineForObstacles(getGame().getMonster().getPoint(), getGame().getPlayer().getPoint())){
points = null;
}
}
if (KeyboardInput.isKeyDown(GLFW_KEY_A)) {
getMove().move(getGame().getPlayer(), LEFT);
if(getGame().getQuadController().testLineForObstacles(getGame().getMonster().getPoint(), getGame().getPlayer().getPoint())){
points = null;
}
}
if (KeyboardInput.isKeyDown(GLFW_KEY_D)) {
getMove().move(getGame().getPlayer(), RIGHT);
if(getGame().getQuadController().testLineForObstacles(getGame().getMonster().getPoint(), getGame().getPlayer().getPoint())){
points = null;
}
}

QuadController c = getGame().getQuadController();
c.quadAtIndex(c.indexForPoint(new Point(0.5, 0.5))).isObstacle();

}

private Game getGame() {
return driver.getGame();
}

private Movement getMove() {
return driver.getMove();
}
private Driver driver;
private ArrayList<Point> points;
private int pointsCount;

public User(Driver driver) {
this.driver = driver;
points = null;

if (points == null) {
points = getGame().getPathForMonster().getPoints();
points.remove(0);
points.remove(points.size()-1);
}
}

public void update() {
if (points == null) {
points = getGame().getPathForMonster().getPoints();
points.remove(0);
points.remove(points.size() - 1);
}
else if(getGame().getMonster().getPoint().getX() != points.get(points.size()-1).getX() && getGame().getMonster().getPoint().getY() != points.get(points.size()-1).getY()){
if (pointsCount == 0) {
getMove().setupMonsterMovement(getGame().getMonster(), points.get(0));
getMove().moveTo(getGame().getMonster(), points.get(0));
pointsCount++;
}
else if(pointsCount < 120 && pointsCount != 0){
getMove().moveTo(getGame().getMonster(), points.get(0));
pointsCount++;
}
else{
pointsCount = 0;
points.remove(0);
}

if (points.size() == 0) {
points = null;
}
}
else{
points = null;
}

if (KeyboardInput.isKeyDown(GLFW_KEY_W)) {
getMove().move(getGame().getPlayer(), UP);
setPointsNullIfObstacle();
}
if (KeyboardInput.isKeyDown(GLFW_KEY_S)) {
getMove().move(getGame().getPlayer(), DOWN);
setPointsNullIfObstacle();
}
if (KeyboardInput.isKeyDown(GLFW_KEY_A)) {
getMove().move(getGame().getPlayer(), LEFT);
setPointsNullIfObstacle();
}
if (KeyboardInput.isKeyDown(GLFW_KEY_D)) {
getMove().move(getGame().getPlayer(), RIGHT);
setPointsNullIfObstacle();
}

QuadController c = getGame().getQuadController();
c.quadAtIndex(c.indexForPoint(new Point(0.5, 0.5))).isObstacle();

}


private void setPointsNullIfObstacle(){
System.out.println(getGame().getMonster().getPoint().getX() + " | " + getGame().getMonster().getPoint().getY() + " : " + getGame().getPlayer().getPoint().getX() + " | " + getGame().getPlayer().getPoint().getY());
if(getGame().getQuadController().testLineForObstacles(getGame().getMonster().getPoint(), getGame().getPlayer().getPoint())){
points = null;
}
}

private Game getGame() {
return driver.getGame();
}

private Movement getMove() {
return driver.getMove();
}

}
2 changes: 1 addition & 1 deletion src/view/shaders/fragment.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ out vec4 out_Color;
void main(void){

out_Color = vec4(colour, 1.0);

}

0 comments on commit 1834f0f

Please sign in to comment.