Skip to content

Instantly share code, notes, and snippets.

@deltaoscarmike
deltaoscarmike / shader.diff
Created October 16, 2018 17:59
shader.diff
diff --git a/src/libprojectM/Renderer/ShaderEngine.cpp b/src/libprojectM/Renderer/ShaderEngine.cpp
index a182720a..e2f4f5ae 100644
--- a/src/libprojectM/Renderer/ShaderEngine.cpp
+++ b/src/libprojectM/Renderer/ShaderEngine.cpp
@@ -323,7 +323,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"
diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
index d9431495..da8b7c2e 100755
--- a/src/libprojectM/projectM.cpp
+++ b/src/libprojectM/projectM.cpp
@@ -228,7 +228,7 @@ void projectM::readConfig (const std::string & configFile )
_settings.easterEgg = config.read<float> ( "Easter Egg Parameter", 0.0);
_settings.softCutRatingsEnabled =
- config.read<float> ( "Soft Cut Ratings Enabled", false);
+ config.read<bool> ( "Soft Cut Ratings Enabled", false);
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"
diff --git a/src/projectM-emscripten/Makefile.am b/src/projectM-emscripten/Makefile.am
index 2c280540..2dc9a6c2 100644
--- a/src/projectM-emscripten/Makefile.am
+++ b/src/projectM-emscripten/Makefile.am
@@ -1,17 +1,16 @@
AM_CPPFLAGS = \
${my_CFLAGS} \
-include $(top_builddir)/config.h \
--l$(top_builddir)/vendor \
+-I$(top_builddir)/vendor \
@deltaoscarmike
deltaoscarmike / threading.diff
Last active August 26, 2018 19:24
threading
diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
index 76a1d4e8..d9431495 100755
--- a/src/libprojectM/projectM.cpp
+++ b/src/libprojectM/projectM.cpp
@@ -68,15 +68,18 @@ pthread_mutex_t preset_mutex;
projectM::~projectM()
{
+ void *status;
diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp
index d68ae026..c9cc38d6 100644
--- a/src/libprojectM/Renderer/Renderer.cpp
+++ b/src/libprojectM/Renderer/Renderer.cpp
@@ -459,6 +459,9 @@ void Renderer::reset(int w, int h)
this -> vw = w;
this -> vh = h;
+ delete renderTarget;
+ this->renderTarget = new RenderTarget(texsize, vw, vh);
@deltaoscarmike
deltaoscarmike / qt_link.diff
Created June 26, 2018 17:51
patch linking qt