Updated

.vscode/c_cpp_properties.json

@@ -3,8 +3,7 @@
         {
             "name": "Win32",
             "includePath": [
-                "${workspaceFolder}/**",
-                "/include"
+                "${workspaceFolder}/**"
             ],
             "defines": [
                 "_DEBUG",

GiroflexVSL/Mod.cpp

@@ -26,7 +26,7 @@ extern RpClump* (*RpClumpForAllAtomics)(RpClump* clump, RpAtomicCallBack callbac
 extern RpGeometry* (*RpGeometryForAllMaterials)(RpGeometry* geometry, RpMaterialCallBack fpCallBack, void* pData);
 extern char* (*GetFrameNodeName)(RwFrame* frame);
 
-const char* Mod::m_Version = "3.7.3";
+const char* Mod::m_Version = "3.8.0";
 
 bool canTurnSirenOn = true;
 bool canTurnPanelOn = true;

GiroflexVSL/Pattern.h

@@ -2,11 +2,19 @@
 
 #include "pch.h"
 
+#include "Log.h"
+
 #include <vector>
 
 struct PatternStep {
 	std::vector<int> data;
 	int duration = 0;
+
+	bool useCustomColor = false;
+	CRGBA customColor = CRGBA(255, 0, 0);
+
+	bool useCustomLedColor = false;
+	CRGBA customLedColor = CRGBA(255, 0, 0);
 };
 
 class Pattern {
@@ -62,6 +70,12 @@ class Pattern {
 				stepValue["data"].append(d);
 			}
 
+			stepValue["useCustomColor"] = step->useCustomColor;
+			stepValue["customColor"] = ColorToJSON(step->customColor);
+
+			stepValue["useCustomLedColor"] = step->useCustomLedColor;
+			stepValue["customLedColor"] = ColorToJSON(step->customLedColor);
+
 			value["steps"].append( stepValue );
 		}
 
@@ -72,19 +86,25 @@ class Pattern {
 	{
 		for (int step_i = 0; step_i < (int)value["steps"].size(); step_i++)
 		{
-			Json::Value step = value["steps"][step_i];
+			Json::Value stepValue = value["steps"][step_i];
 
-			int duration = step["duration"].asInt();
+			int duration = stepValue["duration"].asInt();
 
 			if (duration <= 0) continue;
 
 			std::vector<int> data;
-			for (int val_i = 0; val_i < (int)step["data"].size(); val_i++)
+			for (int val_i = 0; val_i < (int)stepValue["data"].size(); val_i++)
 			{
-				data.push_back(step["data"][val_i].asInt());
+				data.push_back(stepValue["data"][val_i].asInt());
 			}
 
-			AddStep(data, duration);
+			auto step = AddStep(data, duration);
+
+			step->useCustomColor = ValidateValue(stepValue["useCustomColor"], step->useCustomColor).asBool();
+			step->customColor = ValidateColor(stepValue["customColor"], step->customColor);
+
+			step->useCustomLedColor = ValidateValue(stepValue["useCustomLedColor"], step->useCustomLedColor).asBool();
+			step->customLedColor = ValidateColor(stepValue["customLedColor"], step->customColor);
 		}
 	}
-};
+};

GiroflexVSL/SirenSystem.cpp

@@ -15,6 +15,8 @@ bool SirenSystem::FixLoudSounds = true;
 float SirenSystem::m_VolumeSirens = 1.0f;
 float SirenSystem::m_VolumeRadio = 3.0f;
 
+CAudioStream* SirenSystem::m_AudioSirenToggle = NULL;
+
 extern IBASS* BASS;
 extern CCamera* camera;
 
@@ -226,6 +228,14 @@ SirenGroup* SirenSystem::GetCurrentVehicleSoundGroup()
 	return GetSirenGroupForModelId(GetCurrentVehicleModelId());
 }
 
+void SirenSystem::PlaySirenToggleSound()
+{
+	if(m_AudioSirenToggle->GetState() != AudioStreamState::STREAM_STOPPED)
+		m_AudioSirenToggle->Stop();
+
+	m_AudioSirenToggle->Play();
+}
+
 //--------------------------------------
 
 SirenSystem::SirenSystem(int hVehicle)
@@ -237,6 +247,15 @@ void SirenSystem::LoadAudios()
 {
 	Log::Level(LOG_LEVEL::LOG_BOTH) << "SirenSystem: LoadAudios" << std::endl;
 
+	// load siren toggle sounds
+
+	if(!m_AudioSirenToggle)
+	{
+		m_AudioSirenToggle = SoundSystem::LoadStreamFromAudiosFolder("/siren_toggle.wav", false);
+	}
+
+	//
+
 	auto vehicle = Vehicles::GetVehicleByHandle(hVehicle);
 	auto modelId = vehicle->modelId;
 

GiroflexVSL/SirenSystem.h

@@ -38,6 +38,8 @@ class SirenSystem {
 	static float m_VolumeSirens;
 	static float m_VolumeRadio;
 
+	static CAudioStream* m_AudioSirenToggle;
+
 	static void Load();
 	static void LoadConfig();
 	static void LoadVehicles();
@@ -49,6 +51,8 @@ class SirenSystem {
     static int GetCurrentVehicleModelId();
     static SirenGroup* GetCurrentVehicleSoundGroup();
 
+    static void PlaySirenToggleSound();
+
 	//
 
 	int hVehicle = 0;

GiroflexVSL/Vehicle.cpp

@@ -107,6 +107,8 @@ void Vehicle::Update(int dt)
                 //player vehicle
                 if(ModConfig::TurnOnLightsWithSiren)
                 {
+                    SirenSystem::PlaySirenToggleSound();
+
                     SetGiroflexEnabled(gameSirenState);
                 }
             } else {
@@ -293,6 +295,13 @@ void Vehicle::UpdateLightGroups(int dt)
                 color = point->customColor;
             }
 
+            //pattern color
+            auto step = lightGroupData->GetCurrenetStep();
+            if(step->useCustomColor)
+            {
+                color = step->customColor;
+            }
+
             //
             int index = i;
 
@@ -569,6 +578,13 @@ void Vehicle::RenderBefore()
                 } else {
                     color = lightGroup->ledColor2Enabled;
                 }
+
+                //pattern color
+                auto step = lightGroupData->GetCurrenetStep();
+                if(step->useCustomLedColor)
+                {
+                    color = step->customLedColor;
+                }
 
                 //
                 int index = i;

GiroflexVSL/main.cpp

@@ -16,7 +16,7 @@
 // ---------------------------------------
 
 //MYMODCFG(net.danilo1301.giroflexVSL, GiroflexVSL, Mod::m_Version, Danilo1301) //whoops
-MYMODCFG(net.danilo1301.giroflexVSL, GiroflexVSL, 3.7.3, Danilo1301)
+MYMODCFG(net.danilo1301.giroflexVSL, GiroflexVSL, 3.8.0, Danilo1301)
 
 // ---------------------------------------
 
@@ -548,8 +548,12 @@ extern "C" void OnModLoad()
 
     ModConfig::ProcessVersionChanges_PreConfigLoad();
 
+    Log::Level(LOG_LEVEL::LOG_BOTH) << "Mod Load" << std::endl;
+
     ModConfig::Load();
 
+    Log::Level(LOG_LEVEL::LOG_BOTH) << "Mod End Load" << std::endl;
+
     if (Patterns::m_Patterns.size() == 0)
     {
         Patterns::CreateDefaultPatterns();

GiroflexVSL/pch.h

@@ -75,7 +75,7 @@ static CRGBA ColorFromJSON(Json::Value json) {
 	color.r = json["r"].asInt();
 	color.g = json["g"].asInt();
 	color.b = json["b"].asInt();
-	color.a = json["a"].asInt();
+	color.a = json["a"].empty() ? 255 : json["a"].asInt();
 	return color;
 }
 

GiroflexVSL/windows/WindowSoundPanel.cpp

@@ -486,6 +486,9 @@ void WindowSoundPanel::Update(int dt)
 				buttonToggleLights->activeColor = buttonActiveColor;
 				buttonToggleLights->onIsActiveChange = [vehicle](bool isActive) {
 					vehicle->SetGiroflexEnabled(!vehicle->prevLightsState);
+
+					SirenSystem::PlaySirenToggleSound();
+
 					//Menu::ShowPopup(1, vehicle->prevLightsState ? 1 : 0, 0, 1000.0f);
 				};
 			}

cleo/giroflex v3/GiroflexVSL.fxt

@@ -3,7 +3,7 @@ DGFX2 ~1~, ~1~
 DGFX3 ~1~, ~1~, ~1~
 DGFX4 <
 DGFX5 >
-DGFX6 Giroflex VSL v3.7.3 (by ~y~Danilo1301~w~)
+DGFX6 Giroflex VSL v3.8.0 (by ~y~Danilo1301~w~)
 DGFX7 Fechar
 DGFX8 Voltar
 DGFX9 Editar posicao

cleo/giroflex v3/GiroflexVSL_en.fxt

@@ -3,7 +3,7 @@ DGFX2 ~1~, ~1~
 DGFX3 ~1~, ~1~, ~1~
 DGFX4 <
 DGFX5 >
-DGFX6 Giroflex VSL v3.7.3 (by ~y~Danilo1301~w~)
+DGFX6 Giroflex VSL v3.8.0 (by ~y~Danilo1301~w~)
 DGFX7 Close
 DGFX8 Back
 DGFX9 Edit position

info.txt

@@ -219,9 +219,10 @@ OBS: I also found a bug that detects a lightpanel button press before the panel
 [3.7.3]
 [X] CHANGE: change the way it loads the libs (and add a log message if they are not loaded)
 
-[3.7.4]
+[3.8.0]
 [X] FIX: flare is always enabled
-[ ] FIX: issue with two leds using same object
+[X] ADD: support to multi color on patterns
+[X] ADD: sounds to the buttons (turn lights only, not turn sounds yet)
 
 -----------------------
 NOTES: