Skip to content

Instantly share code, notes, and snippets.

@deltaoscarmike
Created August 28, 2018 19:54
Show Gist options
  • Save deltaoscarmike/c840cfbe41219a0513f8f9a2af8c3fcb to your computer and use it in GitHub Desktop.
Save deltaoscarmike/c840cfbe41219a0513f8f9a2af8c3fcb to your computer and use it in GitHub Desktop.
diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp
index 5ee9195e..d10a465c 100644
--- a/src/libprojectM/Renderer/ShaderEngine.cpp
+++ b/src/libprojectM/Renderer/ShaderEngine.cpp
@@ -347,7 +347,7 @@ std::string blur1_frag(
" #define w_div _c3.z\n"
""
" // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels.\n"
- " vec2 uv2 = fragment_texture.xy + srctexsize.zw*vec2(1,1); // + moves blur UP, LEFT by 1-pixel increments\n"
+ " vec2 uv2 = fragment_texture.xy + srctexsize.zw*vec2(1.0,1.0); // + moves blur UP, LEFT by 1-pixel increments\n"
""
" vec3 blur = \n"
" ( texture( texture_sampler, uv2 + vec2( d1*srctexsize.z,0) ).xyz\n"
@@ -364,7 +364,7 @@ std::string blur1_frag(
" blur.xyz = blur.xyz*fscale + fbias;\n"
""
" color.xyz = blur;\n"
- " color.w = 1;\n"
+ " color.w = 1.0;\n"
"}\n");
std::string blur2_frag(
@@ -407,13 +407,13 @@ std::string blur2_frag(
" blur.xyz *= w_div;\n"
""
" // tone it down at the edges: (only happens on 1st X pass!)\n"
- " float t = min( min(fragment_texture.x, fragment_texture.y), 1-max(fragment_texture.x, fragment_texture.y) );\n"
+ " float t = min( min(fragment_texture.x, fragment_texture.y), 1.0-max(fragment_texture.x, fragment_texture.y) );\n"
" t = sqrt(t);\n"
" t = edge_darken_c1 + edge_darken_c2*clamp(t*edge_darken_c3, 0.0, 1.0);\n"
" blur.xyz *= t;\n"
""
" color.xyz = blur;\n"
- " color.w = 1;\n"
+ " color.w = 1.0;\n"
"}\n");
diff --git a/src/projectM-emscripten/Makefile.am b/src/projectM-emscripten/Makefile.am
index 2dc9a6c2..949bad02 100644
--- a/src/projectM-emscripten/Makefile.am
+++ b/src/projectM-emscripten/Makefile.am
@@ -7,7 +7,8 @@ ${my_CFLAGS} \
-I${top_srcdir}/src/libprojectM/Renderer \
${SDL_CFLAGS}
-EMSCRIPTEN_FLAGS = -s USE_SDL=2 -s USE_WEBGL2=1 -s WASM=0
+EMSCRIPTEN_FLAGS = -s USE_SDL=2 -s USE_WEBGL2=1
+# -s WASM=0
bin_PROGRAMS = projectW.bc
projectW_bc_SOURCES = ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp
diff --git a/src/projectM-emscripten/projectM_SDL_emscripten.cpp b/src/projectM-emscripten/projectM_SDL_emscripten.cpp
index c7417def..282da62b 100755
--- a/src/projectM-emscripten/projectM_SDL_emscripten.cpp
+++ b/src/projectM-emscripten/projectM_SDL_emscripten.cpp
@@ -189,6 +189,25 @@ int main( int argc, char *argv[] ) {
app.pm->projectM_resetGL(width, height);
printf("resetGL\n");
+ // Allocate a new a stream given the current directory name
+ DIR * m_dir;
+ if ((m_dir = opendir("/")) == NULL)
+ {
+ printf("error opening /\n");
+ } else {
+
+ struct dirent * dir_entry;
+ while ((dir_entry = readdir(m_dir)) != NULL)
+ {
+ printf("%s\n", dir_entry->d_name);
+ }
+ }
+
+
+ for(int i = 0; i < app.pm->getPlaylistSize(); i++) {
+ printf("%d\t%s\n", i, app.pm->getPresetName(i).c_str());
+ }
+
// mainloop. non-emscripten version here for comparison/testing
#ifdef EMSCRIPTEN
emscripten_set_main_loop(renderFrame, 0, 0);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment