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

Resolved errors created during merge

pull/12/head
Caroline Bell 2020-03-02 02:51:05 -08:00
parent 6e831468f9
commit 3dce58b238
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.classpath
View File

@ -5,8 +5,9 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-13">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
@ -23,9 +24,9 @@
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
src/main/java/com/github/halotroop/litecraft/Litecraft.java
View File

@ -114,7 +114,7 @@ public class Litecraft extends Game
{
if (engine == null) // Prevents this from being run more than once on accident.
{
Window.create(windowWidth, windowHeight, "LiteCraft", frameCap); // create window
Window.create(windowWidth, windowHeight, "Litecraft", frameCap, RenderAPI.OpenGL); // create window
// set up the gateways keybind key tracking
KeyCallbackHandler.trackWindow(Window.getWindow());
MouseCallbackHandler.trackWindow(Window.getWindow());

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

@ -69,13 +69,10 @@ public class Window
}else if (renderAPI == RenderAPI.Vulkan)
GLFW.glfwWindowHint(GLFW.GLFW_VISIBLE, GLFW.GLFW_FALSE);
<<<<<<< Upstream, based on branch 'liteCraft' of https://github.com/halotroop/Ginger3D.git
=======
GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MAJOR, 4);
GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MINOR, 6);
GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_PROFILE, GLFW.GLFW_OPENGL_CORE_PROFILE);
GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_FORWARD_COMPAT, GL11.GL_TRUE);
>>>>>>> 2023b14 OpenGL 4.6 YeS
GLFW.glfwWindowHint(GLFW.GLFW_RESIZABLE, GLFW.GLFW_TRUE);
GLFWVidMode vidmode = GLFW.glfwGetVideoMode(GLFW.glfwGetPrimaryMonitor());
window = GLFW.glfwCreateWindow(actualWidth, actualHeight, title, (fullscreen) ? GLFW.glfwGetPrimaryMonitor() : 0, getWindow());
@ -96,11 +93,7 @@ public class Window
oldWindowHeight = getHeight();
}
<<<<<<< Upstream, based on branch 'liteCraft' of https://github.com/halotroop/Ginger3D.git
public static void create(int width, int height, String title, int fpsCap, RenderAPI api)
=======
public static void create(int width, int height, String title, float fpsCap)
>>>>>>> 2023b14 OpenGL 4.6 YeS
public static void create(int width, int height, String title, float fpsCap, RenderAPI api)
{
Window.width = width / 2;
Window.height = height / 2;