diff --git a/TeamProject.iml b/TeamProject.iml
index 3e1a433..d8a0143 100644
--- a/TeamProject.iml
+++ b/TeamProject.iml
@@ -151,7 +151,7 @@
-
+
@@ -1484,5 +1484,8 @@
+
+
+
\ No newline at end of file
diff --git a/src/client/Main.java b/src/client/Main.java
index 9bee21a..97be796 100644
--- a/src/client/Main.java
+++ b/src/client/Main.java
@@ -31,6 +31,7 @@ public Window getWindow() {
private Main(String host, int port) {
super(host, port);
+ //super("192.168.43.92", port);
Main.instance = this;
}
diff --git a/src/graphics/screen/Settings.java b/src/graphics/screen/Settings.java
index a23364d..0ee8e22 100644
--- a/src/graphics/screen/Settings.java
+++ b/src/graphics/screen/Settings.java
@@ -18,27 +18,27 @@ public class Settings {
public static void drawAudioBar() {
double[] vertices = {
- -0.2f, 0, 0,
- 0.6f, 0, 0,
- 0.6f, -0.05f, 0,
- -0.2f, -0.05f, 0
+ -0.2f, -0.37, 0,
+ 0.6f, -0.37, 0,
+ 0.6f, -0.42f, 0,
+ -0.2f, -0.42f, 0
};
rshader.bind();
Rectangle.drawrectangle(vertices, Menu.getRectangleModel(), false);
rshader.stop();
//tshader.bind();
glColor3f(255, 255, 255);
- Text.draw("Volume", -6f, 0.5f, 0.5f, false);
+ Text.draw("Volume", -6f, -2.5f, 0.5f, false);
glColor3f(255, 255, 255);
//tshader.stop();
}
public static void drawSlider(){
double[] vertices = {
- getXLower(), 0.01, 0,
- getXUpper(), 0.01, 0,
- getXUpper(), -0.06f, 0,
- getXLower(), -0.06f, 0
+ getXLower(), -0.36, 0,
+ getXUpper(), -0.36, 0,
+ getXUpper(), -0.43, 0,
+ getXLower(), -0.43f, 0
};
rshader.bind();
Rectangle.drawrectangle(vertices, Menu.getRectangleModel(), false);
@@ -67,4 +67,13 @@ static double getXUpper(){
public static double volumePercentage(){
return (((getXLower()+0.025) - (-0.2))/0.8)*100;
}
+
+ public static void drawInstructions(){
+ glColor3f(255, 255, 255);
+ Text.draw("Instructions", -6f, 5f, 0.5f, false);
+ Text.draw("To move left press a", -10.5f, 6,0.3f, false );
+ Text.draw("To move right press d", -10.5f,4.5f, 0.3f,false);
+ Text.draw("To double jump press the space bar", -10.5f, 3,0.3f,false );
+ }
+
}
\ No newline at end of file
diff --git a/src/graphics/ui/Text.java b/src/graphics/ui/Text.java
index 9a51727..9f27cb6 100644
--- a/src/graphics/ui/Text.java
+++ b/src/graphics/ui/Text.java
@@ -171,7 +171,7 @@ public static void draw(String s, float x, float y, float scale, boolean opponen
startX += scale * 0.65/scale;
charNum++;
}else{
- startX += scale * 3/scale;
+ startX += scale * 0.4/scale;
spaceNum++;
}
space = false;
diff --git a/src/graphics/ui/Window.java b/src/graphics/ui/Window.java
index 28d12e9..65b6c6a 100644
--- a/src/graphics/ui/Window.java
+++ b/src/graphics/ui/Window.java
@@ -206,6 +206,7 @@ public void repaint(GameState ourGameState, GameState theirGameState) {
Menu.drawBackToMenuButton();
Settings.drawAudioBar();
Settings.drawSlider();
+ Settings.drawInstructions();
} else if(screen == Screen.LOADING){
if(!finishedLoading){
LoadingScreen.drawLoadingWord();
@@ -376,7 +377,7 @@ private boolean onSettingsButton(double x, double y){
private boolean onAudioBar(double x, double y) {
double newX = ((1+x)*2)-1;
- return withinBounds(newX, y, -0.2, 0.6, -0.05, 0);
+ return withinBounds(newX, y, -0.2, 0.6, -0.42, -0.37);
}
/**
@@ -396,7 +397,7 @@ private boolean onQuitButton(double x, double y) {
* @return Whether the coordinate is within the button.
*/
private boolean onBackToMenuButton(double x, double y) {
- return withinBounds(x, y, -0.95, -0.85, 0.845, 0.95);
+ return withinBounds(x, y, /*-0.95*/ -0.97, -0.85, 0.845f, 0.95f);
}
/**