Revert incorrect gamma correction changes to loadCustomPalettes

Co-authored-by: softhack007 <91616163+softhack007@users.noreply.github.com>

usermods/audioreactive/audio_reactive.cpp

@@ -6,6 +6,10 @@
 #include <driver/i2s.h>
 #include <driver/adc.h>
 
+#ifdef WLED_ENABLE_DMX
+  #error This audio reactive usermod is not compatible with DMX Out.
+#endif
+
 #endif
 
 #if defined(ARDUINO_ARCH_ESP32) && (defined(WLED_DEBUG) || defined(SR_DEBUG))

usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.cpp

@@ -401,7 +401,7 @@ void RotaryEncoderUIUsermod::sortModesAndPalettes() {
   re_sortModes(modes_qstrings, modes_alpha_indexes, strip.getModeCount(), MODE_SORT_SKIP_COUNT);
 
   DEBUG_PRINT(F("Sorting palettes: ")); DEBUG_PRINT(getPaletteCount()); DEBUG_PRINT('/'); DEBUG_PRINTLN(customPalettes.size());
-  palettes_qstrings = re_findModeStrings(JSON_palette_names, getPaletteCount() + 1); // +1 for default palette
+  palettes_qstrings = re_findModeStrings(JSON_palette_names, getPaletteCount());
   palettes_alpha_indexes = re_initIndexArray(getPaletteCount());
   if (customPalettes.size()) {
     for (int i=0; i<customPalettes.size(); i++) {

wled00/FX.cpp

@@ -9861,6 +9861,7 @@ uint16_t mode_particleFireworks1D(void) {
   uint8_t *forcecounter;
 
   if (SEGMENT.call == 0) { // initialization
+    if (!initParticleSystem1D(PartSys, 4, 150, 4, true)) // init advanced particle system
     if (!initParticleSystem1D(PartSys, 4, 150, 4, true)) // init advanced particle system
       return mode_static(); // allocation failed or is single pixel
     PartSys->setKillOutOfBounds(true);

wled00/FXparticleSystem.cpp

@@ -185,16 +185,8 @@ int32_t ParticleSystem2D::sprayEmit(const PSsource &emitter) {
       emitIndex = 0;
     if (particles[emitIndex].ttl == 0) { // find a dead particle
       success = true;
-      int32_t dx = hw_random16(emitter.var << 1) - emitter.var;
-      int32_t dy = hw_random16(emitter.var << 1) - emitter.var;
-      if (emitter.var > 5) { // use circular random distribution for large variance to generate nicer "explosions"
-        while (dx*dx + dy*dy > emitter.var*emitter.var) { // reject points outside circle
-            dx = hw_random16(emitter.var << 1) - emitter.var;
-            dy = hw_random16(emitter.var << 1) - emitter.var;
-        }
-      }
-      particles[emitIndex].vx = emitter.vx + dx;
-      particles[emitIndex].vy = emitter.vy + dy;
+      particles[emitIndex].vx = emitter.vx + hw_random16(emitter.var << 1) - emitter.var; // random(-var, var)
+      particles[emitIndex].vy = emitter.vy + hw_random16(emitter.var << 1) - emitter.var; // random(-var, var)
       particles[emitIndex].x = emitter.source.x;
       particles[emitIndex].y = emitter.source.y;
       particles[emitIndex].hue = emitter.source.hue;
@@ -969,47 +961,51 @@ void WLED_O2_ATTR ParticleSystem2D::collideParticles(PSparticle &particle1, PSpa
       particle2.vy = ((int32_t)particle2.vy * coeff) / 255;
       #endif
     }
-  }
+
     // particles have volume, push particles apart if they are too close
-    // tried lots of configurations, what works best is to give one particle a little velocity. When adding hard pushing things tend to oscillate.
-    // when hard pushing by offsetting position without velocity, they tend to sink into each other under gravity.
-    // when using hard-pushing and velocity, there are some oscillations and softer particles do not pile nicely.
-    // oscillation get worse if pushing both particles so one is chosen somewhat randomly.
-    // softer collisions are not perfect on purpose: soft particles should pile up and overlap slightly, if separation is made perfect, it does not have the intended look
-
-    if (distanceSquared < collDistSq && (relativeVx*relativeVx + relativeVy*relativeVy < 50)) { // too close and also slow, push them apart
+    // tried lots of configurations, it works best if given a little velocity, it tends to oscillate less this way
+    // when hard pushing by offsetting position, they sink into each other under gravity
+    // a problem with giving velocity is, that on harder collisions, this adds up as it is not dampened enough, so add friction in the FX if required
+    if (distanceSquared < collDistSq && dotProduct > -250) { // too close and also slow, push them apart
       bool fairlyrandom = dotProduct & 0x01; //dotprouct LSB should be somewhat random, so no need to calculate a random number
-      int32_t pushamount = 1 + ((collDistSq - distanceSquared) >> 13); // found this by experimentation: it means push by 1, push more if overlapping more than 1.4 physical pixels (i.e. larger particles only)
-      int8_t pushx = dx > 0 ? -pushamount : pushamount; // particle 1 is on the left
-      int8_t pushy = dy > 0 ? -pushamount : pushamount; // particle 1 is below particle 2
-
-      // if they are very soft, stop slow particles completely to make them stick to each other
-      if (collisionHardness < 5) {
-        if (fairlyrandom) { // do not stop them every frame to avoid groups of particles hanging mid-air
-          particle1.vx = 0;
-          particle1.vy = 0;
-          particle2.vx = 0;
-          particle2.vy = 0;
-          // hard-push particle 1 only: if both are pushed, this oscillates ever so slightly
-          particle1.x += pushx;
-          particle1.y += pushy;
-        }
+      int32_t pushamount = 1 + ((250 + dotProduct) >> 6); // the closer dotproduct is to zero, the closer the particles are
+      int32_t push = 0;
+      if (dx < 0)  // particle 1 is on the right
+        push = pushamount;
+      else if (dx > 0)
+        push = -pushamount;
+      else { // on the same x coordinate, shift it a little so they do not stack
+        if (fairlyrandom)
+          particle1.x++; // move it so pile collapses
+        else
+          particle1.x--;
       }
-      else {
-        if (fairlyrandom) {
-          particle1.vx += pushx;
-          //particle1.x += pushx;
-          particle1.vy += pushy;
-          //particle1.y += pushy;
-        }
-        else {
-          particle2.vx -= pushx;
-          //particle2.x -= pushx;
-          particle2.vy -= pushy;
-          //particle2.y -= pushy;
-        }
+      particle1.vx += push;
+      push = 0;
+      if (dy < 0)
+        push = pushamount;
+      else if (dy > 0)
+        push = -pushamount;
+      else { // dy==0
+        if (fairlyrandom)
+          particle1.y++; // move it so pile collapses
+        else
+          particle1.y--;
+      }
+      particle1.vy += push;
+
+      // note: pushing may push particles out of frame, if bounce is active, it will move it back as position will be limited to within frame, if bounce is disabled: bye bye
+      if (collisionHardness < 5) { // if they are very soft, stop slow particles completely to make them stick to each other
+        particle1.vx = 0;
+        particle1.vy = 0;
+        particle2.vx = 0;
+        particle2.vy = 0;
+        //push them apart
+        particle1.x += push;
+        particle1.y += push;
       }
     }
+  }
 }
 
 // update size and pointers (memory location and size can change dynamically)