Fix up repo, fix Graphics.cpp, add emscripten_sleep to audio files
This commit is contained in:
Varun Patil
parent
9ba124d991
commit
b319254939
8 changed files with 31 additions and 516 deletions
|
|
@ -1,407 +0,0 @@
|
|||
/*
|
||||
** binding-mruby.cpp
|
||||
**
|
||||
** This file is part of mkxp.
|
||||
**
|
||||
** Copyright (C) 2013 Jonas Kulla <Nyocurio@gmail.com>
|
||||
**
|
||||
** mkxp is free software: you can redistribute it and/or modify
|
||||
** it under the terms of the GNU General Public License as published by
|
||||
** the Free Software Foundation, either version 2 of the License, or
|
||||
** (at your option) any later version.
|
||||
**
|
||||
** mkxp is distributed in the hope that it will be useful,
|
||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
** GNU General Public License for more details.
|
||||
**
|
||||
** You should have received a copy of the GNU General Public License
|
||||
** along with mkxp. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "binding.h"
|
||||
|
||||
#include <mruby.h>
|
||||
#include <mruby/string.h>
|
||||
#include <mruby/array.h>
|
||||
#include <mruby/class.h>
|
||||
#include <mruby/irep.h>
|
||||
#include <mruby/compile.h>
|
||||
#include <mruby/proc.h>
|
||||
#include <mruby/dump.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <zlib.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <SDL_messagebox.h>
|
||||
#include <SDL_rwops.h>
|
||||
#include <SDL_timer.h>
|
||||
|
||||
#include "sharedstate.h"
|
||||
#include "texpool.h"
|
||||
#include "eventthread.h"
|
||||
#include "filesystem.h"
|
||||
#include "exception.h"
|
||||
|
||||
#include "binding-util.h"
|
||||
#include "binding-types.h"
|
||||
#include "mrb-ext/marshal.h"
|
||||
|
||||
static void mrbBindingExecute();
|
||||
static void mrbBindingTerminate();
|
||||
static void mrbBindingReset();
|
||||
|
||||
ScriptBinding scriptBindingImpl =
|
||||
{
|
||||
mrbBindingExecute,
|
||||
mrbBindingTerminate,
|
||||
mrbBindingReset
|
||||
};
|
||||
|
||||
ScriptBinding *scriptBinding = &scriptBindingImpl;
|
||||
|
||||
|
||||
void fileBindingInit(mrb_state *);
|
||||
void timeBindingInit(mrb_state *);
|
||||
void marshalBindingInit(mrb_state *);
|
||||
void kernelBindingInit(mrb_state *);
|
||||
|
||||
void tableBindingInit(mrb_state *);
|
||||
void etcBindingInit(mrb_state *);
|
||||
void fontBindingInit(mrb_state *);
|
||||
void bitmapBindingInit(mrb_state *);
|
||||
void spriteBindingInit(mrb_state *);
|
||||
void planeBindingInit(mrb_state *);
|
||||
void viewportBindingInit(mrb_state *);
|
||||
void windowBindingInit(mrb_state *);
|
||||
void tilemapBindingInit(mrb_state *);
|
||||
|
||||
void inputBindingInit(mrb_state *);
|
||||
void audioBindingInit(mrb_state *);
|
||||
void graphicsBindingInit(mrb_state *);
|
||||
|
||||
/* From module_rpg.c */
|
||||
extern const uint8_t mrbModuleRPG[];
|
||||
|
||||
static void mrbBindingInit(mrb_state *mrb)
|
||||
{
|
||||
int arena = mrb_gc_arena_save(mrb);
|
||||
|
||||
/* Init standard classes */
|
||||
fileBindingInit(mrb);
|
||||
timeBindingInit(mrb);
|
||||
marshalBindingInit(mrb);
|
||||
kernelBindingInit(mrb);
|
||||
|
||||
/* Init RGSS classes */
|
||||
tableBindingInit(mrb);
|
||||
etcBindingInit(mrb);
|
||||
fontBindingInit(mrb);
|
||||
bitmapBindingInit(mrb);
|
||||
spriteBindingInit(mrb);
|
||||
planeBindingInit(mrb);
|
||||
viewportBindingInit(mrb);
|
||||
windowBindingInit(mrb);
|
||||
tilemapBindingInit(mrb);
|
||||
|
||||
/* Init RGSS modules */
|
||||
inputBindingInit(mrb);
|
||||
audioBindingInit(mrb);
|
||||
graphicsBindingInit(mrb);
|
||||
|
||||
/* Load RPG module */
|
||||
mrb_load_irep(mrb, mrbModuleRPG);
|
||||
|
||||
mrb_define_global_const(mrb, "MKXP", mrb_true_value());
|
||||
|
||||
mrb_gc_arena_restore(mrb, arena);
|
||||
}
|
||||
|
||||
static mrb_value
|
||||
mkxpTimeOp(mrb_state *mrb, mrb_value)
|
||||
{
|
||||
mrb_int iterations = 1;
|
||||
const char *opName = "";
|
||||
mrb_value block;
|
||||
|
||||
mrb_get_args(mrb, "|iz&", &iterations, &opName, &block);
|
||||
|
||||
Uint64 start = SDL_GetPerformanceCounter();
|
||||
|
||||
for (int i = 0; i < iterations; ++i)
|
||||
mrb_yield(mrb, block, mrb_nil_value());
|
||||
|
||||
Uint64 diff = SDL_GetPerformanceCounter() - start;
|
||||
double avg = (double) diff / iterations;
|
||||
|
||||
double sec = avg / SDL_GetPerformanceFrequency();
|
||||
float ms = sec * 1000;
|
||||
|
||||
printf("<%s> [%f ms]\n", opName, ms);
|
||||
fflush(stdout);
|
||||
|
||||
return mrb_float_value(mrb, ms);
|
||||
}
|
||||
|
||||
static const char *
|
||||
mrbValueString(mrb_value value)
|
||||
{
|
||||
return mrb_string_p(value) ? RSTRING_PTR(value) : 0;
|
||||
}
|
||||
|
||||
static void
|
||||
showExcMessageBox(mrb_state *mrb, mrb_value exc)
|
||||
{
|
||||
/* Display actual exception in a message box */
|
||||
mrb_value mesg = mrb_funcall(mrb, exc, "message", 0);
|
||||
mrb_value line = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "line"));
|
||||
mrb_value file = mrb_attr_get(mrb, exc, mrb_intern_lit(mrb, "file"));
|
||||
const char *excClass = mrb_class_name(mrb, mrb_class(mrb, exc));
|
||||
|
||||
char msgBoxText[512];
|
||||
snprintf(msgBoxText, sizeof(msgBoxText), "Script '%s' line %d: %s occured.\n\n%s",
|
||||
mrbValueString(file), mrb_fixnum(line), excClass, mrbValueString(mesg));
|
||||
|
||||
shState->eThread().showMessageBox(msgBoxText, SDL_MESSAGEBOX_ERROR);
|
||||
}
|
||||
|
||||
static void
|
||||
checkException(mrb_state *mrb)
|
||||
{
|
||||
if (!mrb->exc)
|
||||
return;
|
||||
|
||||
mrb_value exc = mrb_obj_value(mrb->exc);
|
||||
MrbData &mrbData = *getMrbData(mrb);
|
||||
|
||||
/* Check if an actual exception occured, or just a shutdown was called */
|
||||
if (mrb_obj_class(mrb, exc) != mrbData.exc[Shutdown])
|
||||
showExcMessageBox(mrb, exc);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
showError(const std::string &msg)
|
||||
{
|
||||
shState->eThread().showMessageBox(msg.c_str());
|
||||
}
|
||||
|
||||
static void
|
||||
runCustomScript(mrb_state *mrb, mrbc_context *ctx, const char *filename)
|
||||
{
|
||||
/* Execute custom script */
|
||||
FILE *f = fopen(filename, "rb");
|
||||
|
||||
if (!f)
|
||||
{
|
||||
static char buffer[256];
|
||||
snprintf(buffer, sizeof(buffer), "Unable to open script '%s'", filename);
|
||||
showError(buffer);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
ctx->filename = strdup(filename);
|
||||
ctx->lineno = 1;
|
||||
|
||||
/* Run code */
|
||||
mrb_load_file_cxt(mrb, f, ctx);
|
||||
|
||||
free(ctx->filename);
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
static void
|
||||
runMrbFile(mrb_state *mrb, const char *filename)
|
||||
{
|
||||
/* Execute compiled script */
|
||||
FILE *f = fopen(filename, "rb");
|
||||
|
||||
if (!f)
|
||||
{
|
||||
static char buffer[256];
|
||||
snprintf(buffer, sizeof(buffer), "Unable to open compiled script '%s'", filename);
|
||||
showError(buffer);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
mrb_irep *irep = mrb_read_irep_file(mrb, f);
|
||||
|
||||
if (!irep)
|
||||
{
|
||||
static char buffer[256];
|
||||
snprintf(buffer, sizeof(buffer), "Unable to read compiled script '%s'", filename);
|
||||
showError(buffer);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
RProc *proc = mrb_proc_new(mrb, irep);
|
||||
mrb_run(mrb, proc, mrb_top_self(mrb));
|
||||
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
static void
|
||||
runRMXPScripts(mrb_state *mrb, mrbc_context *ctx)
|
||||
{
|
||||
const std::string &scriptPack = shState->rtData().config.game.scripts;
|
||||
|
||||
if (scriptPack.empty())
|
||||
{
|
||||
showError("No game scripts specified (missing Game.ini?)");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!shState->fileSystem().exists(scriptPack.c_str()))
|
||||
{
|
||||
showError(std::string("Unable to open '") + scriptPack + "'");
|
||||
return;
|
||||
}
|
||||
|
||||
/* We use a secondary util state to unmarshal the scripts */
|
||||
mrb_state *scriptMrb = mrb_open();
|
||||
SDL_RWops ops;
|
||||
|
||||
shState->fileSystem().openReadRaw(ops, scriptPack.c_str());
|
||||
|
||||
mrb_value scriptArray = mrb_nil_value();
|
||||
std::string readError;
|
||||
|
||||
try
|
||||
{
|
||||
scriptArray = marshalLoadInt(scriptMrb, &ops);
|
||||
}
|
||||
catch (const Exception &e)
|
||||
{
|
||||
readError = std::string(": ") + e.msg;
|
||||
}
|
||||
|
||||
SDL_RWclose(&ops);
|
||||
|
||||
if (!mrb_array_p(scriptArray))
|
||||
{
|
||||
showError(std::string("Failed to read script data") + readError);
|
||||
mrb_close(scriptMrb);
|
||||
return;
|
||||
}
|
||||
|
||||
int scriptCount = mrb_ary_len(scriptMrb, scriptArray);
|
||||
|
||||
std::string decodeBuffer;
|
||||
decodeBuffer.resize(0x1000);
|
||||
|
||||
for (int i = 0; i < scriptCount; ++i)
|
||||
{
|
||||
mrb_value script = mrb_ary_entry(scriptArray, i);
|
||||
|
||||
mrb_value scriptChksum = mrb_ary_entry(script, 0);
|
||||
mrb_value scriptName = mrb_ary_entry(script, 1);
|
||||
mrb_value scriptString = mrb_ary_entry(script, 2);
|
||||
|
||||
(void) scriptChksum;
|
||||
|
||||
int result = Z_OK;
|
||||
unsigned long bufferLen;
|
||||
|
||||
while (true)
|
||||
{
|
||||
unsigned char *bufferPtr =
|
||||
reinterpret_cast<unsigned char*>(const_cast<char*>(decodeBuffer.c_str()));
|
||||
unsigned char *sourcePtr =
|
||||
reinterpret_cast<unsigned char*>(RSTRING_PTR(scriptString));
|
||||
|
||||
bufferLen = decodeBuffer.length();
|
||||
|
||||
result = uncompress(bufferPtr, &bufferLen,
|
||||
sourcePtr, RSTRING_LEN(scriptString));
|
||||
|
||||
bufferPtr[bufferLen] = '\0';
|
||||
|
||||
if (result != Z_BUF_ERROR)
|
||||
break;
|
||||
|
||||
decodeBuffer.resize(decodeBuffer.size()*2);
|
||||
}
|
||||
|
||||
if (result != Z_OK)
|
||||
{
|
||||
static char buffer[256];
|
||||
snprintf(buffer, sizeof(buffer), "Error decoding script %d: '%s'",
|
||||
i, RSTRING_PTR(scriptName));
|
||||
|
||||
showError(buffer);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
ctx->filename = RSTRING_PTR(scriptName);
|
||||
ctx->lineno = 1;
|
||||
|
||||
int ai = mrb_gc_arena_save(mrb);
|
||||
|
||||
/* Execute code */
|
||||
mrb_load_nstring_cxt(mrb, decodeBuffer.c_str(), bufferLen, ctx);
|
||||
|
||||
mrb_gc_arena_restore(mrb, ai);
|
||||
|
||||
if (mrb->exc)
|
||||
break;
|
||||
}
|
||||
|
||||
mrb_close(scriptMrb);
|
||||
}
|
||||
|
||||
static void mrbBindingExecute()
|
||||
{
|
||||
mrb_state *mrb = mrb_open();
|
||||
|
||||
shState->setBindingData(mrb);
|
||||
|
||||
MrbData mrbData(mrb);
|
||||
mrb->ud = &mrbData;
|
||||
|
||||
mrb_define_module_function(mrb, mrb->kernel_module, "time_op",
|
||||
mkxpTimeOp, MRB_ARGS_OPT(2) | MRB_ARGS_BLOCK());
|
||||
|
||||
mrbBindingInit(mrb);
|
||||
|
||||
mrbc_context *ctx = mrbc_context_new(mrb);
|
||||
ctx->capture_errors = 1;
|
||||
|
||||
const Config &conf = shState->rtData().config;
|
||||
const std::string &customScript = conf.customScript;
|
||||
// const std::string &mrbFile = conf.mrbFile;
|
||||
(void) runMrbFile; // FIXME mrbFile support on ice for now
|
||||
|
||||
if (!customScript.empty())
|
||||
runCustomScript(mrb, ctx, customScript.c_str());
|
||||
// else if (!mrbFile.empty())
|
||||
// runMrbFile(mrb, mrbFile.c_str());
|
||||
else
|
||||
runRMXPScripts(mrb, ctx);
|
||||
|
||||
checkException(mrb);
|
||||
|
||||
shState->rtData().rqTermAck.set();
|
||||
shState->texPool().disable();
|
||||
|
||||
mrbc_context_free(mrb, ctx);
|
||||
mrb_close(mrb);
|
||||
}
|
||||
|
||||
static void mrbBindingTerminate()
|
||||
{
|
||||
mrb_state *mrb = static_cast<mrb_state*>(shState->bindingData());
|
||||
MrbData *data = static_cast<MrbData*>(mrb->ud);
|
||||
|
||||
mrb_raise(mrb, data->exc[Shutdown], "");
|
||||
}
|
||||
|
||||
static void mrbBindingReset()
|
||||
{
|
||||
// No idea how to do this with mruby yet
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- binding-mruby/binding-mruby.cpp
|
||||
+++ binding-mruby/binding-mruby.cpp
|
||||
@@ -117,7 +117,7 @@ static void mrbBindingInit(mrb_state *mrb)
|
||||
/* Load global constants */
|
||||
mrb_define_global_const(mrb, "MKXP", mrb_true_value());
|
||||
|
||||
- mrb_value debug = rb_bool_new(shState->config().editor.debug);
|
||||
+ mrb_value debug = mrb_bool_value(shState->config().editor.debug);
|
||||
if (rgssVer == 1)
|
||||
mrb_define_global_const(mrb, "DEBUG", debug);
|
||||
else if (rgssVer >= 2)
|
||||
|
|
@ -35,6 +35,10 @@
|
|||
#include <SDL_thread.h>
|
||||
#include <SDL_timer.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
|
||||
ALStream::ALStream(LoopMode loopMode,
|
||||
const std::string &threadId)
|
||||
: looped(loopMode == Looped),
|
||||
|
|
@ -474,6 +478,11 @@ void ALStream::streamData()
|
|||
if (threadTermReq)
|
||||
break;
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
emscripten_sleep(AUDIO_SLEEP);
|
||||
#else
|
||||
SDL_Delay(AUDIO_SLEEP);
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@
|
|||
#include <SDL_thread.h>
|
||||
#include <SDL_timer.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
|
||||
struct AudioPrivate
|
||||
{
|
||||
AudioStream bgm;
|
||||
|
|
@ -232,7 +236,11 @@ struct AudioPrivate
|
|||
}
|
||||
}
|
||||
|
||||
SDL_Delay(AUDIO_SLEEP);
|
||||
#ifdef __EMSCRIPTEN__
|
||||
emscripten_sleep(AUDIO_SLEEP);
|
||||
#else
|
||||
SDL_Delay(AUDIO_SLEEP);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@
|
|||
#include <SDL_thread.h>
|
||||
#include <SDL_timer.h>
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
|
||||
AudioStream::AudioStream(ALStream::LoopMode loopMode,
|
||||
const std::string &threadId)
|
||||
: extPaused(false),
|
||||
|
|
@ -323,7 +327,11 @@ void AudioStream::fadeOutThread()
|
|||
|
||||
unlockStream();
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
emscripten_sleep(AUDIO_SLEEP);
|
||||
#else
|
||||
SDL_Delay(AUDIO_SLEEP);
|
||||
#endif
|
||||
}
|
||||
|
||||
fade.active.clear();
|
||||
|
|
@ -360,6 +368,10 @@ void AudioStream::fadeInThread()
|
|||
|
||||
unlockStream();
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
emscripten_sleep(AUDIO_SLEEP);
|
||||
#else
|
||||
SDL_Delay(AUDIO_SLEEP);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ struct Config
|
|||
int defScreenH = 0;
|
||||
|
||||
int fixedFramerate = 0;
|
||||
bool frameSkip =true;
|
||||
bool frameSkip =false;
|
||||
bool syncToRefreshrate = false;
|
||||
|
||||
bool solidFonts = false;
|
||||
|
|
|
|||
|
|
@ -447,7 +447,6 @@ private:
|
|||
#endif
|
||||
#endif
|
||||
#ifdef __EMSCRIPTEN__
|
||||
printf("EMSCRIPTEN SLEEP IN GRAPHICS\n");
|
||||
emscripten_sleep(ticks /tickFreqMS);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
--- src/rgssad.cpp
|
||||
+++ src/rgssad.cpp
|
||||
@@ -297,8 +297,6 @@ processDirectories(RGSS_archiveData *data, BoostSet<std::string> &topLevel,
|
||||
|
||||
if (slash)
|
||||
nameBuf[i] = '/';
|
||||
-
|
||||
- break;
|
||||
}
|
||||
|
||||
/* Check for more entries */
|
||||
@@ -333,16 +331,14 @@ verifyHeader(PHYSFS_Io *io, char version)
|
||||
}
|
||||
|
||||
static void*
|
||||
-RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
|
||||
+RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite)
|
||||
{
|
||||
if (forWrite)
|
||||
- return NULL;
|
||||
+ return 0;
|
||||
|
||||
/* Version 1 */
|
||||
if (!verifyHeader(io, 1))
|
||||
- return NULL;
|
||||
- else
|
||||
- *claimed = 1;
|
||||
+ return 0;
|
||||
|
||||
RGSS_archiveData *data = new RGSS_archiveData;
|
||||
data->archiveIo = io;
|
||||
@@ -393,9 +389,9 @@ RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
|
||||
return data;
|
||||
}
|
||||
|
||||
-static PHYSFS_EnumerateCallbackResult
|
||||
+static void
|
||||
RGSS_enumerateFiles(void *opaque, const char *dirname,
|
||||
- PHYSFS_EnumerateCallback cb,
|
||||
+ PHYSFS_EnumFilesCallback cb,
|
||||
const char *origdir, void *callbackdata)
|
||||
{
|
||||
RGSS_archiveData *data = static_cast<RGSS_archiveData*>(opaque);
|
||||
@@ -403,15 +399,13 @@ RGSS_enumerateFiles(void *opaque, const char *dirname,
|
||||
std::string _dirname(dirname);
|
||||
|
||||
if (!data->dirHash.contains(_dirname))
|
||||
- return PHYSFS_ENUM_STOP;
|
||||
+ return;
|
||||
|
||||
const BoostSet<std::string> &entries = data->dirHash[_dirname];
|
||||
|
||||
BoostSet<std::string>::const_iterator iter;
|
||||
for (iter = entries.cbegin(); iter != entries.cend(); ++iter)
|
||||
cb(callbackdata, origdir, iter->c_str());
|
||||
-
|
||||
- return PHYSFS_ENUM_OK;
|
||||
}
|
||||
|
||||
static PHYSFS_Io*
|
||||
@@ -542,21 +536,19 @@ readUint32AndXor(PHYSFS_Io *io, uint32_t &result, uint32_t key)
|
||||
}
|
||||
|
||||
static void*
|
||||
-RGSS3_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
|
||||
+RGSS3_openArchive(PHYSFS_Io *io, const char *, int forWrite)
|
||||
{
|
||||
if (forWrite)
|
||||
- return NULL;
|
||||
+ return 0;
|
||||
|
||||
/* Version 3 */
|
||||
if (!verifyHeader(io, 3))
|
||||
- return NULL;
|
||||
- else
|
||||
- *claimed = 1;
|
||||
+ return 0;
|
||||
|
||||
uint32_t baseMagic;
|
||||
|
||||
if (!readUint32(io, baseMagic))
|
||||
- return NULL;
|
||||
+ return 0;
|
||||
|
||||
baseMagic = (baseMagic * 9) + 3;
|
||||
|
||||
@@ -613,7 +605,7 @@ RGSS3_openArchive(PHYSFS_Io *io, const char *, int forWrite, int *claimed)
|
||||
|
||||
error:
|
||||
delete data;
|
||||
- return NULL;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
return data;
|
||||
Loading…
Add table
Add a link
Reference in a new issue