Merge remote-tracking branch 'remotes/origin/feature/3D_render' into chore/aggregateBranches

# Conflicts:
#	src/DasherController.cpp
#	src/DasherUIScreen.cpp
#	src/DasherUIScreen.h
#	src/MainWindow.cpp

Author: PapeCoding

src/DasherController.cpp

@@ -90,13 +90,7 @@ void DasherController::CreateModules()
 {
 	CDashIntfScreenMsgs::CreateModules();
 
-	GetModuleManager()->RegisterInputDeviceModule(ScreenModule.get());
-
-	SocketInputModule = std::make_shared<SocketInput>(m_pSettingsStore, this, m_pFramerate);
-	GetModuleManager()->RegisterInputDeviceModule(SocketInputModule.get());
-	SocketInputModule->startListen();
-
-	GetModuleManager()->SetDefaultInputDevice(SocketInputModule.get());
+    GetModuleManager()->RegisterInputDeviceModule(ScreenModule.get(), true);
 }
 
 void DasherController::CopyToClipboard(const std::string& text)

src/DasherUIScreen.cpp

@@ -3,7 +3,7 @@
 #include "MainWindow.h"
 #include "imgui/imgui_internal.h"
 
-DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput(_("Mouse Input"))
+DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput("Mouse Input")
 {
 	Font = MainWindow::LoadFonts(50.0f);
 }
@@ -93,7 +93,7 @@ bool DasherUIScreen::IsPointVisible(Dasher::screenint, Dasher::screenint){
 	return true;
 }
 
-bool DasherUIScreen::SetCanvasSize(const ImVec2 position, const ImVec2 size)
+bool DasherUIScreen::SetCanvasSize(ImVec2 position, ImVec2 size)
 {
 	if(fabs(this->CanvasSize.x - size.x) > std::numeric_limits<float>::epsilon() || fabs(this->CanvasSize.y - size.y) > std::numeric_limits<float>::epsilon())
 	{

src/DasherUIScreen.h

@@ -20,7 +20,6 @@ class DasherUIScreen : public Dasher::CDasherScreen, public Dasher::CScreenCoord
 	bool IsPointVisible(Dasher::screenint x, Dasher::screenint y) override;
 
 	bool SetCanvasSize(ImVec2 CanvasPos, ImVec2 CanvasSize);
-
 	bool GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView) override;
 
 private:

src/MainWindow.cpp

@@ -18,6 +18,7 @@ MainWindow::MainWindow()
 	Controller->Initialize();
 
 	Controller->GetPermittedValues(Dasher::SP_ALPHABET_ID, Alphabets);
+	Controller->GetPermittedValues(Dasher::SP_COLOUR_ID, ColorPalettes);
 }
 
 #define FORWARD_KEY(ImGui_Key, DasherKey) { \
@@ -105,10 +106,16 @@ bool MainWindow::render(float DeltaTime)
 					Controller->SetLongParameter(Dasher::LP_MAX_BITRATE, speed);
 				}
 
-				static int item_current = 0;
-				if(ImGui::Combo("Alphabet", &item_current, [](void* data, int idx, const char** out_text) { *out_text = static_cast<const std::vector<std::string>*>(data)->at(idx).c_str(); return true; }, (void*)&Alphabets, static_cast<int>(Alphabets.size()), 10))
+				static int item_current_alphabet = 0;
+				if(ImGui::Combo("Alphabet", &item_current_alphabet, [](void* data, int idx, const char** out_text) { *out_text = static_cast<const std::vector<std::string>*>(data)->at(idx).c_str(); return true; }, (void*)&Alphabets, static_cast<int>(Alphabets.size()), 10))
 				{
-					Controller->SetStringParameter(Dasher::SP_ALPHABET_ID, Alphabets[item_current]);
+					Controller->SetStringParameter(Dasher::SP_ALPHABET_ID, Alphabets[item_current_alphabet]);
+				}
+
+				static int item_current_colorpalette = 0;
+				if(ImGui::Combo("Color Palette", &item_current_colorpalette, [](void* data, int idx, const char** out_text) { *out_text = static_cast<const std::vector<std::string>*>(data)->at(idx).c_str(); return true; }, (void*)&ColorPalettes, static_cast<int>(ColorPalettes.size()), 10))
+				{
+					Controller->SetStringParameter(Dasher::SP_COLOUR_ID, ColorPalettes[item_current_colorpalette]);
 				}
 
 	            ImGui::EndMenu();

src/MainWindow.h

@@ -32,5 +32,6 @@ class MainWindow : public Dasher::CommandlineErrorDisplay
 	std::unique_ptr <Dasher::XmlSettingsStore> Settings;
 	std::unique_ptr<DasherController> Controller;
 	std::vector<std::string> Alphabets;
+	std::vector<std::string> ColorPalettes;
 };
 

src/SocketInput.cpp

@@ -20,7 +20,7 @@ SocketInput::~SocketInput()
 
 bool SocketInput::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView)
 {
-	const Dasher::CDasherView::ScreenRegion screenRegion = pView->VisibleRegion();
+	const Dasher::CDasherView::DasherCoordScreenRegion screenRegion = pView->VisibleRegion();
 
 	const double vectorLength = static_cast<double>(std::min(Dasher::CDasherModel::ORIGIN_Y - screenRegion.minY, screenRegion.maxY - Dasher::CDasherModel::ORIGIN_Y));
 	const double normalization = sqrt(lastRelativeX * lastRelativeX + lastRelativeY * lastRelativeY);