Browse Source

small fix in font renderer

Kajetan Johannes Hammerle 5 years ago
parent
commit
c2c7a9dbc0

+ 5 - 2
.gitignore

@@ -1,6 +1,5 @@
 package me.hammerle.snuviengine.api;
 
-import me.hammerle.snuviengine.api.Shader;
 import org.lwjgl.glfw.*;
 import org.lwjgl.opengl.*;
 import static org.lwjgl.glfw.Callbacks.*;
@@ -61,6 +60,10 @@ public abstract class Engine
         glfwDefaultWindowHints();
         glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
         glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
+        
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+        glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
         window = glfwCreateWindow(Shader.BASE_WIDTH, Shader.BASE_HEIGHT, "SnuviEngine " + VERSION, NULL, NULL);
         if(window == NULL)
@@ -139,7 +142,7 @@ public abstract class Engine
             glfwSwapBuffers(window);
             
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
+            
             if(fpsLimit > 0)
             {
                 sleep(fpsLimit - fps.getCurrentTime());

+ 1 - 1
src/me/hammerle/snuviengine/api/FontRenderer.java

@@ -228,7 +228,7 @@ public class FontRenderer
     public Rectangle getSize(String s)
     {
         int length = 0;
-        int counter = 0;
+        int counter = 1;
         for(int i = 0; i < s.length(); i++)
         {
             switch(s.charAt(i))

+ 27 - 11
src/me/hammerle/snuviengine/api/GLHelper.java

@@ -58,17 +58,23 @@ public class Game extends Engine
     public void init()
     {
         setNanosPerTick(50_000_000);
-        setMaxFps(120);
+        //setMaxFps(120);
         
         //Shader.setAmbientLight(0.5f, 0.5f, 0.5f);
-        Shader.setLightColor(0, 1f, 0.75f, 0.5f);
+        Shader.setLightColor(0, 1f, 0.0f, 0.5f);
         Shader.setLightStrength(0, 0.01f);
+        
+        
+        Shader.translateTo(0.0f, 0.0f);
+        Shader.updateMatrix();
+        Shader.setTextureEnabled(true);
+        Shader.setColorEnabled(true);
     }
 
     @Override
     public void tick()
     {        
-        w.tick();
+        /*w.tick();
         CLOCK.start();
         entities.forEach(ent -> ent.tick());
         CLOCK.stop();
@@ -83,7 +89,7 @@ public class Game extends Engine
         {
             toogleTps = !toogleTps;
             setRenderTps(toogleTps);
-        }
+        }*/
     }
     
     private static final Clock CLOCK = new Clock(250);
@@ -99,15 +105,25 @@ public class Game extends Engine
         Shader.getColorRenderer().drawRectangle(0, 299, 400, 300, 0xFFFFFFFF);
         entities.forEach(ent -> ent.renderTick(lag));*/
         
-        Shader.setTextureEnabled(true);
+        /*Shader.setTextureEnabled(true);
         Shader.setColorEnabled(true);
         Shader.translateTo(0.0f, 0.0f);
-        Shader.updateMatrix();
-        float y = 5.5f;
-        y = Shader.getFontRenderer().drawString(5.5f, y, true, "FPS " + String.format("%.1f", getFps()));
-        y = Shader.getFontRenderer().drawString(5, y, true, "TPS " + String.format("%.1f", getTps()));
-        y = Shader.getFontRenderer().drawString(5, y, true, String.valueOf(CLOCK.getTime()));
-        y = Shader.getFontRenderer().drawString(5, y, true, String.valueOf(CLOCK.getMinTime()));
+        Shader.updateMatrix();*/
+        /*float y = 0;
+        for(int i = 0; i < 20; i++)
+        {
+            Shader.getFontRenderer().drawString(20, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            Shader.getFontRenderer().drawString(40, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            Shader.getFontRenderer().drawString(60, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            Shader.getFontRenderer().drawString(80, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            Shader.getFontRenderer().drawString(100, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            Shader.getFontRenderer().drawString(120, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+            y = Shader.getFontRenderer().drawString(30, y, true, "&aO&bO&cO&dO&eO&fO&gO&hO&iO&jO&kO&lO&mO&nO&oO&pO&qO&rO&sO&tO&uO&vO&wO&xO&yO&zO");
+        }
+        y = Shader.getFontRenderer().drawString(30, y, true, "FPS " + String.format("%.1f", getFps()));*/
+        //y = Shader.getFontRenderer().drawString(5, y, true, "TPS " + String.format("%.1f", getTps()));
+        //y = Shader.getFontRenderer().drawString(5, y, true, String.valueOf(CLOCK.getTime()));
+        //y = Shader.getFontRenderer().drawString(5, y, true, String.valueOf(CLOCK.getMinTime()));
     }
 
     @Override

+ 0 - 4
src/me/hammerle/snuviengine/game/Hero.java

@@ -1,9 +1,5 @@
 #version 430
 
-layout (location = 0) in vec3 pos;
-layout (location = 1) in vec2 tex;
-layout (location = 2) in vec4 vertexColor;
-
 uniform sampler2D samp;
 
 uniform mat4 viewMatrix;

+ 1 - 1
src/me/hammerle/snuviengine/shader/vertex.vs

@@ -4,7 +4,7 @@ layout (location = 0) in vec3 pos;
 layout (location = 1) in vec2 tex;
 layout (location = 2) in vec4 vertexColor;
 
-layout (binding = 0) uniform sampler2D samp;
+uniform sampler2D samp;
 
 uniform mat4 viewMatrix;
 uniform mat4 modelMatrix;

+ 0 - 0
src/me/hammerle/snuviengine/util/Clock.java