Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ij_java_names_count_to_use_import_on_demand = 999
ij_java_packages_to_use_import_on_demand = unset
ij_java_blank_lines_before_class_end = 0
ij_java_blank_lines_after_class_header = 1
ij_java_doc_align_param_comments = true
ij_java_doc_align_param_comments = false
ij_java_doc_do_not_wrap_if_one_line = true
ij_any_keep_simple_blocks_in_one_line = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,25 @@
import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import me.stringfromjava.flixelgdx.FlixelGame;
import me.stringfromjava.funkin.FunkinGame;
import me.stringfromjava.funkin.init.InitScreen;
import me.stringfromjava.funkin.util.FunkinConstants;

/** Launches the Android application. */
public class AndroidLauncher extends AndroidApplication {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
FunkinGame game = new FunkinGame(
FunkinConstants.WINDOW_TITLE,
FunkinConstants.WINDOW_WIDTH,
FunkinConstants.WINDOW_HEIGHT,
new InitScreen()
);
AndroidApplicationConfiguration configuration = new AndroidApplicationConfiguration();
configuration.useImmersiveMode = true; // Recommended, but not required.
initialize(new FunkinGame(), configuration);
initialize(game, configuration);
}
}
24 changes: 12 additions & 12 deletions assets/another_test.groovy
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import me.stringfromjava.funkin.Funkin
import me.stringfromjava.funkin.backend.Paths
import me.stringfromjava.funkin.graphics.sprite.FunkinSprite
import me.stringfromjava.funkin.polyverse.script.type.Script
import me.stringfromjava.funkin.util.Constants
import me.stringfromjava.flixelgdx.Flixel
import me.stringfromjava.flixelgdx.backend.FlixelPaths
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite
import me.stringfromjava.funkin.util.FunkinConstants
import me.stringfromjava.polyverse.script.type.Script

class AnotherTestClass extends Script {

Expand All @@ -16,30 +16,30 @@ class AnotherTestClass extends Script {
void onCreate() {
super.onCreate()

Funkin.info("AnotherTestClass", "Script has been created!")
Flixel.info("AnotherTestClass", "Script has been created!")

Funkin.playMusic("songs/bopeebo/Inst.ogg")
Flixel.playMusic("songs/bopeebo/Inst.ogg")
}

@Override
void onRender(float delta) {
super.onRender(delta)

if (Gdx.input.isKeyJustPressed(Input.Keys.SPACE)) {
var sprite = new FunkinSprite().loadGraphic(Paths.sharedImageAsset("pauseAlt/bfLol"))
var randomPosX = new Random().nextInt(Constants.Display.WINDOW_WIDTH)
var randomPosY = new Random().nextInt(Constants.Display.WINDOW_HEIGHT)
var sprite = new FlixelSprite().loadGraphic(FlixelPaths.sharedImageAsset("pauseAlt/bfLol"))
var randomPosX = new Random().nextInt(FunkinConstants.WINDOW_WIDTH)
var randomPosY = new Random().nextInt(FunkinConstants.WINDOW_HEIGHT)

sprite.setPosition(randomPosX, randomPosY)

Funkin.screen.add(sprite)
Flixel.screen.add(sprite)
}
}

@Override
void onDispose() {
super.onDispose()

Funkin.info("AnotherTestClass", "Script has been disposed!")
Flixel.info("AnotherTestClass", "Script has been disposed!")
}
}
4 changes: 2 additions & 2 deletions assets/shared/images/characters/Nene.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
Created with Flixel Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
-->
<TextureAtlas imagePath="Nene.png" width="4072" height="2838">
<SubTexture name="ComboCheer0001" x="1144" y="365" width="294" height="433" frameX="-16" frameY="-57" frameWidth="312" frameHeight="496"/>
Expand Down Expand Up @@ -119,4 +119,4 @@ Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
<SubTexture name="Laugh0010" x="2583" y="372" width="377" height="445" frameX="-39" frameY="-0" frameWidth="480" frameHeight="493"/>
<SubTexture name="Laugh0011" x="2963" y="380" width="377" height="446" frameX="-39" frameY="-0" frameWidth="480" frameHeight="493"/>
<SubTexture name="Laugh0012" x="2963" y="380" width="377" height="446" frameX="-39" frameY="-0" frameWidth="480" frameHeight="493"/>
</TextureAtlas>
</TextureAtlas>
4 changes: 2 additions & 2 deletions assets/shared/images/characters/Pico_Death.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
Created with Flixel Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
-->
<TextureAtlas imagePath="Pico_Death.png" width="6371" height="3442">
<SubTexture name="Pico Death Stab0001" x="5584" y="1027" width="518" height="490" frameX="-124" frameY="-87" frameWidth="1061" frameHeight="615"/>
Expand Down Expand Up @@ -67,4 +67,4 @@ Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
<SubTexture name="Pico Death Stab0062" x="3016" y="1" width="626" height="572" frameX="-254" frameY="-41" frameWidth="1061" frameHeight="615"/>
<SubTexture name="Pico Death Stab0063" x="3403" y="576" width="626" height="572" frameX="-254" frameY="-41" frameWidth="1061" frameHeight="615"/>
<SubTexture name="Pico Death Stab0064" x="2101" y="1182" width="670" height="569" frameX="-254" frameY="-44" frameWidth="1061" frameHeight="615"/>
</TextureAtlas>
</TextureAtlas>
25 changes: 12 additions & 13 deletions assets/test.groovy
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.Texture
import me.stringfromjava.funkin.Funkin
import me.stringfromjava.funkin.graphics.screen.FunkinScreen
import me.stringfromjava.funkin.backend.Paths
import me.stringfromjava.funkin.graphics.sprite.FunkinSprite
import me.stringfromjava.funkin.polyverse.script.type.SystemScript
import me.stringfromjava.flixelgdx.Flixel
import me.stringfromjava.flixelgdx.graphics.screen.FlixelScreen
import me.stringfromjava.flixelgdx.backend.FlixelPaths
import me.stringfromjava.flixelgdx.graphics.sprite.FlixelSprite
import me.stringfromjava.polyverse.script.type.SystemScript

class TestScript extends SystemScript {

Expand All @@ -17,39 +16,39 @@ class TestScript extends SystemScript {
@Override
void onCreate() {
super.onCreate()
Funkin.info("TestScript", "Script has been created!")
Flixel.info("TestScript", "Script has been created!")
}

@Override
void onRender(float delta) {
super.onRender(delta)

if (Gdx.input.isKeyJustPressed(Input.Keys.Q)) {
Funkin.setScreen(new TestScreen())
Flixel.setScreen(new TestScreen())
}
}

@Override
void onDispose() {
super.onDispose()
Funkin.info("TestClass", "Script has been disposed!")
Flixel.info("TestClass", "Script has been disposed!")
}
}

class TestScreen extends FunkinScreen {
class TestScreen extends FlixelScreen {

private FunkinSprite test
private FlixelSprite test

@Override
void show() {
super.show()

test = new FunkinSprite().loadGraphic(Paths.sharedImageAsset('NOTE_hold_assets'))
test = new FlixelSprite().loadGraphic(FlixelPaths.sharedImageAsset('NOTE_hold_assets'))
add(test)

bgColor = new Color(0, 1, 0, 1)

Funkin.playMusic('songs/darnell/Inst.ogg')
Flixel.playMusic('songs/darnell/Inst.ogg')
}

@Override
Expand Down
Loading