GameDevArea/Global-Gam-Jam-2017
Archived
1
0
Fork 0
Code Releases 1 Activity

Bug fixes

Browse source
This commit is contained in:
MrDev023 2017-01-14 20:10:33 +01:00
parent ae3320e067
commit d1ec316066
4 changed files with 82 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/globalgamejam/Main.java
View file

@ -4,6 +4,7 @@ package globalgamejam;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL13.GL_MULTISAMPLE;
import static org.lwjgl.system.MemoryUtil.*;
import org.lwjgl.glfw.*;
@ -48,6 +49,7 @@ public class Main {
glfwDefaultWindowHints();
glfwWindowHint(GLFW_VISIBLE, GL11.GL_FALSE);
glfwWindowHint(GLFW_RESIZABLE, GL11.GL_FALSE);
glfwWindowHint(GLFW_SAMPLES, 4);//Activation du MSAA x4
// glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
// glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
@ -69,6 +71,7 @@ public class Main {
//initialisation
//------------------------------------------------------------------------------------
glEnable(GL_MULTISAMPLE);//Activation du MSAA
Input.init();
game = new MainGame();
@ -103,9 +106,16 @@ public class Main {
}
}
game.destroy();
Audio.destroy();
glfwDestroyWindow(windowID);
glfwTerminate();
}
public static void changeGame(Game g){
game.destroy();
game = g;
g.init();
}
}

6
src/globalgamejam/render/FrameBufferObject.java
View file

@ -41,9 +41,6 @@ public class FrameBufferObject {
//Definir le render Texture
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,GL_TEXTURE_2D, renderedTexture, 0);
IntBuffer drawBuffs = BufferUtils.createIntBuffer(1);
drawBuffs.put(0, GL_COLOR_ATTACHMENT0);
GL20.glDrawBuffers(drawBuffs);
if(glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
throw new IllegalStateException("FBO not loaded !");
fboTexID = renderedTexture;
@ -75,6 +72,9 @@ public class FrameBufferObject {
public void startRenderToFBO(){
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
IntBuffer drawBuffs = BufferUtils.createIntBuffer(1);
drawBuffs.put(0, GL_COLOR_ATTACHMENT0);
GL20.glDrawBuffers(drawBuffs);
glViewport(0,0,Main.WIDTH,Main.HEIGHT);
}