From e896835f86e52051b1998a344549dfa8ba79847a Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sun, 30 Dec 2018 16:06:29 -0600
Subject: ExpressionParser: Renamed ControlFinder to ControlEnvironment. Added
 support for variables and assignment operator. ControlExpression objects now
 reference a matching input and output so the two can me mixed in any
 expression. (you can set rumble directly from inputs)

---
 .../InputCommon/ControllerEmu/ControllerEmu.cpp     | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp')

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index de0579a2b2..c5ff0705a2 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -38,23 +38,38 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
 
 void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
-  const auto lock = GetStateLock();
   m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);
 
+  ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars);
+
+  UpdateReferences(env);
+}
+
+void EmulatedController::UpdateReferences(ciface::ExpressionParser::ControlEnvironment& env)
+{
+  const auto lock = GetStateLock();
+
   for (auto& ctrlGroup : groups)
   {
     for (auto& control : ctrlGroup->controls)
-      control->control_ref.get()->UpdateReference(devi, GetDefaultDevice());
+      control->control_ref->UpdateReference(env);
 
     // Attachments:
     if (ctrlGroup->type == GroupType::Attachments)
     {
       for (auto& attachment : static_cast<Attachments*>(ctrlGroup.get())->GetAttachmentList())
-        attachment->UpdateReferences(devi);
+        attachment->UpdateReferences(env);
     }
   }
 }
 
+void EmulatedController::UpdateSingleControlReference(const ControllerInterface& devi,
+                                                      ControlReference* ref)
+{
+  ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars);
+  ref->UpdateReference(env);
+}
+
 bool EmulatedController::IsDefaultDeviceConnected() const
 {
   return m_default_device_is_connected;
-- 
cgit v1.2.3


From 35e51ebbaa025bad87deb4668e0b32249dd62d77 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sun, 30 Dec 2018 16:08:54 -0600
Subject: ExpressionParser: Clear expression variables on UpdateReferences
 call. I don't know if this is most sensible.

---
 Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp')

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index c5ff0705a2..2cf5edbb00 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -40,6 +40,9 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
   m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);
 
+  // Reset variables:
+  m_expression_vars.clear();
+
   ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars);
 
   UpdateReferences(env);
-- 
cgit v1.2.3


From b4e2b3cae330be2a9f050a90c3bbb9d38f047777 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Fri, 11 Oct 2019 19:42:49 -0500
Subject: ControllerEmu: Don't clear expression variables on references update.
 Hotplug would make that problematic.

---
 Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp')

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index 2cf5edbb00..c5ff0705a2 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -40,9 +40,6 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
   m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);
 
-  // Reset variables:
-  m_expression_vars.clear();
-
   ciface::ExpressionParser::ControlEnvironment env(devi, GetDefaultDevice(), m_expression_vars);
 
   UpdateReferences(env);
-- 
cgit v1.2.3