external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

update port

Browse Source
This commit is contained in:
Anthony Calosa
2022-02-06 21:18:04 +08:00
parent 9b6a51f642
commit 08fa608237
5 changed files with 132 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-mobile/pom.xml
View File

@@ -55,6 +55,12 @@
<artifactId>gdx-freetype</artifactId>
<version>1.10.0</version>
</dependency>
<dependency>
<groupId>com.github.raeleus.TenPatch</groupId>
<artifactId>tenpatch</artifactId>
<version>5.2.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

124
forge-gui-mobile/src/forge/Forge.java
View File

@@ -5,8 +5,17 @@ import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
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.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Clipboard;
import forge.adventure.AdventureApplicationAdapter;
import com.badlogic.gdx.utils.ScreenUtils;
import forge.adventure.scene.ForgeScene;
import forge.adventure.scene.Scene;
import forge.adventure.scene.SceneType;
import forge.adventure.util.Config;
import forge.animation.ForgeAnimation;
import forge.assets.AssetsDownloader;
import forge.assets.FSkin;
@@ -41,6 +50,13 @@ public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.6.47.001";
private static ApplicationListener app = null;
static Scene currentScene = null;
static Array<Scene> lastScene = new Array<>();
private float animationTimeout;
static Batch animationBatch;
static Texture transitionTexture;
static TextureRegion lastScreenTexture;
private static boolean sceneWasSwapped =false;
private static Clipboard clipboard;
private static IDeviceAdapter deviceAdapter;
private static int screenWidth;
@@ -262,9 +278,20 @@ public class Forge implements ApplicationListener {
}
}
public static void openAdventure() {
startContinuousRendering();
FSkin.loadLight("default", null, Config.instance().getFile("skin"));
FSkin.loadFull(splashScreen);
splashScreen = null;
isAdventureMode = true;
//how to insert adventure startup / adapter here??
try {
for (SceneType sceneType : SceneType.values()) {
sceneType.instance.resLoaded();
}
switchScene(SceneType.StartScene.instance);
animationBatch=new SpriteBatch();
transitionTexture =new Texture(Config.instance().getFile("ui/transition.png"));
} catch (Exception e) { e.printStackTrace(); }
}
protected void afterDbLoaded() {
@@ -537,7 +564,61 @@ public class Forge implements ApplicationListener {
FContainer screen = currentScreen;
if (screen == null) {
screen = splashScreen;
if (screen == null) {
if (screen == null) {
if (isAdventureMode) {
float delta=Gdx.graphics.getDeltaTime();
float transitionTime = 0.2f;
if(sceneWasSwapped)
{
sceneWasSwapped =false;
animationTimeout= transitionTime;
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
return;
}
if(animationTimeout>=0)
{
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
animationBatch.begin();
animationTimeout-=delta;
animationBatch.setColor(1,1,1,1);
animationBatch.draw(lastScreenTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.setColor(1,1,1,1-(1/ transitionTime)*animationTimeout);
animationBatch.draw(transitionTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.draw(transitionTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.end();
if(animationTimeout<0)
{
currentScene.render();
storeScreen();
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
}
else
{
return;
}
}
if(animationTimeout>=-transitionTime)
{
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
animationBatch.begin();
animationTimeout-=delta;
animationBatch.setColor(1,1,1,1);
animationBatch.draw(lastScreenTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.setColor(1,1,1,(1/ transitionTime)*(animationTimeout+ transitionTime));
animationBatch.draw(transitionTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.draw(transitionTexture,0,0, Gdx.graphics.getWidth(),Gdx.graphics.getHeight());
animationBatch.end();
return;
}
currentScene.render();
currentScene.act(delta);
}
if (showFPS)
frameRate.render();
return;
}
}
@@ -626,6 +707,43 @@ public class Forge implements ApplicationListener {
catch (Exception e) {}
}
public static boolean switchScene(Scene newScene) {
if (currentScene != null) {
if (!currentScene.leave())
return false;
lastScene.add(currentScene);
}
storeScreen();
sceneWasSwapped =true;
currentScene = newScene;
currentScene.enter();
return true;
}
protected static void storeScreen() {
if(!(currentScene instanceof ForgeScene))
{
if(lastScreenTexture!=null)
lastScreenTexture.getTexture().dispose();
lastScreenTexture = ScreenUtils.getFrameBufferTexture();
}
}
public Scene switchToLast() {
if(lastScene.size!=0)
{
storeScreen();
currentScene = lastScene.get(lastScene.size-1);
currentScene.enter();
sceneWasSwapped =true;
lastScene.removeIndex(lastScene.size-1);
return currentScene;
}
return null;
}
//log message to Forge.log file
public static void log(Object message) {
System.out.println(message);

39
forge-gui-mobile/src/forge/adventure/AdventureApplicationAdapter.java
View File

@@ -69,31 +69,6 @@ public class AdventureApplicationAdapter extends Forge {
super.resize(w, h);
}
public boolean switchScene(Scene newScene) {
if (currentScene != null) {
if (!currentScene.leave())
return false;
lastScene.add(currentScene);
}
storeScreen();
sceneWasSwapped =true;
currentScene = newScene;
currentScene.enter();
return true;
}
private void storeScreen() {
if(!(currentScene instanceof ForgeScene))
{
if(lastScreenTexture!=null)
lastScreenTexture.getTexture().dispose();
lastScreenTexture = ScreenUtils.getFrameBufferTexture();
}
}
public void resLoaded() {
for (forge.adventure.scene.SceneType entry : SceneType.values()) {
entry.instance.resLoaded();
@@ -185,18 +160,4 @@ public class AdventureApplicationAdapter extends Forge {
return lastScene.size==0?null: lastScene.get(lastScene.size-1);
}
public Scene switchToLast() {
if(lastScene.size!=0)
{
storeScreen();
currentScene = lastScene.get(lastScene.size-1);
currentScene.enter();
sceneWasSwapped =true;
lastScene.removeIndex(lastScene.size-1);
return currentScene;
}
return null;
}
}

3
forge-gui-mobile/src/forge/adventure/scene/ForgeScene.java
View File

@@ -88,7 +88,8 @@ public abstract class ForgeScene extends Scene implements IUpdateable {
@Override
public void resLoaded() {
localGraphics = AdventureApplicationAdapter.instance.getGraphics();
if (!Forge.isAdventureMode)
localGraphics = AdventureApplicationAdapter.instance.getGraphics();
}

3
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -96,7 +96,10 @@ public class SplashScreen extends FContainer {
w = getHeight() / backgroundRatio;
x = (getWidth() - w) / 2;
}
float oldalpha = g.getfloatAlphaComposite();
g.setAlphaComposite(0.5f);
g.drawImage(background, x, y, w, h);
g.setAlphaComposite(oldalpha);
y += h * 295f / 450f;
float padding = 20f / 450f * w;
float height = 57f / 450f * h;