Bug fix undefined projections

Add checks if projection exists
MoonModules · Jun 23, 2024 · e525582 · e525582
1 parent 9f49e6a
commit e525582
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/App/LedFixture.cpp b/src/App/LedFixture.cpp
@@ -102,12 +102,15 @@ void Fixture::projectAndMap() {
               if (sizeAdjusted.y > 1) leds->projectionDimension++;
               if (sizeAdjusted.z > 1) leds->projectionDimension++;
 
-              Projection *projection = projections[leds->projectionNr];
+              Projection *projection = nullptr;
+              if (leds->projectionNr < projections.size())
+                projection = projections[leds->projectionNr];
+
               mdl->getValueRowNr = rowNr; //run projection functions in the right rowNr context
 
               Coord3D proCenter = mdl->getValue("proCenter", rowNr);
 
-              projection->adjustSizeAndPixel(sizeAdjusted, pixelAdjusted, proCenter);
+              if (projection) projection->adjustSizeAndPixel(sizeAdjusted, pixelAdjusted, proCenter);
 
               if (leds->size == Coord3D{0,0,0}) { // first
                 ppf("projectAndMap first leds[%d] size:%d,%d,%d s:%d,%d,%d e:%d,%d,%d\n", rowNr, sizeAdjusted.x, sizeAdjusted.y, sizeAdjusted.z, startPosAdjusted.x, startPosAdjusted.y, startPosAdjusted.z, endPosAdjusted.x, endPosAdjusted.y, endPosAdjusted.z);
@@ -127,7 +130,7 @@ void Fixture::projectAndMap() {
 
                   mapped = pixelAdjusted;
 
-                  projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
+                  if (projection) projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
 
                   mapped.x = mapped.distance(proCenter);
                   mapped.y = 0;
@@ -185,7 +188,7 @@ void Fixture::projectAndMap() {
                       break;
                   }
 
-                  projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
+                  if (projection) projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
 
                   indexV = leds->XYZUnprojected(mapped);
                   break;
@@ -216,7 +219,7 @@ void Fixture::projectAndMap() {
                       break;
                   }
 
-                  projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
+                  if (projection) projection->adjustMapped(mapped, sizeAdjusted, (pixel - startPosAdjusted)/10);
 
                   indexV = leds->XYZUnprojected(mapped);
 

diff --git a/src/App/LedLeds.cpp b/src/App/LedLeds.cpp
@@ -31,7 +31,7 @@ unsigned16 Leds::XYZ(Coord3D pixel) {
   //as this is a call to a virtual function it reduces the theoretical (no show) speed by half, even if XYZ is not implemented
   //  the real speed is hardly affected, but room for improvement!
   //  so as a workaround we list them here explicetly
-  if (projectionNr == p_TiltPanRoll || projectionNr == p_Preset1)
+  if ((projectionNr == p_TiltPanRoll || projectionNr == p_Preset1) && projectionNr < fixture->projections.size())
     fixture->projections[projectionNr]->adjustXYZ(*this, pixel);
 
   return XYZUnprojected(pixel);

diff --git a/src/App/LedModEffects.h b/src/App/LedModEffects.h
@@ -239,12 +239,14 @@ class LedModEffects:public SysModule {
 
           stackUnsigned8 proValue = mdl->getValue(var, rowNr);
           leds->projectionNr = proValue;
-          Projection* projection = fixture.projections[proValue];
-
-          mdl->varPreDetails(var, rowNr); //set all positive var N orders to negative
-          projection->controls(*leds, var);
-          mdl->varPostDetails(var, rowNr);
+
+          if (proValue < fixture.projections.size()) {
+            Projection* projection = fixture.projections[proValue];
 
+            mdl->varPreDetails(var, rowNr); //set all positive var N orders to negative
+            projection->controls(*leds, var);
+            mdl->varPostDetails(var, rowNr);
+          }
           // ppf("chFun pro[%d] <- %d (%d)\n", rowNr, proValue, fixture.listOfLeds.size());
 
           fixture.doMap = true;