halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'liteCraft' of https://github.com/halotroop/Ginger3D into liteCraft

pull/7/head
valoeghese 2020-02-25 22:51:24 +13:00
parent b367ddfca9 4ef88b50cd
commit f59766b855
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/github/hydos/ginger/Litecraft.java
View File

@ -55,7 +55,9 @@ public class Litecraft extends Game
FontType font = new FontType(Loader.loadFontAtlas("candara.png"), "candara.fnt"); FontType font = new FontType(Loader.loadFontAtlas("candara.png"), "candara.fnt");
ginger3D.setGlobalFont(font); ginger3D.setGlobalFont(font);
ginger3D.registerText("LiteCraft", 3, new Vector2f(0, 0), 1f, true, "PLAYBUTTON"); GUIText titleText = ginger3D.registerText("LiteCraft", 3, new Vector2f(0, 0), 1f, true, "PLAYBUTTON");
titleText.setBorderWidth(0.5f);
Light sun = new Light(new Vector3f(100, 105, -100), new Vector3f(1.3f, 1.3f, 1.3f), new Vector3f(0.0001f, 0.0001f, 0.0001f)); Light sun = new Light(new Vector3f(100, 105, -100), new Vector3f(1.3f, 1.3f, 1.3f), new Vector3f(0.0001f, 0.0001f, 0.0001f));
data.lights.add(sun); data.lights.add(sun);
data.entities.add(player); data.entities.add(player);
@ -64,6 +66,8 @@ public class Litecraft extends Game
// GuiTexture title = new GuiTexture(Loader.loadTextureDirectly("/textures/guis/title.png"), new Vector2f(0, 0.8F), new Vector2f(0.25f, 0.1f)); // GuiTexture title = new GuiTexture(Loader.loadTextureDirectly("/textures/guis/title.png"), new Vector2f(0, 0.8F), new Vector2f(0.25f, 0.1f));
// data.guis.add(title); // data.guis.add(title);
//start the game loop //start the game loop
oldWindowWidth = Window.width;
oldWindowHeight = Window.height;
ginger3D.startGame(); ginger3D.startGame();
} }
@ -77,7 +81,6 @@ public class Litecraft extends Game
ginger3D.update(data); ginger3D.update(data);
if (oldWindowHeight != Window.height || oldWindowWidth != Window.width) if (oldWindowHeight != Window.height || oldWindowWidth != Window.width)
{ {
System.out.println("Windows size changed");
ginger3D.contrastFbo.resizeFBOs(); ginger3D.contrastFbo.resizeFBOs();
} }
oldWindowWidth = Window.width; oldWindowWidth = Window.width;
@ -97,7 +100,6 @@ public class Litecraft extends Game
TextureButton playButton = ginger3D.gingerRegister.guiButtons.get(0); TextureButton playButton = ginger3D.gingerRegister.guiButtons.get(0);
boolean isClicked = playButton.isClicked(); boolean isClicked = playButton.isClicked();
playButton.update(); playButton.update();
text.setText(isClicked + "");
if (isClicked) if (isClicked)
{ {
Window.lockMouse(); Window.lockMouse();

2
src/main/java/com/github/hydos/ginger/engine/io/Window.java
View File

@ -56,7 +56,7 @@ public class Window
GLFW.glfwMakeContextCurrent(window); GLFW.glfwMakeContextCurrent(window);
glContext = GL.createCapabilities(); glContext = GL.createCapabilities();
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
GLFW.glfwSetWindowPos(window, (vidmode.width() - width) / 2, (vidmode.height() - height) / 2); GLFW.glfwSetWindowPos(window, (vidmode.width() - actuallWidth) / 2, (vidmode.height() - actuallHeight) / 2);
GLFW.glfwShowWindow(window); GLFW.glfwShowWindow(window);
time = getTime(); time = getTime();
getCurrentTime(); getCurrentTime();