Skip to content
Snippets Groups Projects
Commit 9441eb20 authored by Matyáš Latner's avatar Matyáš Latner
Browse files

#274 Removed AssetManager from ApplicationFontManager class

parent bfe83a66
Branches
Tags
No related merge requests found
...@@ -2,6 +2,7 @@ package cz.nic.tablexia.loader; ...@@ -2,6 +2,7 @@ package cz.nic.tablexia.loader;
public interface IApplicationLoader { public interface IApplicationLoader {
public boolean update(); boolean update();
void dispose();
} }
package cz.nic.tablexia.loader.application; package cz.nic.tablexia.loader.application;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.g2d.DistanceFieldFont; import com.badlogic.gdx.graphics.g2d.DistanceFieldFont;
import com.badlogic.gdx.graphics.glutils.ShaderProgram; import com.badlogic.gdx.graphics.glutils.ShaderProgram;
...@@ -13,7 +12,8 @@ import cz.nic.tablexia.loader.IApplicationLoader; ...@@ -13,7 +12,8 @@ import cz.nic.tablexia.loader.IApplicationLoader;
* @author Matyáš Latner * @author Matyáš Latner
* *
*/ */
public class ApplicationFontManager extends AssetManager implements IApplicationLoader { public class ApplicationFontManager implements IApplicationLoader {
public enum FontType_NEW { public enum FontType_NEW {
REGULAR_10 (10, false), REGULAR_10 (10, false),
REGULAR_12 (12, false), REGULAR_12 (12, false),
...@@ -97,12 +97,6 @@ public class ApplicationFontManager extends AssetManager implements IApplication ...@@ -97,12 +97,6 @@ public class ApplicationFontManager extends AssetManager implements IApplication
} }
return instance; return instance;
} }
@Override
public synchronized void dispose() {
super.dispose();
instance = null;
}
public ShaderProgram getDistanceFieldShader() { public ShaderProgram getDistanceFieldShader() {
return distanceFieldShader; return distanceFieldShader;
...@@ -127,4 +121,17 @@ public class ApplicationFontManager extends AssetManager implements IApplication ...@@ -127,4 +121,17 @@ public class ApplicationFontManager extends AssetManager implements IApplication
// pedantic flag indicating whether attributes & uniforms must be present at all times // pedantic flag indicating whether attributes & uniforms must be present at all times
// distanceFieldShader.pedantic = false; // distanceFieldShader.pedantic = false;
} }
//////////////////////////// IApplicationLoader
@Override
public boolean update() {
return true;
}
@Override
public synchronized void dispose() {
instance = null;
}
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment