snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 13:29:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding backend changes for settings menu

Browse source 
Committer: mshirt <mshirt@ualberta.ca>
This commit is contained in:
root 2017-01-01 04:48:40 -06:00
parent d41e36c751
commit 29fd891550
6 changed files with 101 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
binding-mri/audio-binding.cpp
View file

@ -86,6 +86,21 @@ RB_METHOD(audio_##entity##Fade) \
return rb_float_new(shState->audio().entity##Pos()); \
}
#define DEF_AUD_PROP_I(PropName) \
RB_METHOD(audio##Get##PropName) \
{ \
RB_UNUSED_PARAM; \
return rb_fix_new(shState->audio().get##PropName()); \
} \
RB_METHOD(audio##Set##PropName) \
{ \
RB_UNUSED_PARAM; \
int value; \
rb_get_args(argc, argv, "i", &value RB_ARG_END); \
shState->audio().set##PropName(value); \
return rb_fix_new(value); \
}
DEF_PLAY_STOP_POS( bgm )
DEF_PLAY_STOP_POS( bgs )
@ -97,6 +112,9 @@ DEF_FADE( me )
DEF_PLAY_STOP( se )
DEF_AUD_PROP_I(BGM_Volume)
DEF_AUD_PROP_I(SFX_Volume)
RB_METHOD(audioReset)
{
RB_UNUSED_PARAM;
@ -121,6 +139,11 @@ RB_METHOD(audioReset)
#define BIND_POS(entity) \
_rb_define_module_function(module, #entity "_pos", audio_##entity##Pos);
#define INIT_AUD_PROP_BIND(PropName, prop_name_s) \
{ \
_rb_define_module_function(module, prop_name_s, audio##Get##PropName); \
_rb_define_module_function(module, prop_name_s "=", audio##Set##PropName); \
}
void
audioBindingInit()
@ -140,4 +163,7 @@ audioBindingInit()
BIND_PLAY_STOP( se )
_rb_define_module_function(module, "__reset__", audioReset);
INIT_AUD_PROP_BIND( BGM_Volume, "bgm_volume" );
INIT_AUD_PROP_BIND( SFX_Volume, "sfx_volume" );
}

2
binding-mri/graphics-binding.cpp
View file

@ -202,6 +202,7 @@ DEF_GRA_PROP_I(Brightness)
DEF_GRA_PROP_B(Fullscreen)
DEF_GRA_PROP_B(ShowCursor)
DEF_GRA_PROP_B(Smooth)
DEF_GRA_PROP_B(Frameskip)
#define INIT_GRA_PROP_BIND(PropName, prop_name_s) \
{ \
@ -244,4 +245,5 @@ void graphicsBindingInit()
INIT_GRA_PROP_BIND( Fullscreen, "fullscreen" );
INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" );
INIT_GRA_PROP_BIND( Smooth, "smooth" );
INIT_GRA_PROP_BIND( Frameskip, "frameskip" );
}

57
src/audio.cpp
View file

@ -34,10 +34,17 @@
struct AudioPrivate
{
int bgm_volume;
int sfx_volume;
AudioStream bgm;
AudioStream bgs;
AudioStream me;
int current_bgm_volume;
int current_bgs_volume;
int current_me_volume;
SoundEmitter se;
SyncPoint &syncPoint;
@ -69,6 +76,11 @@ struct AudioPrivate
se(rtData.config),
syncPoint(rtData.syncPoint)
{
bgm_volume = 100;
sfx_volume = 100;
current_bgm_volume = 100;
current_bgs_volume = 100;
current_me_volume = 100;
meWatch.state = MeNotPlaying;
meWatch.thread = createSDLThread
<AudioPrivate, &AudioPrivate::meWatchFun>(this, "audio_mewatch");
@ -246,6 +258,7 @@ void Audio::bgmPlay(const char *filename,
int pitch,
float pos)
{
p->current_bgm_volume = volume;
p->bgm.play(filename, volume, pitch, pos);
}
@ -265,6 +278,7 @@ void Audio::bgsPlay(const char *filename,
int pitch,
float pos)
{
p->current_bgs_volume = volume;
p->bgs.play(filename, volume, pitch, pos);
}
@ -283,6 +297,7 @@ void Audio::mePlay(const char *filename,
int volume,
int pitch)
{
p->current_me_volume = volume;
p->me.play(filename, volume, pitch);
}
@ -301,7 +316,7 @@ void Audio::sePlay(const char *filename,
int volume,
int pitch)
{
p->se.play(filename, volume, pitch);
p->se.play(filename, (volume*p->sfx_volume)/100, pitch);
}
void Audio::seStop()
@ -327,4 +342,44 @@ void Audio::reset()
p->se.stop();
}
int Audio::getBGM_Volume() const
{
return p->bgm_volume;
}
void Audio::setBGM_Volume(int value)
{
if(value > 100){
value = 100;
}else if(value < 0){
value = 0;
}
p->bgm_volume = value;
p->bgm.lockStream();
p->bgm.setVolume(AudioStream::External, ((float)(p->bgm_volume * p->current_bgm_volume))/10000.0f );
p->bgm.unlockStream();
p->me.lockStream();
p->me.setVolume(AudioStream::External, ((float)(p->bgm_volume * p->current_me_volume))/10000.0f );
p->me.unlockStream();
}
int Audio::getSFX_Volume() const
{
return p->sfx_volume;
}
void Audio::setSFX_Volume(int value)
{
if(value > 100){
value = 100;
}else if(value < 0){
value = 0;
}
p->sfx_volume = value;
p->bgs.lockStream();
p->bgs.setVolume(AudioStream::External, ((float)(p->sfx_volume * p->current_bgs_volume))/10000.0f );
p->bgs.unlockStream();
}
Audio::~Audio() { delete p; }

6
src/audio.h
View file

@ -22,6 +22,8 @@
#ifndef AUDIO_H
#define AUDIO_H
#include "util.h"
/* Concerning the 'pos' parameter:
* RGSS3 actually doesn't specify a format for this,
* it's only implied that it is a numerical value
@ -68,6 +70,10 @@ public:
void reset();
/* Non-standard extension */
DECL_ATTR( BGM_Volume, int)
DECL_ATTR( SFX_Volume, int)
private:
Audio(RGSSThreadData &rtData);
~Audio();

10
src/graphics.cpp
View file

@ -1046,6 +1046,16 @@ void Graphics::setSmooth(bool value)
p->threadData->config.smoothScaling = value;
}
bool Graphics::getFrameskip() const
{
return p->threadData->config.frameSkip;
}
void Graphics::setFrameskip(bool value)
{
p->threadData->config.frameSkip = value;
}
bool Graphics::getShowCursor() const
{
return p->threadData->ethread->getShowCursor();

1
src/graphics.h
View file

@ -63,6 +63,7 @@ public:
DECL_ATTR( Fullscreen, bool )
DECL_ATTR( ShowCursor, bool )
DECL_ATTR( Smooth, bool )
DECL_ATTR( Frameskip, bool )
/* <internal> */
Scene *getScreen() const;