Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl

Author: revmischa

.travis.yml

@@ -13,7 +13,6 @@ script:
   - test -e src/projectM-sdl/projectMSDL
   - test -e src/libprojectM/libprojectM.la
   - test -e dist_install/share/projectM/fonts/Vera.ttf
-  - test -e dist_install/share/projectM/shaders/blur.cg
   - test -d dist_install/share/projectM/presets
   - test -e dist_install/lib/libprojectM.la
   - test -e dist_install/include/libprojectM/projectM.hpp
@@ -34,9 +33,8 @@ matrix:
             - libsdl2-dev
             - libglew-dev
             - libftgl-dev
-            - libsdl2-dev
-            - libdevil-dev
             - libglm-dev
+            - libc++-dev
       env:
         - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
     # linux/gcc
@@ -50,9 +48,8 @@ matrix:
             - libsdl2-dev
             - libglew-dev
             - libftgl-dev
-            - libsdl2-dev
-            - libdevil-dev
             - libglm-dev
+            - libc++-dev
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 

configure.ac

@@ -75,9 +75,12 @@ AC_CONFIG_FILES([src/libprojectM/config.inp.in])
 AC_PREFIX_DEFAULT([/usr/local])
 
 AC_PROG_MKDIR_P
+                        
+AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [
+                        CXXFLAGS="$CXXFLAGS -stdlib=libc++"])
 
-AX_CHECK_COMPILE_FLAG([-std=c++14], [
-                        CXXFLAGS="$CXXFLAGS -std=c++14"])
+AX_CHECK_COMPILE_FLAG([-std=c++11], [
+                        CXXFLAGS="$CXXFLAGS -std=c++11"])
 
 dnl Qt
 AC_ARG_ENABLE([qt],

src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp

@@ -35,7 +35,7 @@ void PresetInputs::update(const BeatDetect & music, const PipelineContext & cont
 float **alloc_mesh(size_t gx, size_t gy)
 {
 	// round gy up to multiple 4 (for possible SSE optimization) 
-//	gy = (gy+3) & ~(size_t)3;
+	gy = (gy+3) & ~(size_t)3;
 
 	float **mesh = (float **)wipe_aligned_alloc(gx * sizeof(float *));
 	float *m = (float *)wipe_aligned_alloc(gx * gy * sizeof(float));
@@ -236,7 +236,7 @@ inline __m128 _mm_pow(__m128 x, __m128 y)
 	float X[4];
 	float Y[4];
 	_mm_store_ps(X,x);
-	_mm_store_ps(Y,x);
+	_mm_store_ps(Y,y);
 	X[0] = __builtin_powf(X[0],Y[0]);
 	X[1] = __builtin_powf(X[1],Y[1]);
 	X[2] = __builtin_powf(X[2],Y[2]);
@@ -441,11 +441,11 @@ void PresetOutputs::PerPixelMath_sse(const PipelineContext &context)
 
 void PresetOutputs::PerPixelMath(const PipelineContext &context)
 {
-//#ifdef __SSE2__
-//    PerPixelMath_sse(context);
-//#else
+#ifdef __SSE2__
+	PerPixelMath_sse(context);
+#else
 	PerPixelMath_c(context);
-//#endif
+#endif
 }
 
 

src/libprojectM/Renderer/HLSLTranslator.cpp

@@ -10,7 +10,7 @@
 using namespace M4;
 
 
-std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderType, const char *fileName, const std::string &fullSource) {
+std::string HLSLTranslator::parse(const std::string & shaderType, const char *fileName, const std::string &fullSource) {
     // alloc
     GLSLGenerator generator;
     Allocator allocator;
@@ -37,7 +37,7 @@ std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderTyp
             out2 << sourcePreprocessed;
             out2.close();
 #endif
-        return nullptr;
+            return std::string();
     }
 
     // generate GLSL
@@ -50,10 +50,10 @@ std::unique_ptr<std::string> HLSLTranslator::parse(const std::string & shaderTyp
             out2 << sourcePreprocessed;
             out2.close();
 #endif
-        return nullptr;
+        return std::string();
     }
 
-    return std::make_unique<std::string>(generator.GetResult());
+    return std::string(generator.GetResult());
 }
 
 

src/libprojectM/Renderer/HLSLTranslator.hpp

@@ -27,7 +27,7 @@
 
 class HLSLTranslator {
  public:
-    std::unique_ptr<std::string> parse(const std::string & shaderType, const char *fileName, const std::string &fullSource);
+    std::string parse(const std::string & shaderType, const char *fileName, const std::string &fullSource);
 };
 
 #endif

src/libprojectM/Renderer/PerlinNoise.cpp

@@ -11,40 +11,57 @@
 
 PerlinNoise::PerlinNoise()
 {
-	for (int x = 0; x < 256;x++)
-		for (int y = 0; y < 256;y++)
-			noise_lq[x][y] = noise(x , y);
+    for (int x = 0; x < 256;x++) {
+        for (int y = 0; y < 256;y++) {
+            noise_lq[x][y][0] = noise(x , y);
+            noise_lq[x][y][1] = noise_lq[x][y][0];
+            noise_lq[x][y][2] = noise_lq[x][y][0];
+        }
+    }
 
-	for (int x = 0; x < 32;x++)
-		for (int y = 0; y < 32;y++)
-			noise_lq_lite[x][y] = noise(4*x,16*y);
+    for (int x = 0; x < 32;x++) {
+        for (int y = 0; y < 32;y++) {
+            noise_lq_lite[x][y][0] = noise(4*x,16*y);
+            noise_lq_lite[x][y][1] = noise_lq_lite[x][y][0];
+            noise_lq_lite[x][y][2] = noise_lq_lite[x][y][0];
+        }
+    }
 
-	for (int x = 0; x < 256;x++)
-		for (int y = 0; y < 256;y++)
-			noise_mq[x][y] = InterpolatedNoise((float)x/(float)2.0,(float)y/(float)2.0);
+    for (int x = 0; x < 256;x++) {
+        for (int y = 0; y < 256;y++) {
+            noise_mq[x][y][0] = InterpolatedNoise((float)x/(float)2.0,(float)y/(float)2.0);
+            noise_mq[x][y][1] = noise_mq[x][y][0];
+            noise_mq[x][y][2] = noise_mq[x][y][0];
+        }
+    }
 
-	for (int x = 0; x < 256;x++)
-		for (int y = 0; y < 256;y++)
-			noise_hq[x][y] = InterpolatedNoise((float)x/(float)3.0,(float)y/(float)3.0);
+    for (int x = 0; x < 256;x++) {
+        for (int y = 0; y < 256;y++) {
+            noise_hq[x][y][0] = InterpolatedNoise((float)x/(float)3.0,(float)y/(float)3.0);
+            noise_hq[x][y][1] = noise_hq[x][y][0];
+            noise_hq[x][y][2] = noise_hq[x][y][0];
+        }
+    }
 
-	for (int x = 0; x < 32;x++)
-		for (int y = 0; y < 32;y++)
-			for (int z = 0; z < 32;z++)
-				noise_lq_vol[x][y][z] = noise(x,y,z);
+    for (int x = 0; x < 32;x++) {
+        for (int y = 0; y < 32;y++) {
+            for (int z = 0; z < 32;z++) {
+                noise_lq_vol[x][y][z][0] = noise(x,y,z);
+                noise_lq_vol[x][y][z][1] = noise_lq_vol[x][y][z][0];
+                noise_lq_vol[x][y][z][2] = noise_lq_vol[x][y][z][0];
+            }
+        }
+    }
 
-	for (int x = 0; x < 32;x++)
-		for (int y = 0; y < 32;y++)
-			for (int z = 0; z < 32;z++)
-				noise_hq_vol[x][y][z] = noise(x,y,z);//perlin_noise_3d(x,y,z,6121,7,seed3,0.5,64);
-
-	int seed = rand()%1000;
-
-	int size = 512;
-	int octaves = sqrt((double)size);
-
-		for (int x = 0; x < size;x++)
-			for (int y = 0; y < size;y++)
-				noise_perlin[x][y] = perlin_noise_2d(x,y,6321,octaves,seed,0.5,size/4);
+    for (int x = 0; x < 32;x++) {
+        for (int y = 0; y < 32;y++) {
+            for (int z = 0; z < 32;z++) {
+                noise_hq_vol[x][y][z][0] = noise(x,y,z);
+                noise_hq_vol[x][y][z][1] = noise_hq_vol[x][y][z][0];
+                noise_hq_vol[x][y][z][2] = noise_hq_vol[x][y][z][0];
+            }
+        }
+    }
 }
 
 PerlinNoise::~PerlinNoise()

src/libprojectM/Renderer/PerlinNoise.hpp

@@ -14,13 +14,12 @@ class PerlinNoise
 {
 public:
 
-	float noise_lq[256][256];
-	float noise_lq_lite[32][32];
-	float noise_mq[256][256];
-	float noise_hq[256][256];
-	float noise_perlin[512][512];
-	float noise_lq_vol[32][32][32];
-	float noise_hq_vol[32][32][32];
+    float noise_lq[256][256][3];
+    float noise_lq_lite[32][32][3];
+    float noise_mq[256][256][3];
+    float noise_hq[256][256][3];
+    float noise_lq_vol[32][32][32][3];
+    float noise_hq_vol[32][32][32][3];
 
 
 	PerlinNoise();
@@ -46,14 +45,6 @@ class PerlinNoise
 		 return noise(n);
 	}
 
-	static inline float cos_interp(float a, float b, float x)
-	{
-		float ft = x * 3.1415927;
-		float f = (1 - cos(ft)) * .5;
-
-		return  a*(1-f) + b*f;
-	}
-
 	static inline float cubic_interp(float v0, float v1, float v2, float v3, float x)
 	{
 		float P = (v3 - v2) - (v0 - v1);
@@ -100,53 +91,6 @@ class PerlinNoise
 
 	}
 
-	static inline float perlin_octave_2d(float x,float y, int width, int seed, float period)
-	{
-
-	           float freq=1/(float)(period);
-
-	           int num=(int)(width*freq);
-	           int step_x=(int)(x*freq);
-	           int step_y=(int)(y*freq);
-	           float zone_x=x*freq-step_x;
-	           float zone_y=y*freq-step_y;
-	           int box=step_x+step_y*num;
-	           int noisedata=(box+seed);
-
-	           float u=cubic_interp(noise(noisedata-num-1),noise(noisedata-num),noise(noisedata-num+1),noise(noisedata-num+2),zone_x);
-	           float a=cubic_interp(noise(noisedata-1),noise(noisedata),noise(noisedata+1),noise(noisedata+2),zone_x);
-	           float b=cubic_interp(noise(noisedata+num -1),noise(noisedata+num),noise(noisedata+1+num),noise(noisedata+2+num),zone_x);
-	           float v=cubic_interp(noise(noisedata+2*num -1),noise(noisedata+2*num),noise(noisedata+1+2*num),noise(noisedata+2+2*num),zone_x);
-
-	           float value=cubic_interp(u,a,b,v,zone_y);
-
-	          return value;
-	}
-
-
-	static inline float perlin_octave_2d_cos(float x,float y, int width, int seed, float period)
-		{
-
-		           float freq=1/(float)(period);
-
-		           int num=(int)(width*freq);
-		           int step_x=(int)(x*freq);
-		           int step_y=(int)(y*freq);
-		           float zone_x=x*freq-step_x;
-		           float zone_y=y*freq-step_y;
-		           int box=step_x+step_y*num;
-		           int noisedata=(box+seed);
-
-		           float a=cos_interp(noise(noisedata),noise(noisedata+1),zone_x);
-		           float b=cos_interp(noise(noisedata+num),noise(noisedata+1+num),zone_x);
-
-		           float value=cos_interp(a,b,zone_y);
-
-		          return value;
-		}
-
-
-
 	static inline float perlin_octave_3d(float x,float y, float z,int width, int seed, float period)
 		{
 		           float freq=1/(float)(period);
@@ -204,21 +148,6 @@ class PerlinNoise
 		}
 
 
-	static inline float perlin_noise_2d(int x, int y,  int width, int octaves, int seed, float persistance, float basePeriod)
-		{
-			float p = persistance;
-			float val = 0.0;
-
-			for (int i = 0; i<octaves;i++)
-			{
-				val += perlin_octave_2d_cos(x,y,width,seed,basePeriod) * p;
-
-				basePeriod *= 0.5;
-				p *= persistance;
-			}
-			return val;
-		}
-
 	static inline float perlin_noise_3d(int x, int y, int z, int width, int octaves, int seed, float persistance, float basePeriod)
 		{
 			float p = persistance;