ok added text but shaders need to be tested

pull/1/head
BuildTools 2019-05-26 17:44:21 +10:00
parent 515660d27a
commit 94f43dc1fb
4 changed files with 4 additions and 3 deletions

View File

@ -52,7 +52,7 @@ public class Example {
FontType font = new FontType(Loader.loadFontAtlas("calibri.png"), "calibri.fnt");
GUIText text = new GUIText("hi this is some sample text", 1, font, new Vector2f(0,0), 1f, true);
GUIText text = new GUIText("hi, this is some sample text", 3, font, new Vector2f(0,0), 1f, true);
text.setColour(0, 1, 0);
masterRenderer = new MasterRenderer();
@ -127,6 +127,7 @@ public class Example {
barrel.increaseRotation(0, 1, 0);
masterRenderer.renderScene(entities, normalMapEntities, terrains, lights, camera, new Vector4f(0, -1, 0, 100000));
masterRenderer.renderGuis(guis);
TextMaster.render();
Window.swapBuffers();
}

View File

@ -5,7 +5,7 @@ in vec2 pass_textureCoords;
out vec4 out_colour;
uniform vec3 colour;
uniform smapler2D fontAtlas;
uniform sampler2D fontAtlas;
void main(void){

View File

@ -5,7 +5,7 @@ in vec2 pass_textureCoords;
out vec4 out_colour;
uniform vec3 colour;
uniform smapler2D fontAtlas;
uniform sampler2D fontAtlas;
void main(void){