falsycat/shapes-juke
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[update] Implemented the exception handling for sjplayer's standalone app.

Browse Source
This commit is contained in:
falsycat 2019-10-10 00:00:00 +00:00
parent 111c98bea2
commit d66764e9b4
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sjplayer/src/sjplayer/ScriptRuntimeException.d
View File

@ -1,8 +1,6 @@
/// License: MIT /// License: MIT
module sjplayer.ScriptRuntimeException; module sjplayer.ScriptRuntimeException;
import sjscript;
/// ///
class ScriptRuntimeException : Exception { class ScriptRuntimeException : Exception {
public: public:

5
sjplayer/src/sjplayer/package.d
View File

@ -6,8 +6,11 @@ import gl4d;
import sjscript; import sjscript;
public { public {
import sjscript : ScriptException;
import sjplayer.Context, import sjplayer.Context,
sjplayer.ProgramSet; sjplayer.ProgramSet,
sjplayer.ScriptRuntimeException;
} }
/// ///

24
sjplayer/standalone/main.d
View File

@ -20,15 +20,22 @@ int main(string[] args) {
auto music = sfMusic_createFromFile(music_file.toStringz).enforce; auto music = sfMusic_createFromFile(music_file.toStringz).enforce;
scope(exit) sfMusic_destroy(music); scope(exit) sfMusic_destroy(music);
sfMusic_play(music);
auto programs = new ProgramSet; auto programs = new ProgramSet;
scope(exit) programs.destroy(); scope(exit) programs.destroy();
auto context = script_file.readText. Context context;
CreateContextFromText(vec2i(600, 600), programs); 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(); scope(exit) context.destroy();
sfMusic_play(music);
while (true) { while (true) {
sfEvent e; sfEvent e;
sfWindow_pollEvent(win, &e); sfWindow_pollEvent(win, &e);
@ -39,7 +46,14 @@ int main(string[] args) {
context.actor.Accelarate(GetAccelarationInput()); context.actor.Accelarate(GetAccelarationInput());
context.OperateScheduledControllers(beat); 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.actor.Update();
context.posteffect.Update(); context.posteffect.Update();
@ -48,7 +62,7 @@ int main(string[] args) {
"damage: %f (%f)".writefln(dmg.damage, beat); "damage: %f (%f)".writefln(dmg.damage, beat);
} }
if (dmg.nearness != 0) { if (dmg.nearness != 0) {
"nearness: %f (%f)".writefln(dmg.nearness, beat); "nearby: %f (%f)".writefln(dmg.nearness, beat);
} }
gl.Clear(GL_COLOR_BUFFER_BIT); gl.Clear(GL_COLOR_BUFFER_BIT);