name change: audio_fft -> audio_spectrum

Former-commit-id: 3c4b3c1
Grix · Oct 19, 2017 · 4783c48 · 4783c48
1 parent 5724482
commit 4783c48
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 25 deletions.
diff --git a/LasershowGen-1.5.7-Installer.exe.REMOVED.git-id b/LasershowGen-1.5.7-Installer.exe.REMOVED.git-id
diff --git a/LasershowGen-1.5.7-Zip.zip.REMOVED.git-id b/LasershowGen-1.5.7-Zip.zip.REMOVED.git-id
diff --git a/LasershowGen-1.5.8-Installer.exe.REMOVED.git-id b/LasershowGen-1.5.8-Installer.exe.REMOVED.git-id
@@ -0,0 +1 @@
+a4cc379ed13a2a1df8741c4b754354a496625438
diff --git a/LasershowGen-1.5.8-Zip.zip.REMOVED.git-id b/LasershowGen-1.5.8-Zip.zip.REMOVED.git-id
@@ -0,0 +1 @@
+361b3b5737adcdf0052c4282ababc055ccc4d85a
diff --git a/src/gms2/objects/controller/Create_0.gml b/src/gms2/objects/controller/Create_0.gml
@@ -1,5 +1,5 @@
-version = "1.5.7";
-versiondate = "2017-10-16";
+version = "1.5.8";
+versiondate = "2017-10-19";
 
 if (debug_mode)
 {
@@ -45,10 +45,10 @@ parser_shape = ML_InitParserScience(varmap);
     ML_AddFunction(parser_shape, "random", _ML_random, ML_VAL_REAL, ML_VAL_REAL, ML_VAL_REAL);
     ML_AddFunction(parser_shape, "random_normal", _ML_random_gauss, ML_VAL_REAL, ML_VAL_REAL, ML_VAL_REAL);
 	//ML_AddFunction(parser_shape, "audio_wave", _ML_audio_wave, ML_VAL_REAL, ML_VAL_REAL);
-	//ML_AddFunction(parser_shape, "audio_fft", _ML_audio_fft, ML_VAL_REAL, ML_VAL_REAL);
+	//ML_AddFunction(parser_shape, "audio_spectrum", _ML_audio_spectrum, ML_VAL_REAL, ML_VAL_REAL);
 	ML_AddVariable(parser_shape, "audio_loudness", 0, ML_VAL_REAL, 1);
 	ML_AddVariable(parser_shape, "audio_wave", 0, ML_VAL_REAL, 1);
-	ML_AddVariable(parser_shape, "audio_fft", 0, ML_VAL_REAL, 1);
+	ML_AddVariable(parser_shape, "audio_spectrum", 0, ML_VAL_REAL, 1);
 varmap = ds_map_create();
 //color/blank function
 parser_cb = ML_InitParserScience(varmap);
@@ -75,10 +75,10 @@ parser_cb = ML_InitParserScience(varmap);
     ML_AddFunction(parser_cb, "random", _ML_random, ML_VAL_REAL,ML_VAL_REAL,ML_VAL_REAL);
     ML_AddFunction(parser_cb, "random_normal", _ML_random_gauss, ML_VAL_REAL,ML_VAL_REAL,ML_VAL_REAL);
 	//ML_AddFunction(parser_cb, "audio_wave", _ML_audio_wave, ML_VAL_REAL, ML_VAL_REAL);
-	//ML_AddFunction(parser_cb, "audio_fft", _ML_audio_fft, ML_VAL_REAL, ML_VAL_REAL);
+	//ML_AddFunction(parser_cb, "audio_spectrum", _ML_audio_spectrum, ML_VAL_REAL, ML_VAL_REAL);
 	ML_AddVariable(parser_cb, "audio_loudness", 0, ML_VAL_REAL, 1);
 	ML_AddVariable(parser_cb, "audio_wave", 0, ML_VAL_REAL, 1);
-	ML_AddVariable(parser_cb, "audio_fft", 0, ML_VAL_REAL, 1);
+	ML_AddVariable(parser_cb, "audio_spectrum", 0, ML_VAL_REAL, 1);
 
 alarm[3] = 120;
 

diff --git a/src/gms2/scripts/create_func/create_func.gml b/src/gms2/scripts/create_func/create_func.gml
@@ -48,7 +48,7 @@ for (n = 0;n <= checkpoints; n++)
 	if (func_doaudio != 0)
 	{
 		ML_VM_SetVarReal(parser_shape, "audio_wave", buffer_peek(bufferIn, min(n,2047)*4, buffer_f32)/40000);
-		ML_VM_SetVarReal(parser_shape, "audio_fft", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
+		ML_VM_SetVarReal(parser_shape, "audio_spectrum", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
 	}
 
     result_x = ML_Execute(parser_shape,compiled_x);

diff --git a/src/gms2/scripts/func_blank/func_blank.gml b/src/gms2/scripts/func_blank/func_blank.gml
@@ -4,7 +4,7 @@ if (n/checkpoints != ML_VM_GetVarReal(parser_cb,"point"))
 	if (func_doaudio != 0)
 	{
 		ML_VM_SetVarReal(parser_cb, "audio_wave", buffer_peek(bufferIn, min(n,2047)*4, buffer_f32)/40000);
-		ML_VM_SetVarReal(parser_cb, "audio_fft", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
+		ML_VM_SetVarReal(parser_cb, "audio_spectrum", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
 	}
 
     if (placing == "line")

diff --git a/src/gms2/scripts/func_blank_reapply/func_blank_reapply.gml b/src/gms2/scripts/func_blank_reapply/func_blank_reapply.gml
@@ -4,7 +4,7 @@ if (j/checkpoints != ML_VM_GetVarReal(parser_cb,"point"))
 	if (func_doaudio != 0)
 	{
 		ML_VM_SetVarReal(parser_cb, "audio_wave", buffer_peek(bufferIn, min(n,2047)*4, buffer_f32)/40000);
-		ML_VM_SetVarReal(parser_cb, "audio_fft", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
+		ML_VM_SetVarReal(parser_cb, "audio_spectrum", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
 	}
     ML_VM_SetVarReal(parser_cb,"x",ML_VM_GetVarReal(parser_cb,"startx")+xp);
     ML_VM_SetVarReal(parser_cb,"y",ML_VM_GetVarReal(parser_cb,"starty")+yp);

diff --git a/src/gms2/scripts/func_color/func_color.gml b/src/gms2/scripts/func_color/func_color.gml
@@ -4,7 +4,7 @@ if (n/checkpoints != ML_VM_GetVarReal(parser_cb,"point"))
 	if (func_doaudio != 0)
 	{
 		ML_VM_SetVarReal(parser_cb, "audio_wave", buffer_peek(bufferIn, min(n,2047)*4, buffer_f32)/40000);
-		ML_VM_SetVarReal(parser_cb, "audio_fft", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
+		ML_VM_SetVarReal(parser_cb, "audio_spectrum", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
 	}
 
     if (placing == "line")

diff --git a/src/gms2/scripts/func_color_reapply/func_color_reapply.gml b/src/gms2/scripts/func_color_reapply/func_color_reapply.gml
@@ -4,7 +4,7 @@ if (j/checkpoints != ML_VM_GetVarReal(parser_cb,"point"))
 	if (func_doaudio != 0)
 	{
 		ML_VM_SetVarReal(parser_cb, "audio_wave", buffer_peek(bufferIn, min(n,2047)*4, buffer_f32)/40000);
-		ML_VM_SetVarReal(parser_cb, "audio_fft", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
+		ML_VM_SetVarReal(parser_cb, "audio_spectrum", buffer_peek(bufferOut, round(min(n/checkpoints*511,511))*4, buffer_f32));
 	}
     ML_VM_SetVarReal(parser_cb,"x",ML_VM_GetVarReal(parser_cb,"startx")+xp);
     ML_VM_SetVarReal(parser_cb,"y",ML_VM_GetVarReal(parser_cb,"starty")+yp);

diff --git a/src/gms2/scripts/func_startofframe/func_startofframe.gml b/src/gms2/scripts/func_startofframe/func_startofframe.gml
@@ -86,7 +86,7 @@ if (placing == "func")
 	ML_VM_SetVarReal(parser_shape,"endx",endx_r*128);
 	ML_VM_SetVarReal(parser_shape,"endy",endy_r*128);
 	ML_VM_SetVarReal(parser_shape,"frame",t);
-	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/6000);
+	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/7000);
 }
 
 if (colormode == "func") or (blankmode == "func")
@@ -104,5 +104,5 @@ if (colormode == "func") or (blankmode == "func")
     ML_VM_SetVarReal(parser_cb,"sec_red",colour_get_red(color2_r));
     ML_VM_SetVarReal(parser_cb,"sec_green",colour_get_green(color2_r));
     ML_VM_SetVarReal(parser_cb,"sec_blue",colour_get_blue(color2_r));
-	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/6000);
+	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/7000);
 }
diff --git a/src/gms2/scripts/func_startofframe_blank/func_startofframe_blank.gml b/src/gms2/scripts/func_startofframe_blank/func_startofframe_blank.gml
@@ -82,7 +82,7 @@ if (placing == "func")
 	ML_VM_SetVarReal(parser_shape,"endx",endx_r);
 	ML_VM_SetVarReal(parser_shape,"endy",endy_r);
 	ML_VM_SetVarReal(parser_shape,"frame",t);
-	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/6000);
+	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/7000);
 }
 
 if (colormode == "func") or (blankmode == "func")
@@ -100,5 +100,5 @@ if (colormode == "func") or (blankmode == "func")
     ML_VM_SetVarReal(parser_cb,"sec_red",colour_get_red(color2_r));
     ML_VM_SetVarReal(parser_cb,"sec_green",colour_get_green(color2_r));
     ML_VM_SetVarReal(parser_cb,"sec_blue",colour_get_blue(color2_r));
-	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/6000);
+	ML_VM_SetVarReal(parser_shape,"audio_loudness", func_audioloudness/7000);
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.5.7
+1.5.8
diff --git a/versionnotes.txt b/versionnotes.txt
@@ -1,12 +1,11 @@
+v1.5.8
+- Added audio data variables: audio_wave, audio_spectrum and audio_loudness to function modes
+- Bug fixes: FPS button broken, radial grid broken, FPS issues, editor mode audio visualization offset
+- Other minor fixes and improvements
+
 v1.5.7
-- Big performance improvements for certain tasks, most in the timeline mode
+- Big performance improvements for certain tasks, mostly in the timeline mode
 - Other minor fixes and improvements
 
 v1.5.6
 - Fix bug sometimes corrupting a saved timeline project file
-
-v1.5.5
-- Optimization mode for keeping existing points
-(Good for playback of imported pre-optimized ILD files)
-- Various bug fixes, especially for unoptimizized output
-- Other new minor features and fixes