diff --git a/core/src/cz/nic/tablexia/loader/IApplicationLoader.java b/core/src/cz/nic/tablexia/loader/IApplicationLoader.java index bdb2faa1f27253e02c6e1c04611652e5364cc89a..796809a9390d7256f1288eb8577382c545d28168 100644 --- a/core/src/cz/nic/tablexia/loader/IApplicationLoader.java +++ b/core/src/cz/nic/tablexia/loader/IApplicationLoader.java @@ -2,6 +2,7 @@ package cz.nic.tablexia.loader; public interface IApplicationLoader { - public boolean update(); + boolean update(); + void dispose(); } diff --git a/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java b/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java index 736bd104591c46bbbc200c05fba923e4a1807a94..d2da0ad474e536ae298c50626a307d76075f147e 100644 --- a/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java +++ b/core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java @@ -1,7 +1,6 @@ package cz.nic.tablexia.loader.application; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.g2d.DistanceFieldFont; import com.badlogic.gdx.graphics.glutils.ShaderProgram; @@ -13,7 +12,8 @@ import cz.nic.tablexia.loader.IApplicationLoader; * @author Matyáš Latner * */ -public class ApplicationFontManager extends AssetManager implements IApplicationLoader { +public class ApplicationFontManager implements IApplicationLoader { + public enum FontType_NEW { REGULAR_10 (10, false), REGULAR_12 (12, false), @@ -97,12 +97,6 @@ public class ApplicationFontManager extends AssetManager implements IApplication } return instance; } - - @Override - public synchronized void dispose() { - super.dispose(); - instance = null; - } public ShaderProgram getDistanceFieldShader() { return distanceFieldShader; @@ -127,4 +121,17 @@ public class ApplicationFontManager extends AssetManager implements IApplication // pedantic flag indicating whether attributes & uniforms must be present at all times // distanceFieldShader.pedantic = false; } + + +//////////////////////////// IApplicationLoader + + @Override + public boolean update() { + return true; + } + + @Override + public synchronized void dispose() { + instance = null; + } } \ No newline at end of file