From 13782e31761cfe345ab46237cb047be5f25d4e33 Mon Sep 17 00:00:00 2001 From: falsycat Date: Sat, 19 Oct 2019 00:00:00 +0000 Subject: [PATCH] [remove] Removed standalone subproject from sjplayer. --- sjplayer/standalone/dub.json | 14 ---- sjplayer/standalone/main.d | 122 ----------------------------------- 2 files changed, 136 deletions(-) delete mode 100644 sjplayer/standalone/dub.json delete mode 100644 sjplayer/standalone/main.d diff --git a/sjplayer/standalone/dub.json b/sjplayer/standalone/dub.json deleted file mode 100644 index 038568b..0000000 --- a/sjplayer/standalone/dub.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "standalone", - - "sourcePaths": ["."], - "mainSourceFile": "main.d", - - "targetPath": ".bin", - - "dependencies": { - "sjplayer": {"path": "../"}, - "gl4d": {"path": "../../thirdparty/gl4d"}, - "derelict-sfml2": "~>4.0.0-beta.2" - } -} diff --git a/sjplayer/standalone/main.d b/sjplayer/standalone/main.d deleted file mode 100644 index 96056de..0000000 --- a/sjplayer/standalone/main.d +++ /dev/null @@ -1,122 +0,0 @@ -/// License: MIT -import std; - -import derelict.sfml2.audio, - derelict.sfml2.system, - derelict.sfml2.window; - -import gl4d; - -import sjplayer; - -int main(string[] args) { - (args.length == 4).enforce; - const music_file = args[1]; - const bpm = args[2].to!float; - const script_file = args[3]; - - auto win = Initialize(); - scope(exit) sfWindow_destroy(win); - - auto music = sfMusic_createFromFile(music_file.toStringz).enforce; - scope(exit) sfMusic_destroy(music); - - auto programs = new ProgramSet; - scope(exit) programs.destroy(); - - Context context; - try { - context = script_file.readText. - CreateContextFromText(vec2i(600, 600), programs); - } catch (ScriptException e) { - "[parsing exception] %s at (%d,%d)". - writefln(e.msg, e.pos.stline+1, e.pos.stchar+1); - return 1; - } - scope(exit) context.destroy(); - - sfMusic_play(music); - while (true) { - sfEvent e; - sfWindow_pollEvent(win, &e); - if (e.type == sfEvtClosed) break; - - const msecs = sfMusic_getPlayingOffset(music).microseconds * 1e-6f; - const beat = msecs/60f * bpm; - - context.actor.Accelarate(GetAccelarationInput()); - - try { - context.OperateScheduledControllers(beat); - } catch (ScriptRuntimeException e) { - "[runtime exception] %s at (%d,%d)". - writefln(e.msg, e.srcline+1, e.srcchar+1); - return 1; - } - - context.actor.Update(); - context.posteffect.Update(); - - const dmg = context.CalculateDamage(); - if (dmg.damage != 0) { - "damage: %f (%f)".writefln(dmg.damage, beat); - context.posteffect.CauseDamagedEffect(); - } - if (dmg.nearness != 0) { - "nearby: %f (%f)".writefln(dmg.nearness, beat); - } - - gl.Clear(GL_COLOR_BUFFER_BIT); - context.StartDrawing(); - - context.DrawBackground(); - context.DrawElements(); - context.DrawActor(); - - context.EndDrawing(); - sfWindow_display(win); - } - return 0; -} - -vec2 GetAccelarationInput() { - auto result = vec2(0, 0); - if (sfKeyboard_isKeyPressed(sfKeyLeft)) { - result.x -= 1; - } - if (sfKeyboard_isKeyPressed(sfKeyRight)) { - result.x += 1; - } - if (sfKeyboard_isKeyPressed(sfKeyUp)) { - result.y += 1; - } - if (sfKeyboard_isKeyPressed(sfKeyDown)) { - result.y -= 1; - } - return result; -} - -sfWindow* Initialize() { - DerelictSFML2System.load(); - DerelictSFML2Window.load(); - DerelictSFML2Audio .load(); - - sfContextSettings specs; - specs.depthBits = 24; - specs.stencilBits = 8; - specs.antialiasingLevel = 1; - specs.majorVersion = 3; - specs.minorVersion = 3; - specs.attributeFlags = sfContextCore; - - auto win = sfWindow_create(sfVideoMode(600, 600), - "sjplayer".toStringz, sfClose | sfTitlebar, &specs).enforce; - sfWindow_setVerticalSyncEnabled(win, true); - - sfWindow_setActive(win, true).enforce; - - gl.ApplyContext(); - gl.Enable(GL_BLEND); - gl.BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - return win; -}