Filter by length (etternagame#105)

* Length filter

* Fix highest only length filtering

Author: nico-abram

Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/filters.lua

@@ -14,7 +14,7 @@ local frameHeight = 350
 local offsetX = 10
 local offsetY = 20
 local activebound = 0
-for i=1,#ms.SkillSets do 
+for i=1,#ms.SkillSets+1 do 
 	SSQuery[0][i] = "0"
 	SSQuery[1][i] = "0"
 end
@@ -37,7 +37,7 @@ local function FilterInput(event)
 						SSQuery[activebound][ActiveSS] = ""
 					end
 					SSQuery[activebound][ActiveSS] = SSQuery[activebound][ActiveSS]..numbershers[i]
-					if #SSQuery[activebound][ActiveSS] > 2 then 
+					if (ActiveSS < #ms.SkillSets+1 and #SSQuery[activebound][ActiveSS] > 2) or #SSQuery[activebound][ActiveSS] > 3 then 
 						SSQuery[activebound][ActiveSS] = numbershers[i]
 					end
 				end
@@ -273,12 +273,12 @@ local function CreateFilterInputBox(i)
 				self:addx(10):addy(175 + (i-1)*spacingY):halign(0):zoom(textzoom)
 			end,
 			SetCommand=function(self)
-				self:settext( ms.SkillSets[i])
+				self:settext( i == (#ms.SkillSets+1) and "Length" or ms.SkillSets[i])
 			end	
 		},
 		Def.Quad{
 			InitCommand=function(self)
-				self:addx(150):addy(175 + (i-1)*spacingY):zoomto(18,18):halign(1)
+				self:addx(i == (#ms.SkillSets+1) and 159 or 150):addy(175 + (i-1)*spacingY):zoomto(i == (#ms.SkillSets+1) and 27 or 18,18):halign(1)
 			end,
 			MouseLeftClickMessageCommand=function(self)
 				if isOver(self) and active then
@@ -308,7 +308,7 @@ local function CreateFilterInputBox(i)
 		},
 		LoadFont("Common Large")..{
 			InitCommand=function(self)
-				self:addx(150):addy(175 + (i-1)*spacingY):halign(1):maxwidth(40):zoom(textzoom)
+				self:addx(i == (#ms.SkillSets+1) and 159 or 150):addy(175 + (i-1)*spacingY):halign(1):maxwidth(60):zoom(textzoom)
 			end,
 			SetCommand=function(self)
 				local fval = FILTERMAN:GetSSFilter(i,0)				-- lower bounds
@@ -328,7 +328,7 @@ local function CreateFilterInputBox(i)
 		},
 		Def.Quad{
 			InitCommand=function(self)
-				self:addx(175):addy(175 + (i-1)*spacingY):zoomto(18,18):halign(1)
+				self:addx(i == (#ms.SkillSets+1) and 193 or 175):addy(175 + (i-1)*spacingY):zoomto(i == (#ms.SkillSets+1) and 27 or 18,18):halign(1)
 			end,
 			MouseLeftClickMessageCommand=function(self)
 				if isOver(self) and active then
@@ -358,7 +358,7 @@ local function CreateFilterInputBox(i)
 		},
 		LoadFont("Common Large")..{
 			InitCommand=function(self)
-				self:addx(175):addy(175 + (i-1)*spacingY):halign(1):maxwidth(40):zoom(textzoom)
+				self:addx(i == (#ms.SkillSets+1) and 193 or 175):addy(175 + (i-1)*spacingY):halign(1):maxwidth(60):zoom(textzoom)
 			end,
 			SetCommand=function(self)
 				local fval = FILTERMAN:GetSSFilter(i,1)				-- upper bounds
@@ -408,8 +408,7 @@ f[#f+1] = LoadFont("Common Large") .. {
         end
     }
 
-for i=1,#ms.SkillSets do 
+for i=1,(#ms.SkillSets+1) do 
 	f[#f+1] = CreateFilterInputBox(i)
 end
-
 return f

src/FilterManager.cpp

@@ -49,15 +49,15 @@ void FilterManager::SetSSFilter(float v, Skillset ss, int bound) {
 
 // reset button for filters
 void FilterManager::ResetSSFilters() {
-	FOREACH_ENUM(Skillset, ss) {
+	for (int ss = 0; ss < NUM_Skillset + 1; ss++) {
 		SSFilterLowerBounds[ss] = 0;
 		SSFilterUpperBounds[ss] = 0;
 	}
 }
 
 // tmp filter stuff - mina
 bool FilterManager::AnyActiveFilter() {
-	FOREACH_ENUM(Skillset, ss) {
+	for(int ss=0; ss < NUM_Skillset + 1; ss++) {
 		if (SSFilterLowerBounds[ss] > 0)
 			return true;
 		if (SSFilterUpperBounds[ss] > 0)

src/FilterManager.h

@@ -11,8 +11,8 @@ class FilterManager {
 
 	PlayerState* m_pPlayerState[NUM_PLAYERS];
 
-	float SSFilterLowerBounds[NUM_Skillset];
-	float SSFilterUpperBounds[NUM_Skillset];
+	float SSFilterLowerBounds[NUM_Skillset+1];
+	float SSFilterUpperBounds[NUM_Skillset+1];
 	float MaxFilterRate = 1.f;
 	bool ExclusiveFilter = false;	// if true the filter system will only match songs that meet all criteria rather than all that meet any - mina
 	float GetSSFilter(Skillset ss, int bound);

src/MusicWheel.cpp

@@ -514,7 +514,7 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 	if (!FILTERMAN->ExclusiveFilter) {
 		for (size_t i = 0; i < inv.size(); i++) {
 			bool addsong = false;
-			FOREACH_ENUM(Skillset, ss) {
+			for (int ss = 0; ss < NUM_Skillset + 1; ss++) {
 				float lb = FILTERMAN->SSFilterLowerBounds[ss];
 				float ub = FILTERMAN->SSFilterUpperBounds[ss];
 				if (lb > 0.f || ub > 0.f) {				// if either bound is active, continue to evaluation
@@ -523,10 +523,15 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 					do {
 						currate = currate - 0.1f;
 						if (FILTERMAN->HighestSkillsetsOnly)
-							if (!inv[i]->IsSkillsetHighestOfAnySteps(ss, currate))
+							if (!inv[i]->IsSkillsetHighestOfAnySteps(static_cast<Skillset>(ss), currate) && ss < NUM_Skillset)
 								continue;
-
-						float val = inv[i]->GetHighestOfSkillsetAllSteps(static_cast<int>(ss), currate);
+						float val;
+						if (ss < NUM_Skillset)
+							val = inv[i]->GetHighestOfSkillsetAllSteps(ss, currate);
+						else {
+							TimingData* td = inv[i]->GetAllSteps()[0]->GetTimingData();
+							val = (td->GetElapsedTimeFromBeat(inv[i]->GetLastBeat()) - td->GetElapsedTimeFromBeat(inv[i]->GetFirstBeat()));
+						}
 
 						bool isrange = lb > 0.f && ub > 0.f;	// both bounds are active and create an explicit range
 						if (isrange) {
@@ -542,7 +547,6 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 					} while (currate > minrate);
 				}
 			}
-
 			// only add the song if it's cleared the gauntlet
 			if (addsong)
 				tmp.emplace_back(inv[i]);
@@ -551,7 +555,7 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 	else {
 		for (size_t i = 0; i < inv.size(); i++) {
 			bool addsong = true;
-			FOREACH_ENUM(Skillset, ss) {
+			for (int ss = 0; ss < NUM_Skillset + 1; ss++) {
 				bool pineapple = true;
 				float lb = FILTERMAN->SSFilterLowerBounds[ss];
 				float ub = FILTERMAN->SSFilterUpperBounds[ss];
@@ -563,7 +567,13 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 					do {
 						localaddsong = true;
 						currate = currate - 0.1f;
-						float val = inv[i]->GetHighestOfSkillsetAllSteps(static_cast<int>(ss), currate);
+						float val;
+						if (ss < NUM_Skillset)
+							val = inv[i]->GetHighestOfSkillsetAllSteps(ss, currate);
+						else {
+							TimingData* td = inv[i]->GetAllSteps()[0]->GetTimingData();
+							val = (td->GetElapsedTimeFromBeat(inv[i]->GetLastBeat()) - td->GetElapsedTimeFromBeat(inv[i]->GetFirstBeat()));
+						}
 						bool isrange = lb > 0.f && ub > 0.f;
 						if (isrange) {
 							if (val < lb || val > ub)
@@ -581,7 +591,6 @@ void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 				}
 				addsong = addsong && pineapple;
 			}
-			
 			if (addsong)
 				tmp.emplace_back(inv[i]);
 		}