parameter legacyCellFunctionMuscleNoActivityReset removed

chrxh · Nov 8, 2024 · 6d7e27e · 6d7e27e
1 parent b37b015
commit 6d7e27e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/source/EngineGpuKernels/MuscleProcessor.cuh b/source/EngineGpuKernels/MuscleProcessor.cuh
@@ -118,10 +118,6 @@ __device__ __inline__ void MuscleProcessor::movement(SimulationData& data, Simul
     cell->vel += direction;
     cell->cellFunctionData.muscle.lastMovementX = direction.x;
     cell->cellFunctionData.muscle.lastMovementY = direction.y;
-    if (!(cudaSimulationParameters.features.legacyModes && cudaSimulationParameters.legacyCellFunctionMuscleNoActivityReset)) {
-        activity.channels[0] = 0;
-        activity.origin = ActivityOrigin_Unknown;
-    }
     cell->releaseLock();
     statistics.incNumMuscleActivities(cell->color);
 }

diff --git a/source/EngineInterface/SimulationParameters.cpp b/source/EngineInterface/SimulationParameters.cpp
@@ -209,7 +209,6 @@ bool SimulationParameters::operator==(SimulationParameters const& other) const
         && cellFunctionMuscleMovementTowardTargetedObject == other.cellFunctionMuscleMovementTowardTargetedObject
         && legacyCellFunctionMuscleMovementAngleFromSensor == other.legacyCellFunctionMuscleMovementAngleFromSensor
         && muscleMovementVisualization == other.muscleMovementVisualization
-        && legacyCellFunctionMuscleNoActivityReset == other.legacyCellFunctionMuscleNoActivityReset
         && externalEnergyInflowOnlyForNonSelfReplicators == other.externalEnergyInflowOnlyForNonSelfReplicators
         && externalEnergyBackflowLimit == other.externalEnergyBackflowLimit
         ;

diff --git a/source/EngineInterface/SimulationParameters.h b/source/EngineInterface/SimulationParameters.h
@@ -210,7 +210,6 @@ struct SimulationParameters
     float cellFunctionDetonatorActivityThreshold = 0.1f;
 
     bool legacyCellFunctionMuscleMovementAngleFromSensor = false;
-    bool legacyCellFunctionMuscleNoActivityReset = false;
 
     bool operator==(SimulationParameters const& other) const;
     bool operator!=(SimulationParameters const& other) const { return !operator==(other); }

diff --git a/source/Gui/SimulationParametersWindow.cpp b/source/Gui/SimulationParametersWindow.cpp
@@ -1610,14 +1610,6 @@ void SimulationParametersWindow::processBase()
                                      "movement angle directly from a connected (or connected-connected) sensor cell that has previously detected a target "
                                      "(legacy behavior). If deactivated, the input signal must only originate from a sensor cell and must not be adjacent (new behavior)."),
                         parameters.legacyCellFunctionMuscleMovementAngleFromSensor);
-                    AlienImGui::Checkbox(
-                        AlienImGui::CheckboxParameters()
-                            .name("No activity reset in muscles")
-                            .textWidth(RightColumnWidth)
-                            .defaultValue(origParameters.legacyCellFunctionMuscleNoActivityReset)
-                            .tooltip("If activated, the activity in channel #0 is not set to 0 in muscle cells which are in movement mode. Thus the output of this type "
-                                     "of muscles can be reused for other muscle cells."),
-                        parameters.legacyCellFunctionMuscleNoActivityReset);
                     AlienImGui::EndTreeNode();
                 }
             }

diff --git a/source/PersisterInterface/AuxiliaryDataParserService.cpp b/source/PersisterInterface/AuxiliaryDataParserService.cpp
@@ -658,12 +658,6 @@ namespace
             defaultParameters.legacyCellFunctionMuscleMovementAngleFromSensor,
             "simulation parameters.legacy.cell.function.muscle.movement angle from sensor",
             parserTask);
-        ParameterParser::encodeDecode(
-            tree,
-            parameters.legacyCellFunctionMuscleNoActivityReset,
-            defaultParameters.legacyCellFunctionMuscleNoActivityReset,
-            "simulation parameters.legacy.cell.function.muscle.no activity reset",
-            parserTask);
 
         //particle sources
         ParameterParser::encodeDecode(

diff --git a/source/PersisterInterface/LegacyAuxiliaryDataParserService.cpp b/source/PersisterInterface/LegacyAuxiliaryDataParserService.cpp
@@ -172,7 +172,6 @@ void LegacyAuxiliaryDataParserService::activateParametersAndFeaturesForLegacyFil
     //parameter conversion for v4.10.2 and below
     if (programVersion.empty()) {
         parameters.features.legacyModes = true;
-        parameters.legacyCellFunctionMuscleNoActivityReset = true;
     }
 
     //*******************