HeeroYui/jege_proto
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] start to work on GALE

Browse Source
This commit is contained in:
Edouard DUPIN
2020-05-07 01:09:43 +02:00
parent dd6fb69230
commit e9fe2b9649
46 changed files with 3136 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/guis/GuiRenderer.java
View File

@@ -29,13 +29,9 @@ public class GuiRenderer {
GL30.glBindVertexArray(quad.getVaoID());
GL20.glEnableVertexAttribArray(0);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_DEPTH_TEST);
//OpenGL.enable(OpenGL.Flag.flag_blend);
//GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
//OpenGL.enable(OpenGL.Flag.flag_cullFace);
//OpenGL.enable(OpenGL.Flag.flag_back);
OpenGL.enable(OpenGL.Flag.flag_blend);
OpenGL.enable(OpenGL.Flag.flag_cullFace);
OpenGL.enable(OpenGL.Flag.flag_back);
for (GuiTexture gui: guis) {
GL13.glActiveTexture(GL13.GL_TEXTURE0);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, gui.getTexture());
@@ -45,11 +41,9 @@ public class GuiRenderer {
GL11.glDrawArrays(GL11.GL_TRIANGLE_STRIP, 0, quad.getVertexCount());
}
//OpenGL.disable(OpenGL.Flag.flag_blend);
//OpenGL.disable(OpenGL.Flag.flag_cullFace);
//OpenGL.disable(OpenGL.Flag.flag_back);
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_DEPTH_TEST);
OpenGL.disable(OpenGL.Flag.flag_blend);
OpenGL.disable(OpenGL.Flag.flag_cullFace);
OpenGL.disable(OpenGL.Flag.flag_back);
GL20.glDisableVertexAttribArray(0);
GL30.glBindVertexArray(0);

4
src/guis/GuiShader.java
View File

@@ -7,8 +7,8 @@ import shaders.ShaderProgram;
public class GuiShader extends ShaderProgram {
private static final String VERTEX_FILE = "src/guis/guiVertexShader.txt";
private static final String FRAGMENT_FILE = "src/guis/guiFragmentShader.txt";
private static final String VERTEX_FILE = "src/guis/gui.vert";
private static final String FRAGMENT_FILE = "src/guis/gui.frag";
private int location_transformationMatrix;

0
src/guis/guiFragmentShader.txt → src/guis/gui.frag
View File

0
src/guis/guiVertexShader.txt → src/guis/gui.vert
View File