Commit: efe8ac8299dd8bb67b64b27eed2a57a4e31d0c86 - SpaceRocket (hg)

Commit MetaInfo

• Revision: efe8ac8299dd8bb67b64b27eed2a57a4e31d0c86 (tree)
• Zeit: 2022-01-10 06:21:20
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Added new font ttfs.

Ändern Zusammenfassung

• modified: android/assets/uiskin.json
• modified: build.gradle
• modified: core/src/com/headwayent/spacerocket/CreditsActivity.java
• modified: core/src/com/headwayent/spacerocket/HelpActivity.java
• modified: core/src/com/headwayent/spacerocket/HighScoreActivity.java
• modified: core/src/com/headwayent/spacerocket/MainMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/SpaceRocket.java
• modified: core/src/com/headwayent/spacerocket/old/DifficultySelection.java
• add: android/assets/Republica Minor Bold Italic.ttf
• add: android/assets/Republica Minor Regular.ttf
• add: android/assets/arial.ttf

Diff

diff -r f67716a9e6c2 -r efe8ac8299dd android/assets/Republica Minor Bold Italic.ttf
Binary file android/assets/Republica Minor Bold Italic.ttf has changed

diff -r f67716a9e6c2 -r efe8ac8299dd android/assets/Republica Minor Regular.ttf
Binary file android/assets/Republica Minor Regular.ttf has changed

diff -r f67716a9e6c2 -r efe8ac8299dd android/assets/arial.ttf
Binary file android/assets/arial.ttf has changed

diff -r f67716a9e6c2 -r efe8ac8299dd android/assets/uiskin.json
--- a/android/assets/uiskin.json	Sun Jan 09 21:46:47 2022 +0200
+++ b/android/assets/uiskin.json	Sun Jan 09 23:21:20 2022 +0200
@@ -1,5 +1,5 @@
 {
-BitmapFont: { default-font: { file: default.fnt } },
+
 Color: {
 	green: { a: 1, b: 0, g: 1, r: 0 },
 	white: { a: 1, b: 1, g: 1, r: 1 },

diff -r f67716a9e6c2 -r efe8ac8299dd build.gradle
--- a/build.gradle	Sun Jan 09 21:46:47 2022 +0200
+++ b/build.gradle	Sun Jan 09 23:21:20 2022 +0200
@@ -12,7 +12,7 @@
         classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.12'
         classpath "com.badlogicgames.gdx:gdx-tools:1.10.0"
-
+        classpath "com.badlogicgames.gdx:gdx-freetype:1.10.0"
     }
 }
 
@@ -49,7 +49,7 @@
         api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
-        
+        api "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
     }
 }
 
@@ -70,6 +70,11 @@
         natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a"
         natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86"
         natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64"
+        api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+        natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
         
     }
 }
@@ -86,7 +91,7 @@
         api "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
         api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios"
-        
+        api "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
     }
 }
 
@@ -97,7 +102,7 @@
     dependencies {
         api "com.badlogicgames.gdx:gdx:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
-        
+        api "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
     }
 }
 

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/CreditsActivity.java
--- a/core/src/com/headwayent/spacerocket/CreditsActivity.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/CreditsActivity.java	Sun Jan 09 23:21:20 2022 +0200
@@ -34,7 +34,7 @@
 
 		Gdx.input.setInputProcessor(stage);
 
-		Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+		Skin skin = SpaceRocket.getGame().getSkin();
 
 		titleLabel = new Label("Options", skin);
 		creditsLabel = new Label("Sound enabled", skin);

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/HelpActivity.java
--- a/core/src/com/headwayent/spacerocket/HelpActivity.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/HelpActivity.java	Sun Jan 09 23:21:20 2022 +0200
@@ -37,7 +37,7 @@
 		Gdx.input.setInputProcessor(stage);
 
 		// temporary until we have asset manager in
-		Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+		Skin skin = SpaceRocket.getGame().getSkin();
 
 		String helpString = "CONTROLS \n\n For movement use direction keys or the\n" +
 				"arrows on the screen or the accelerometer.\n" +

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/HighScoreActivity.java
--- a/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Jan 09 23:21:20 2022 +0200
@@ -87,7 +87,7 @@
 		//table.setDebug(true);
 		stage.addActor(table);
 
-		Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+		Skin skin = SpaceRocket.getGame().getSkin();
 
 		Label titleLabel = new Label("High Score", skin);
 

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/MainMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 09 23:21:20 2022 +0200
@@ -36,7 +36,7 @@
         Gdx.input.setInputProcessor(stage);
 
         // temporary until we have asset manager in
-        Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+        Skin skin = SpaceRocket.getGame().getSkin();
 
         //create buttons
         Label title = new Label("Hotshot", skin);

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Sun Jan 09 23:21:20 2022 +0200
@@ -42,7 +42,7 @@
 
 		Gdx.input.setInputProcessor(stage);
 
-		Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+		Skin skin = SpaceRocket.getGame().getSkin();
 
 		titleLabel = new Label("Options", skin);
 		soundLabel = new Label("Sound enabled", skin);
@@ -97,16 +97,16 @@
 		});
 
 		table.add(titleLabel).colspan(2);
-		table.row().pad(10, 10, 10, 10);
+		table.row().pad(10, 0, 10, 0);
 		table.add(soundLabel).left();
 		table.add(soundCheckbox);
-		table.row().pad(10, 10, 10, 10);
+		table.row().pad(10, 0, 10, 0);
 		table.add(vibrationLabel).left();
 		table.add(vibrationCheckbox);
-		table.row().pad(10, 10, 10, 10);
+		table.row().pad(10, 0, 10, 0);
 		table.add(shipMovementLabel).left();
 		table.add(shipMovementSelectBox);
-		table.row().pad(10, 10, 10, 10);
+		table.row().pad(10, 0, 10, 0);
 		table.add(backButton).colspan(2).fillX().uniformX();
 
 

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/SpaceRocket.java
--- a/core/src/com/headwayent/spacerocket/SpaceRocket.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/SpaceRocket.java	Sun Jan 09 23:21:20 2022 +0200
@@ -2,12 +2,18 @@
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.SkinLoader;
 import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.ScreenUtils;
 import com.headwayent.spacerocket.old.BossSprite;
 import com.headwayent.spacerocket.old.DifficultySelection;
@@ -40,6 +46,8 @@
 	private MultiplayerJoinGameActivity multiplayerJoinGameActivity;
 	private MultiplayerLobbyActivity multiplayerLobbyActivity;
 	private FinalResultsActivity finalResultsActivity;
+	private Skin skin;
+	private AssetManager assetManager;
 
 	public enum Mode {
 		CLIENT, SERVER
@@ -73,7 +81,33 @@
 			TextureRegion t = tr.get(i);
 			t.flip(false, true);
 		}
-		font = new BitmapFont(true);
+		FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("Republica Minor Regular.ttf"));
+		FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
+		parameter.size = 13;
+		parameter.borderWidth = 1;
+		parameter.color = Color.GREEN;
+//		parameter.shadowOffsetX = 3;
+//		parameter.shadowOffsetY = 3;
+//		parameter.shadowColor = new Color(0, 0.5f, 0, 0.75f);
+//		parameter.flip = true;
+		font = generator.generateFont(parameter); // For the menu ttf.
+//		ObjectMap<String, Object> fontMap = new ObjectMap<>();
+//		fontMap.put("default-font", font);
+//
+//		SkinLoader.SkinParameter skinParameter = new SkinLoader.SkinParameter(fontMap);
+//		assetManager = new AssetManager();
+//		assetManager.load("uiskin.json", Skin.class, skinParameter);
+//		assetManager.finishLoading();
+//		skin = assetManager.get("uiskin.json", Skin.class);
+		skin = new Skin();
+		skin.addRegions(new TextureAtlas(Gdx.files.internal("uiskin.atlas")));
+//		skin.remove("default-font", BitmapFont.class);
+		skin.add("default-font", font, BitmapFont.class);
+		skin.load(Gdx.files.internal("uiskin.json"));
+//		font = new BitmapFont(true);
+		parameter.flip = true;
+		font = generator.generateFont(parameter); // For the in game flipped ttf.
+		generator.dispose();
 		canvas = new ExtendedCanvas();
 		setScreen(new MainMenuActivity(this));
 	}
@@ -317,6 +351,14 @@
 		return canvas;
 	}
 
+	public Skin getSkin() {
+		return skin;
+	}
+
+	public AssetManager getAssetManager() {
+		return assetManager;
+	}
+
 	public VersionStats getVersionStats() {
 		return versionStats;
 	}

diff -r f67716a9e6c2 -r efe8ac8299dd core/src/com/headwayent/spacerocket/old/DifficultySelection.java
--- a/core/src/com/headwayent/spacerocket/old/DifficultySelection.java	Sun Jan 09 21:46:47 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/DifficultySelection.java	Sun Jan 09 23:21:20 2022 +0200
@@ -64,7 +64,7 @@
         Gdx.input.setInputProcessor(stage);
 
         // temporary until we have asset manager in
-        Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
+        Skin skin = SpaceRocket.getGame().getSkin();
 
         Label title = new Label("Select difficulty", skin);
         title.setAlignment(Align.center);