handle filter logic depending on filtermode

etternagame · Jan 14, 2017 · af0ece8 · af0ece8
1 parent 9686b5e
commit af0ece8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/src/GameState.cpp b/src/GameState.cpp
@@ -180,8 +180,6 @@ GameState::GameState() :
 	// filter stuff - mina
 	ZERO( SSFilterLowerBounds );
 	ZERO( SSFilterUpperBounds );
-	MaxFilterRate = 1.f;
-	FilterMode = 0;
 
 	// Register with Lua.
 	{
@@ -3289,15 +3287,14 @@ class LunaGameState: public Luna<GameState>
 		return 1;
 	}
 	static int ToggleFilterMode(T* p, lua_State* L) {
-		if (p->FilterMode == 1)
-			p->FilterMode = 0;
-		else
-			p->FilterMode = 1;
+		p->ExclusiveFilter = !p->ExclusiveFilter;
 		return 1;
+
 	}
 	static int GetFilterMode(T* p, lua_State* L) {
-		lua_pushnumber(L, p->FilterMode);
+		lua_pushboolean(L, p->ExclusiveFilter);
 		return 1;
+
 	}
 
 	LunaGameState()

diff --git a/src/GameState.h b/src/GameState.h
@@ -246,8 +246,8 @@ class GameState
 	// todo: make a filterman or something - mina
 	float SSFilterLowerBounds[NUM_Skillset];
 	float SSFilterUpperBounds[NUM_Skillset];
-	float MaxFilterRate;
-	int FilterMode;		// 0 = OR 1 = AND
+	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);
 	void SetSSFilter(float v, Skillset ss, int bound);
 

diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
@@ -589,19 +589,37 @@ void MusicWheel::FilterBySearch(vector<Song*>& inv, RString findme) {
 
 void MusicWheel::FilterBySkillsets(vector<Song*>& inv) {
 	vector<Song*> tmp;
-	for (size_t i = 0; i < inv.size(); i++) {
-		bool addsong = false;
-		FOREACH_ENUM(Skillset, ss) {
-			float lb = GAMESTATE->SSFilterLowerBounds[ss];
-			if (lb > 0.f) {
-				float val = inv[i]->GetHighestOfSkillsetAllSteps(static_cast<int>(ss), GAMESTATE->MaxFilterRate);
-				if (val > lb)
-					addsong = addsong || true;
+	if (!GAMESTATE->ExclusiveFilter) {
+		for (size_t i = 0; i < inv.size(); i++) {
+			bool addsong = false;
+			FOREACH_ENUM(Skillset, ss) {
+				float lb = GAMESTATE->SSFilterLowerBounds[ss];
+				if (lb > 0.f) {
+					float val = inv[i]->GetHighestOfSkillsetAllSteps(static_cast<int>(ss), GAMESTATE->MaxFilterRate);
+					if (val > lb)
+						addsong = addsong || true;
+				}
+			}
+			if (addsong)
+				tmp.emplace_back(inv[i]);
+		}
+	}
+	else {
+		for (size_t i = 0; i < inv.size(); i++) {
+			bool addsong = true;
+			FOREACH_ENUM(Skillset, ss) {
+				float lb = GAMESTATE->SSFilterLowerBounds[ss];
+				if (lb > 0.f) {
+					float val = inv[i]->GetHighestOfSkillsetAllSteps(static_cast<int>(ss), GAMESTATE->MaxFilterRate);
+					if (val < lb)
+						addsong = false;
+				}
 			}
+			if (addsong)
+				tmp.emplace_back(inv[i]);
 		}
-		if (addsong == true)
-			tmp.emplace_back(inv[i]);
 	}
+
 	inv.swap(tmp);
 }