Merge branch 'master' into stable

1 files changed, 235 insertions, 0 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
new file mode 100644
index 0000000000..f1d33c65c3
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -0,0 +1,235 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "InputCommon/ControllerEmu.h"
+
+void ControllerEmu::UpdateReferences(ControllerInterface& devi)
+{
+	for (auto& ctrlGroup : groups)
+	{
+		for (auto& control : ctrlGroup->controls)
+			devi.UpdateReference(control->control_ref.get(), default_device);
+
+		// extension
+		if (ctrlGroup->type == GROUP_TYPE_EXTENSION)
+		{
+			for (auto& attachment : ((Extension*)ctrlGroup.get())->attachments)
+				attachment->UpdateReferences(devi);
+		}
+	}
+}
+
+void ControllerEmu::UpdateDefaultDevice()
+{
+	for (auto& ctrlGroup : groups)
+	{
+		// extension
+		if (ctrlGroup->type == GROUP_TYPE_EXTENSION)
+		{
+			for (auto& ai : ((Extension*)ctrlGroup.get())->attachments)
+			{
+				ai->default_device = default_device;
+				ai->UpdateDefaultDevice();
+			}
+		}
+	}
+}
+
+void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
+{
+	std::string group(base + name + "/");
+
+	// settings
+	for (auto& s : settings)
+	{
+		if (s->is_virtual)
+			continue;
+		if (s->is_iterate)
+			continue;
+		sec->Get(group + s->name, &s->value, s->default_value * 100);
+		s->value /= 100;
+	}
+
+	for (auto& c : controls)
+	{
+		// control expression
+		sec->Get(group + c->name, &c->control_ref->expression, "");
+
+		// range
+		sec->Get(group + c->name + "/Range", &c->control_ref->range, 100.0);
+		c->control_ref->range /= 100;
+
+	}
+
+	// extensions
+	if (type == GROUP_TYPE_EXTENSION)
+	{
+		Extension* const ext = (Extension*)this;
+
+		ext->switch_extension = 0;
+		unsigned int n = 0;
+		std::string extname;
+		sec->Get(base + name, &extname, "");
+
+		for (auto& ai : ext->attachments)
+		{
+			ai->default_device.FromString(defdev);
+			ai->LoadConfig(sec, base + ai->GetName() + "/");
+
+			if (ai->GetName() == extname)
+				ext->switch_extension = n;
+
+			n++;
+		}
+	}
+}
+
+void ControllerEmu::LoadConfig(IniFile::Section *sec, const std::string& base)
+{
+	std::string defdev = default_device.ToString();
+	if (base.empty())
+	{
+		sec->Get(base + "Device", &defdev, "");
+		default_device.FromString(defdev);
+	}
+
+	for (auto& cg : groups)
+		cg->LoadConfig(sec, defdev, base);
+}
+
+void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
+{
+	std::string group(base + name + "/");
+
+	for (auto& s : settings)
+	{
+		if (s->is_virtual)
+			continue;
+		if (s->is_iterate)
+			continue;
+
+		sec->Set(group + s->name, s->value * 100.0, s->default_value * 100.0);
+	}
+
+	for (auto& c : controls)
+	{
+		// control expression
+		sec->Set(group + c->name, c->control_ref->expression, "");
+
+		// range
+		sec->Set(group + c->name + "/Range", c->control_ref->range*100.0, 100.0);
+	}
+
+	// extensions
+	if (type == GROUP_TYPE_EXTENSION)
+	{
+		Extension* const ext = (Extension*)this;
+		sec->Set(base + name, ext->attachments[ext->switch_extension]->GetName(), "None");
+
+		for (auto& ai : ext->attachments)
+			ai->SaveConfig(sec, base + ai->GetName() + "/");
+	}
+}
+
+void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
+{
+	const std::string defdev = default_device.ToString();
+	if (base.empty())
+		sec->Set(/*std::string(" ") +*/ base + "Device", defdev, "");
+
+	for (auto& ctrlGroup : groups)
+		ctrlGroup->SaveConfig(sec, defdev, base);
+}
+
+ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
+	: ControlGroup(_name, GROUP_TYPE_STICK)
+{
+	for (auto& named_direction : named_directions)
+		controls.emplace_back(new Input(named_direction));
+
+	controls.emplace_back(new Input(_trans("Modifier")));
+	settings.emplace_back(new Setting(_trans("Radius"), default_radius, 0, 100));
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Buttons::Buttons(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS)
+{
+	settings.emplace_back(new Setting(_trans("Threshold"), 0.5));
+}
+
+ControllerEmu::MixedTriggers::MixedTriggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_MIXED_TRIGGERS)
+{
+	settings.emplace_back(new Setting(_trans("Threshold"), 0.9));
+}
+
+ControllerEmu::Triggers::Triggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_TRIGGERS)
+{
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Slider::Slider(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_SLIDER)
+{
+	controls.emplace_back(new Input("Left"));
+	controls.emplace_back(new Input("Right"));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Force::Force(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_FORCE)
+{
+	memset(m_swing, 0, sizeof(m_swing));
+
+	controls.emplace_back(new Input(_trans("Up")));
+	controls.emplace_back(new Input(_trans("Down")));
+	controls.emplace_back(new Input(_trans("Left")));
+	controls.emplace_back(new Input(_trans("Right")));
+	controls.emplace_back(new Input(_trans("Forward")));
+	controls.emplace_back(new Input(_trans("Backward")));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+}
+
+ControllerEmu::Tilt::Tilt(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_TILT)
+{
+	memset(m_tilt, 0, sizeof(m_tilt));
+
+	controls.emplace_back(new Input("Forward"));
+	controls.emplace_back(new Input("Backward"));
+	controls.emplace_back(new Input("Left"));
+	controls.emplace_back(new Input("Right"));
+
+	controls.emplace_back(new Input(_trans("Modifier")));
+
+	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
+	settings.emplace_back(new Setting(_trans("Circle Stick"), 0));
+	settings.emplace_back(new Setting(_trans("Angle"), 0.9, 0, 180));
+}
+
+ControllerEmu::Cursor::Cursor(const std::string& _name)
+	: ControlGroup(_name, GROUP_TYPE_CURSOR)
+	, m_z(0)
+{
+	for (auto& named_direction : named_directions)
+		controls.emplace_back(new Input(named_direction));
+	controls.emplace_back(new Input("Forward"));
+	controls.emplace_back(new Input("Backward"));
+	controls.emplace_back(new Input(_trans("Hide")));
+
+	settings.emplace_back(new Setting(_trans("Center"), 0.5));
+	settings.emplace_back(new Setting(_trans("Width"), 0.5));
+	settings.emplace_back(new Setting(_trans("Height"), 0.5));
+}
+
+void ControllerEmu::LoadDefaults(const ControllerInterface &ciface)
+{
+	// load an empty inifile section, clears everything
+	IniFile::Section sec;
+	LoadConfig(&sec);
+
+	if (ciface.Devices().size())
+	{
+		default_device.FromDevice(ciface.Devices()[0]);
+		UpdateDefaultDevice();
+	}
+}