diff --git a/src/NativePresets/MstressJuppyDancer.cpp b/src/NativePresets/MstressJuppyDancer.cpp index 055cc840f..d19210511 100644 --- a/src/NativePresets/MstressJuppyDancer.cpp +++ b/src/NativePresets/MstressJuppyDancer.cpp @@ -74,7 +74,7 @@ public: float mi = min(above(middiff,0)*middiff*.005,.11); mi2_prg = mi2_prg+mi; - gam = abs(gam-above(mi2_prg,5)); + gam = std::abs(gam-above(mi2_prg,5)); mi2_prg= if_milk(above(mi2_prg,5),0,mi2_prg); float s = context.sample_int; @@ -182,7 +182,7 @@ public: middiff = (music.mid - meanmid)*15; float mi = min(above(middiff,0)*middiff*.005,.11); mi_prg = mi_prg+mi; - gam = abs(gam-above(mi_prg,.5)); + gam = std::abs(gam-above(mi_prg,.5)); mi_prg= if_milk(above(mi_prg,.5),0,mi_prg); q1 = gam; bass = music.bass; diff --git a/src/NativePresets/RovastarDriftingChaos.cpp b/src/NativePresets/RovastarDriftingChaos.cpp index d5bb16603..07ab01c7d 100644 --- a/src/NativePresets/RovastarDriftingChaos.cpp +++ b/src/NativePresets/RovastarDriftingChaos.cpp @@ -70,15 +70,15 @@ public: xamptarg = if_milk(equal(context.frame%15,0),min(0.5*volume*music.bass_att,0.5),xamptarg); xamp = xamp + 0.5*(xamptarg-xamp); - xdir = if_milk(above(abs(xpos),xamp),-sign(xpos),if_milk(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); - xspeed += xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); + xdir = if_milk(above(std::abs(xpos),xamp),-sign(xpos),if_milk(below(std::abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); + xspeed += xdir*xamp - xpos - xspeed*0.055*below(std::abs(xpos),xamp); xpos = xpos + 0.001*xspeed; dx = xpos*0.005; yamptarg = if_milk(equal(context.frame%15,0),min(0.3*volume*music.treb_att,0.5),yamptarg); yamp += 0.5*(yamptarg-yamp); - ydir = if_milk(above(abs(ypos),yamp),-sign(ypos),if_milk(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); + ydir = if_milk(above(std::abs(ypos),yamp),-sign(ypos),if_milk(below(std::abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); - yspeed += ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); + yspeed += ydir*yamp - ypos - yspeed*0.055*below(std::abs(ypos),yamp); ypos = ypos + 0.001*yspeed; dy = ypos*0.005; diff --git a/src/NativePresets/RovastarFractalSpiral.cpp b/src/NativePresets/RovastarFractalSpiral.cpp index 19f5c4fac..9fb73ca0b 100644 --- a/src/NativePresets/RovastarFractalSpiral.cpp +++ b/src/NativePresets/RovastarFractalSpiral.cpp @@ -54,8 +54,8 @@ public: virtual PixelPoint PerPixel(PixelPoint p, const PerPixelContext context) { float q1 = 8.05+(sin(p.x+0.137*time)-cos(p.y+0.213*time)); - int val1 = abs(p.x*3-0.4*sin(q1)); - int val2 = abs(p.y*3+0.4*sin(q1)); + int val1 = std::abs(p.x*3-0.4*sin(q1)); + int val2 = std::abs(p.y*3+0.4*sin(q1)); val1 = val1%2; val2 = val2%2;