godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Style: Prevent clang-format on JS code

Browse Source
This commit is contained in:
Rémi Verschelde
2017-01-15 20:00:04 +01:00
parent f44ee891be
commit 39114178a0
4 changed files with 122 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
platform/javascript/audio_server_javascript.cpp
View File

@@ -198,14 +198,15 @@ RID AudioServerJavascript::voice_create(){
voice->positional=false; voice->positional=false;
voice->active=false; voice->active=false;
/* clang-format off */
EM_ASM_( { EM_ASM_( {
_as_voices[$0]=null; _as_voices[$0] = null;
_as_voice_gain[$0]=_as_audioctx.createGain(); _as_voice_gain[$0] = _as_audioctx.createGain();
_as_voice_pan[$0]=_as_audioctx.createStereoPanner(); _as_voice_pan[$0] = _as_audioctx.createStereoPanner();
_as_voice_gain[$0].connect(_as_voice_pan[$0]); _as_voice_gain[$0].connect(_as_voice_pan[$0]);
_as_voice_pan[$0].connect(_as_audioctx.destination); _as_voice_pan[$0].connect(_as_audioctx.destination);
}, voice_base);
},voice_base); /* clang-format on */
voice_base++; voice_base++;
@@ -227,27 +228,29 @@ void AudioServerJavascript::voice_play(RID p_voice, RID p_sample){
//create sample if not created //create sample if not created
ERR_FAIL_COND(sample->tmp_data.size()==0); ERR_FAIL_COND(sample->tmp_data.size()==0);
sample->index=sample_base; sample->index=sample_base;
EM_ASM_( { /* clang-format off */
_as_samples[$0]=_as_audioctx.createBuffer($1,$2,$3); EM_ASM_({
},sample_base,sample->stereo?2:1,sample->length,sample->mix_rate); _as_samples[$0] = _as_audioctx.createBuffer($1, $2, $3);
}, sample_base, sample->stereo ? 2 : 1, sample->length, sample->mix_rate);
/* clang-format on */
sample_base++; sample_base++;
int chans = sample->stereo?2:1; int chans = sample->stereo?2:1;
for(int i=0;i<chans;i++) { for(int i=0;i<chans;i++) {
/* clang-format off */
EM_ASM_({ EM_ASM_({
_as_edited_buffer=_as_samples[$0].getChannelData($1); _as_edited_buffer = _as_samples[$0].getChannelData($1);
},sample->index,i); }, sample->index, i);
/* clang-format on */
for(int j=0;j<sample->length;j++) { for(int j=0;j<sample->length;j++) {
/* clang-format off */
EM_ASM_({ EM_ASM_({
_as_edited_buffer[$0]=$1; _as_edited_buffer[$0] = $1;
},j,sample->tmp_data[j*chans+i]); }, j, sample->tmp_data[j * chans + i]);
/* clang-format on */
} }
} }
@@ -263,26 +266,27 @@ void AudioServerJavascript::voice_play(RID p_voice, RID p_sample){
float freq_diff = Math::log(float(voice->mix_rate)/float(voice->sample_mix_rate))/Math::log(2.0); float freq_diff = Math::log(float(voice->mix_rate)/float(voice->sample_mix_rate))/Math::log(2.0);
int detune = int(freq_diff*1200.0); int detune = int(freq_diff*1200.0);
EM_ASM_( { /* clang-format off */
if (_as_voices[$0]!==null) { EM_ASM_({
_as_voices[$0].stop(); //stop and byebye if (_as_voices[$0] !== null) {
} _as_voices[$0].stop(); //stop and byebye
_as_voices[$0]=_as_audioctx.createBufferSource(); }
_as_voices[$0].connect(_as_voice_gain[$0]); _as_voices[$0] = _as_audioctx.createBufferSource();
_as_voices[$0].buffer=_as_samples[$1]; _as_voices[$0].connect(_as_voice_gain[$0]);
_as_voices[$0].loopStart.value=$1; _as_voices[$0].buffer = _as_samples[$1];
_as_voices[$0].loopEnd.value=$2; _as_voices[$0].loopStart.value = $1;
_as_voices[$0].loop.value=$3; _as_voices[$0].loopEnd.value = $2;
_as_voices[$0].detune.value=$6; _as_voices[$0].loop.value = $3;
_as_voice_pan[$0].pan.value=$4; _as_voices[$0].detune.value = $6;
_as_voice_gain[$0].gain.value=$5; _as_voice_pan[$0].pan.value = $4;
_as_voices[$0].start(); _as_voice_gain[$0].gain.value = $5;
_as_voices[$0].onended=function() { _as_voices[$0].start();
_as_voices[$0].disconnect(_as_voice_gain[$0]); _as_voices[$0].onended = function() {
_as_voices[$0]=null; _as_voices[$0].disconnect(_as_voice_gain[$0]);
} _as_voices[$0] = null;
}
},voice->index,sample->index,sample->mix_rate*sample->loop_begin,sample->mix_rate*sample->loop_end,sample->loop_format!=SAMPLE_LOOP_NONE,voice->pan,voice->volume*fx_volume_scale,detune); }, voice->index, sample->index, sample->mix_rate * sample->loop_begin, sample->mix_rate * sample->loop_end, sample->loop_format != SAMPLE_LOOP_NONE, voice->pan, voice->volume * fx_volume_scale, detune);
/* clang-format on */
voice->active=true; voice->active=true;
} }
@@ -295,11 +299,11 @@ void AudioServerJavascript::voice_set_volume(RID p_voice, float p_volume){
voice->volume=p_volume; voice->volume=p_volume;
if (voice->active) { if (voice->active) {
EM_ASM_( { /* clang-format off */
EM_ASM_({
_as_voice_gain[$0].gain.value=$1; _as_voice_gain[$0].gain.value = $1;
}, voice->index, voice->volume * fx_volume_scale);
},voice->index,voice->volume*fx_volume_scale); /* clang-format on */
} }
} }
@@ -313,11 +317,11 @@ void AudioServerJavascript::voice_set_pan(RID p_voice, float p_pan, float p_dept
voice->pan_height=height; voice->pan_height=height;
if (voice->active) { if (voice->active) {
EM_ASM_( { /* clang-format off */
EM_ASM_({
_as_voice_pan[$0].pan.value=$1; _as_voice_pan[$0].pan.value = $1;
}, voice->index, voice->pan);
},voice->index,voice->pan); /* clang-format on */
} }
} }
void AudioServerJavascript::voice_set_filter(RID p_voice, FilterType p_type, float p_cutoff, float p_resonance, float p_gain){ void AudioServerJavascript::voice_set_filter(RID p_voice, FilterType p_type, float p_cutoff, float p_resonance, float p_gain){
@@ -340,11 +344,11 @@ void AudioServerJavascript::voice_set_mix_rate(RID p_voice, int p_mix_rate){
float freq_diff = Math::log(float(voice->mix_rate)/float(voice->sample_mix_rate))/Math::log(2.0); float freq_diff = Math::log(float(voice->mix_rate)/float(voice->sample_mix_rate))/Math::log(2.0);
int detune = int(freq_diff*1200.0); int detune = int(freq_diff*1200.0);
EM_ASM_( { /* clang-format off */
EM_ASM_({
_as_voices[$0].detune.value=$1; _as_voices[$0].detune.value = $1;
}, voice->index, detune);
},voice->index,detune); /* clang-format on */
} }
} }
void AudioServerJavascript::voice_set_positional(RID p_voice, bool p_positional){ void AudioServerJavascript::voice_set_positional(RID p_voice, bool p_positional){
@@ -419,14 +423,15 @@ void AudioServerJavascript::voice_stop(RID p_voice){
ERR_FAIL_COND(!voice); ERR_FAIL_COND(!voice);
if (voice->active) { if (voice->active) {
/* clang-format off */
EM_ASM_( { EM_ASM_({
if (_as_voices[$0]!==null) { if (_as_voices[$0] !== null) {
_as_voices[$0].stop(); _as_voices[$0].stop();
_as_voices[$0].disconnect(_as_voice_gain[$0]); _as_voices[$0].disconnect(_as_voice_gain[$0]);
_as_voices[$0]=null; _as_voices[$0] = null;
} }
},voice->index); }, voice->index);
/* clang-format on */
voice->active=false; voice->active=false;
} }
@@ -524,22 +529,25 @@ void AudioServerJavascript::free(RID p_id){
ERR_FAIL_COND(!voice); ERR_FAIL_COND(!voice);
if (voice->active) { if (voice->active) {
EM_ASM_( { /* clang-format off */
if (_as_voices[$0]!==null) { EM_ASM_({
if (_as_voices[$0] !== null) {
_as_voices[$0].stop(); _as_voices[$0].stop();
_as_voices[$0].disconnect(_as_voice_gain[$0]); _as_voices[$0].disconnect(_as_voice_gain[$0]);
} }
},voice->index); }, voice->index);
/* clang-format on */
} }
EM_ASM_( { /* clang-format off */
EM_ASM_({
delete _as_voices[$0]; delete _as_voices[$0];
_as_voice_gain[$0].disconnect(_as_voice_pan[$0]); _as_voice_gain[$0].disconnect(_as_voice_pan[$0]);
delete _as_voice_gain[$0]; delete _as_voice_gain[$0];
_as_voice_pan[$0].disconnect(_as_audioctx.destination); _as_voice_pan[$0].disconnect(_as_audioctx.destination);
delete _as_voice_pan[$0]; delete _as_voice_pan[$0];
}, voice->index);
},voice->index); /* clang-format on */
voice_owner.free(p_id); voice_owner.free(p_id);
memdelete(voice); memdelete(voice);
@@ -549,10 +557,11 @@ void AudioServerJavascript::free(RID p_id){
Sample *sample = sample_owner.get(p_id); Sample *sample = sample_owner.get(p_id);
ERR_FAIL_COND(!sample); ERR_FAIL_COND(!sample);
EM_ASM_( { /* clang-format off */
EM_ASM_({
delete _as_samples[$0]; delete _as_samples[$0];
}, sample->index);
},sample->index); /* clang-format on */
sample_owner.free(p_id); sample_owner.free(p_id);
memdelete(sample); memdelete(sample);
@@ -594,21 +603,20 @@ void AudioServerJavascript::mix_to_js(int p_frames) {
int tomix=MIN(todo,INTERNAL_BUFFER_SIZE); int tomix=MIN(todo,INTERNAL_BUFFER_SIZE);
driver_process_chunk(tomix); driver_process_chunk(tomix);
/* clang-format off */
EM_ASM_({ EM_ASM_({
var data = HEAPF32.subarray($0 / 4, $0 / 4 + $2 * 2);
var data = HEAPF32.subarray($0/4, $0/4 + $2*2);
for (var channel = 0; channel < _as_output_buffer.numberOfChannels; channel++) { for (var channel = 0; channel < _as_output_buffer.numberOfChannels; channel++) {
var outputData = _as_output_buffer.getChannelData(channel); var outputData = _as_output_buffer.getChannelData(channel);
// Loop through samples // Loop through samples
for (var sample = 0; sample < $2; sample++) { for (var sample = 0; sample < $2; sample++) {
// make output equal to the same as the input // make output equal to the same as the input
outputData[sample+$1] = data[sample*2+channel]; outputData[sample + $1] = data[sample * 2 + channel];
} }
} }
}, internal_buffer, offset, tomix);
},internal_buffer,offset,tomix); /* clang-format on */
todo-=tomix; todo-=tomix;
offset+=tomix; offset+=tomix;
@@ -618,9 +626,11 @@ void AudioServerJavascript::mix_to_js(int p_frames) {
void AudioServerJavascript::init(){ void AudioServerJavascript::init(){
/* /*
// clang-format off
EM_ASM( EM_ASM(
console.log('server is '+audio_server); console.log('server is ' + audio_server);
); );
// clang-format on
*/ */
@@ -634,19 +644,19 @@ void AudioServerJavascript::init(){
int buffer_latency=16384; int buffer_latency=16384;
/* clang-format off */
EM_ASM_( { EM_ASM_( {
_as_script_node = _as_audioctx.createScriptProcessor($0, 0, 2); _as_script_node = _as_audioctx.createScriptProcessor($0, 0, 2);
_as_script_node.connect(_as_audioctx.destination); _as_script_node.connect(_as_audioctx.destination);
console.log(_as_script_node.bufferSize); console.log(_as_script_node.bufferSize);
_as_script_node.onaudioprocess = function(audioProcessingEvent) { _as_script_node.onaudioprocess = function(audioProcessingEvent) {
// The output buffer contains the samples that will be modified and played // The output buffer contains the samples that will be modified and played
_as_output_buffer = audioProcessingEvent.outputBuffer; _as_output_buffer = audioProcessingEvent.outputBuffer;
audio_server_mix_function(_as_output_buffer.getChannelData(0).length); audio_server_mix_function(_as_output_buffer.getChannelData(0).length);
} }
},buffer_latency); }, buffer_latency);
/* clang-format on */
} }
@@ -813,20 +823,24 @@ AudioServerJavascript::AudioServerJavascript() {
singleton=this; singleton=this;
sample_base=1; sample_base=1;
voice_base=1; voice_base=1;
/* clang-format off */
EM_ASM( EM_ASM(
_as_samples={}; _as_samples = {};
_as_voices={}; _as_voices = {};
_as_voice_pan={}; _as_voice_pan = {};
_as_voice_gain={}; _as_voice_gain = {};
_as_audioctx = new (window.AudioContext || window.webkitAudioContext)(); _as_audioctx = new (window.AudioContext || window.webkitAudioContext)();
audio_server_mix_function = Module.cwrap('audio_server_mix_function', 'void', ['number']); audio_server_mix_function = Module.cwrap('audio_server_mix_function', 'void', ['number']);
); );
/* clang-format on */
/* clang-format off */
webaudio_mix_rate = EM_ASM_INT_V( webaudio_mix_rate = EM_ASM_INT_V(
return _as_audioctx.sampleRate; return _as_audioctx.sampleRate;
); );
/* clang-format on */
print_line("WEBAUDIO MIX RATE: "+itos(webaudio_mix_rate)); print_line("WEBAUDIO MIX RATE: "+itos(webaudio_mix_rate));
event_voice_scale=1.0; event_voice_scale=1.0;
fx_volume_scale=1.0; fx_volume_scale=1.0;

7
platform/javascript/javascript_eval.cpp
View File

@@ -41,6 +41,7 @@ JavaScript *JavaScript::get_singleton() {
Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) {
union { int i; double d; char* s; } js_data[4]; union { int i; double d; char* s; } js_data[4];
/* clang-format off */
Variant::Type return_type = static_cast<Variant::Type>(EM_ASM_INT({ Variant::Type return_type = static_cast<Variant::Type>(EM_ASM_INT({
var eval_ret; var eval_ret;
@@ -49,8 +50,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) {
// indirect eval call grants global execution context // indirect eval call grants global execution context
var global_eval = eval; var global_eval = eval;
eval_ret = global_eval(UTF8ToString($2)); eval_ret = global_eval(UTF8ToString($2));
} } else {
else {
eval_ret = eval(UTF8ToString($2)); eval_ret = eval(UTF8ToString($2));
} }
} catch (e) { } catch (e) {
@@ -125,6 +125,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) {
return 0; // NIL return 0; // NIL
}, js_data, sizeof *js_data, p_code.utf8().get_data(), p_use_global_exec_context)); }, js_data, sizeof *js_data, p_code.utf8().get_data(), p_use_global_exec_context));
/* clang-format on */
switch(return_type) { switch(return_type) {
case Variant::BOOL: case Variant::BOOL:
@@ -136,7 +137,9 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) {
case Variant::STRING: case Variant::STRING:
{ {
String str = String::utf8(js_data->s); String str = String::utf8(js_data->s);
/* clang-format off */
EM_ASM_({ _free($0); }, js_data->s); EM_ASM_({ _free($0); }, js_data->s);
/* clang-format on */
return str; return str;
} }
case Variant::VECTOR2: case Variant::VECTOR2:

2
platform/javascript/javascript_main.cpp
View File

@@ -178,6 +178,7 @@ int main(int argc, char *argv[]) {
//glutSpecialFunc(gears_special); //glutSpecialFunc(gears_special);
//mount persistent file system //mount persistent file system
/* clang-format off */
EM_ASM( EM_ASM(
FS.mkdir('/userfs'); FS.mkdir('/userfs');
FS.mount(IDBFS, {}, '/userfs'); FS.mount(IDBFS, {}, '/userfs');
@@ -196,6 +197,7 @@ int main(int argc, char *argv[]) {
} }
}); });
); );
/* clang-format on */
glutMainLoop(); glutMainLoop();

14
platform/javascript/os_javascript.cpp
View File

@@ -215,6 +215,7 @@ void OS_JavaScript::initialize(const VideoMode& p_desired,int p_video_driver,int
// find locale, emscripten only sets "C" // find locale, emscripten only sets "C"
char locale_ptr[16]; char locale_ptr[16];
/* clang-format off */
EM_ASM_({ EM_ASM_({
var locale = ""; var locale = "";
if (Module.locale) { if (Module.locale) {
@@ -230,6 +231,7 @@ void OS_JavaScript::initialize(const VideoMode& p_desired,int p_video_driver,int
locale = locale.split('.')[0]; locale = locale.split('.')[0];
stringToUTF8(locale, $0, 16); stringToUTF8(locale, $0, 16);
}, locale_ptr); }, locale_ptr);
/* clang-format on */
setenv("LANG", locale_ptr, true); setenv("LANG", locale_ptr, true);
print_line("Init Audio"); print_line("Init Audio");
@@ -332,9 +334,11 @@ void OS_JavaScript::finalize() {
void OS_JavaScript::alert(const String& p_alert,const String& p_title) { void OS_JavaScript::alert(const String& p_alert,const String& p_title) {
/* clang-format off */
EM_ASM_({ EM_ASM_({
window.alert(UTF8ToString($0)); window.alert(UTF8ToString($0));
}, p_alert.utf8().get_data()); }, p_alert.utf8().get_data());
/* clang-format on */
} }
@@ -366,9 +370,11 @@ int OS_JavaScript::get_mouse_button_state() const {
void OS_JavaScript::set_window_title(const String& p_title) { void OS_JavaScript::set_window_title(const String& p_title) {
/* clang-format off */
EM_ASM_({ EM_ASM_({
document.title = UTF8ToString($0); document.title = UTF8ToString($0);
}, p_title.utf8().get_data()); }, p_title.utf8().get_data());
/* clang-format on */
} }
//interesting byt not yet //interesting byt not yet
@@ -424,8 +430,10 @@ void OS_JavaScript::set_window_maximized(bool p_enabled) {
set_window_fullscreen(false); set_window_fullscreen(false);
} }
else { else {
/* clang-format off */
video_mode.width = EM_ASM_INT_V(return window.innerWidth); video_mode.width = EM_ASM_INT_V(return window.innerWidth);
video_mode.height = EM_ASM_INT_V(return window.innerHeight); video_mode.height = EM_ASM_INT_V(return window.innerHeight);
/* clang-format on */
emscripten_set_canvas_size(video_mode.width, video_mode.height); emscripten_set_canvas_size(video_mode.width, video_mode.height);
} }
} }
@@ -444,7 +452,9 @@ void OS_JavaScript::set_window_fullscreen(bool p_enable) {
// _browser_resize_callback or _fullscreen_change_callback // _browser_resize_callback or _fullscreen_change_callback
EMSCRIPTEN_RESULT result; EMSCRIPTEN_RESULT result;
if (p_enable) { if (p_enable) {
/* clang-format off */
EM_ASM(Module.requestFullscreen(false, false);); EM_ASM(Module.requestFullscreen(false, false););
/* clang-format on */
} }
else { else {
result = emscripten_exit_fullscreen(); result = emscripten_exit_fullscreen();
@@ -504,11 +514,13 @@ bool OS_JavaScript::main_loop_iterate() {
if (time_to_save_sync<0) { if (time_to_save_sync<0) {
//time to sync, for real //time to sync, for real
/* clang-format off */
EM_ASM( EM_ASM(
FS.syncfs(function(err) { FS.syncfs(function(err) {
if (err) { Module.printErr('Failed to save IDB file system: ' + err.message); } if (err) { Module.printErr('Failed to save IDB file system: ' + err.message); }
}); });
); );
/* clang-format on */
} }
@@ -785,9 +797,11 @@ void OS_JavaScript::reload_gfx() {
} }
Error OS_JavaScript::shell_open(String p_uri) { Error OS_JavaScript::shell_open(String p_uri) {
/* clang-format off */
EM_ASM_({ EM_ASM_({
window.open(UTF8ToString($0), '_blank'); window.open(UTF8ToString($0), '_blank');
}, p_uri.utf8().get_data()); }, p_uri.utf8().get_data());
/* clang-format on */
return OK; return OK;
} }