Revert "Test for new fonts, 16 sampling, maybe killer for performance, lets see how it goes. DFF for zooming fonts."

This reverts commit 3740018.

Author: azakhary

editor/assets/skin/roboto-dff.fnt

@@ -2,7 +2,7 @@
 uiskin.png
 size: 2048,1024
 format: RGBA8888
-filter: Linear,Linear
+filter: Nearest,Nearest
 repeat: none
 background-fill
   rotate: false

editor/assets/skin/roboto-dff.png

@@ -1,5 +1,8 @@
 {
-
+	com.badlogic.gdx.graphics.g2d.BitmapFont: {
+		default-font: { file: skin/default-font.fnt },
+		small-font: { file: skin/small-font.fnt }
+	},
 	com.badlogic.gdx.graphics.Color: {
 		black: {a: 1, b: 0, g: 0, r: 0 }
 		white: {a: 1, b: 1, g: 1, r: 1 }
@@ -265,4 +268,4 @@
 	com.kotcrab.vis.ui.util.adapter.SimpleListAdapter$SimpleListAdapterStyle: {
 		default: {background: window-bg, selection: list-selection }
 	}
-}
+}

editor/assets/skin/uiskin.atlas

@@ -25,8 +25,6 @@ public static void main (String[] arg) {
 		config.setWindowedMode(1200, 700);
 		config.setTitle("Talos");
 
-		config.setBackBufferConfig(8, 8, 8, 8, 16, 0, 16);
-
 		TalosMain talos = new TalosMain();
 
 		new Lwjgl3Application(talos, config);

editor/assets/skin/uiskin.json

@@ -22,14 +22,7 @@
 import com.badlogic.gdx.Preferences;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Graphics;
 import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFontCache;
-import com.badlogic.gdx.graphics.g2d.DistanceFieldFont;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.graphics.glutils.ShaderProgram;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.kotcrab.vis.ui.VisUI;
@@ -141,27 +134,9 @@ public void run () {
 		preferences = Gdx.app.getPreferences("talos-preferences");
 
 		TextureAtlas atlas = new TextureAtlas(Gdx.files.internal("skin/uiskin.atlas"));
-		skin = new Skin();
+		skin = new Skin(Gdx.files.internal("skin/uiskin.json"));
 		skin.addRegions(atlas);
 
-		Texture fontTexture = new Texture(Gdx.files.internal("skin/roboto-dff.png"), true);
-		fontTexture.setFilter(Texture.TextureFilter.MipMapLinearNearest, Texture.TextureFilter.Linear);
-		DistanceFieldFont distanceFieldFont = new DistanceFieldFont(Gdx.files.internal("skin/roboto-dff.fnt"), new TextureRegion(fontTexture)) {
-
-			@Override
-			public BitmapFontCache newFontCache () {
-				return new CustomCache(this, this.usesIntegerPositions());
-			}
-		};
-		distanceFieldFont.setDistanceFieldSmoothing(10);
-		distanceFieldFont.setUseIntegerPositions(true);
-
-		skin.add("default-font", distanceFieldFont, BitmapFont.class);
-		skin.add("small-font", distanceFieldFont, BitmapFont.class);
-
-		skin.load(Gdx.files.internal("skin/uiskin.json"));
-
-
 		VisUI.load(skin);
 
 		uiStage = new UIStage(skin);
@@ -183,40 +158,6 @@ public BitmapFontCache newFontCache () {
 		TalosMain.Instance().ProjectController().newProject(ProjectController.TLS);
 	}
 
-
-	static private class CustomCache extends BitmapFontCache {
-
-		private final ShaderProgram distanceFieldShader;
-
-		public CustomCache (DistanceFieldFont font, boolean integer) {
-			super(font, integer);
-			distanceFieldShader = DistanceFieldFont.createDistanceFieldShader();
-		}
-
-		private float getSmoothingFactor () {
-			final DistanceFieldFont font = (DistanceFieldFont)super.getFont();
-			return font.getDistanceFieldSmoothing() * font.getScaleX();
-		}
-
-		@Override
-		public void draw (Batch spriteBatch) {
-			final ShaderProgram cache = spriteBatch.getShader();
-			spriteBatch.setShader(distanceFieldShader);
-			spriteBatch.getShader().setUniformf("u_smoothing", getSmoothingFactor());
-			super.draw(spriteBatch);
-			spriteBatch.setShader(cache);
-		}
-
-		@Override
-		public void draw (Batch spriteBatch, int start, int end) {
-			final ShaderProgram cache = spriteBatch.getShader();
-			spriteBatch.setShader(distanceFieldShader);
-			spriteBatch.getShader().setUniformf("u_smoothing", getSmoothingFactor());
-			super.draw(spriteBatch, start, end);
-			spriteBatch.setShader(cache);
-		}
-	}
-
 	public void disableNodeStage() {
 		currentWorkplaceStage = null;
 		inputMultiplexer.removeProcessor(nodeStage.getStage());