Adjusting to changes in 3D_rendering branch

Sebastian Pape · Sebastian Pape · commit 0923caf86a29 · 2024-09-04T12:54:20.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,7 +60,7 @@ add_subdirectory("Thirdparty/nativefiledialog-extended")
 
 IF (WIN32)
 	# Hide console window
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+	#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 ENDIF()
 
 ADD_Executable(DasherUI
diff --git a/DasherCore b/DasherCore
@@ -1 +1 @@
-Subproject commit 9e66f021e834c2f7ee2e05ce128a2f1050ccc069
+Subproject commit 0f0d1953f3ff1d4c20a1387d4bde2ede3b86f254
diff --git a/src/DasherController.cpp b/src/DasherController.cpp
@@ -30,18 +30,18 @@ void DasherController::editDelete(const std::string& strText, Dasher::CDasherNod
 	CDasherInterfaceBase::editDelete(strText, pNode);
 }
 
-unsigned DasherController::ctrlMove(bool bForwards, Dasher::CControlManager::EditDistance dist)
+unsigned DasherController::ctrlMove(bool bForwards, Dasher::EditDistance dist)
 {
-	if (dist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {
+	if (dist == Dasher::EditDistance::EDIT_CHAR) {
 		if (bForwards) Cursor++;
 		else Cursor--;
 	}
 	return Cursor;
 }
 
-unsigned DasherController::ctrlDelete(bool bForwards, Dasher::CControlManager::EditDistance dist)
+unsigned DasherController::ctrlDelete(bool bForwards, Dasher::EditDistance dist)
 {
-	if(dist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {
+	if(dist == Dasher::EditDistance::EDIT_CHAR) {
 
 		Buffer.erase(Cursor - (bForwards ? 0 : 1), 1);
 	}
@@ -61,9 +61,9 @@ std::string DasherController::GetAllContext()
 	return CurrentBuffer;
 }
 
-std::string DasherController::GetTextAroundCursor(Dasher::CControlManager::EditDistance iDist) {
+std::string DasherController::GetTextAroundCursor(Dasher::EditDistance iDist) {
 	if (Buffer.length() > Cursor && Buffer.length() >= 2) {
-		if (iDist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {
+		if (iDist == Dasher::EditDistance::EDIT_CHAR) {
 			return Buffer.substr(Cursor - 1, 2);
 		}
 
@@ -90,13 +90,13 @@ void DasherController::CreateModules()
 {
 	CDashIntfScreenMsgs::CreateModules();
 
-	RegisterModule(ScreenModule.get());
+	GetModuleManager()->RegisterInputDeviceModule(ScreenModule.get());
 
-	SocketInputModule = std::make_shared<SocketInput>(static_cast<CSettingsUser*>(this), this, m_pFramerate);
-	RegisterModule(static_cast<Dasher::CInputFilter*>(SocketInputModule.get()));
+	SocketInputModule = std::make_shared<SocketInput>(m_pSettingsStore, this, m_pFramerate);
+	GetModuleManager()->RegisterInputDeviceModule(SocketInputModule.get());
 	SocketInputModule->startListen();
 
-	SetDefaultInputDevice(SocketInputModule.get());
+	GetModuleManager()->SetDefaultInputDevice(SocketInputModule.get());
 }
 
 void DasherController::CopyToClipboard(const std::string& text)
diff --git a/src/DasherController.h b/src/DasherController.h
@@ -17,11 +17,11 @@ class DasherController : public Dasher::CDashIntfScreenMsgs
 
 	void editOutput(const std::string& strText, Dasher::CDasherNode* pNode) override;
 	void editDelete(const std::string& strText, Dasher::CDasherNode* pNode) override;
-	unsigned ctrlMove(bool bForwards, Dasher::CControlManager::EditDistance dist) override;
-	unsigned ctrlDelete(bool bForwards, Dasher::CControlManager::EditDistance dist) override;
+	unsigned ctrlMove(bool bForwards, Dasher::EditDistance dist) override;
+	unsigned ctrlDelete(bool bForwards, Dasher::EditDistance dist) override;
 	std::string GetContext(unsigned iStart, unsigned iLength) override;
 	std::string GetAllContext() override;
-	std::string GetTextAroundCursor(Dasher::CControlManager::EditDistance iDist) override;
+	std::string GetTextAroundCursor(Dasher::EditDistance iDist) override;
 	int GetAllContextLenght() override;
 
 	void Initialize();
diff --git a/src/DasherUIScreen.cpp b/src/DasherUIScreen.cpp
@@ -3,7 +3,7 @@
 #include "MainWindow.h"
 #include "imgui/imgui_internal.h"
 
-DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput(0, _("Mouse Input"))
+DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput(_("Mouse Input"))
 {
 	Font = MainWindow::LoadFonts(50.0f);
 }
@@ -48,7 +48,7 @@ void DasherUIScreen::DrawCircle(Dasher::screenint iCX, Dasher::screenint iCY, Da
 	{
 		const ImVec4 ImOutlineColor = { static_cast<float>(LineColor.Red) / 255.0f, static_cast<float>(LineColor.Green) / 255.0f, static_cast<float>(LineColor.Blue) / 255.0f, static_cast<float>(LineColor.Alpha) / 255.0f };
 
-		ImGui::GetWindowDrawList()->AddCircle(CanvasPos + ImVec2(static_cast<float>(iCX), static_cast<float>(iCY)), static_cast<float>(iR), ImGui::ColorConvertFloat4ToU32(ImFillColor),0, static_cast<float>(iLineWidth));
+		ImGui::GetWindowDrawList()->AddCircle(CanvasPos + ImVec2(static_cast<float>(iCX), static_cast<float>(iCY)), static_cast<float>(iR), ImGui::ColorConvertFloat4ToU32(ImOutlineColor),0, static_cast<float>(iLineWidth));
 	}
 }
 
diff --git a/src/DasherUIScreen.h b/src/DasherUIScreen.h
@@ -18,9 +18,7 @@ class DasherUIScreen : public Dasher::CDasherScreen, public Dasher::CScreenCoord
 	void Polygon(point* Points, int Number, const Dasher::ColorPalette::Color& fillColour, const Dasher::ColorPalette::Color& outlineColour, int lineWidth) override;
 	void Display() override;
 	bool IsPointVisible(Dasher::screenint x, Dasher::screenint y) override;
-
-	bool MultiSizeFonts() override { return true; }
-	
+		
 	bool SetCanvasSize(ImVec2 CanvasPos, ImVec2 CanvasSize);
 
 	bool GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView) override;
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -8,7 +8,7 @@
 
 MainWindow::MainWindow()
 {
-	ImGui::SetCurrentFont(LoadFonts(14.0f));
+	ImGui::SetCurrentFont(LoadFonts(22.0f));
 
 	Settings = std::make_unique<Dasher::XmlSettingsStore>("Settings.xml", this);
 	Settings->Load();
@@ -18,7 +18,6 @@ MainWindow::MainWindow()
 	Controller->Initialize();
 
 	Controller->GetPermittedValues(Dasher::SP_ALPHABET_ID, Alphabets);
-
 }
 
 #define FORWARD_KEY(ImGui_Key, DasherKey) { \
diff --git a/src/SocketInput.cpp b/src/SocketInput.cpp
@@ -6,11 +6,11 @@
 #include "DasherInterfaceBase.h"
 #include "DasherModel.h"
 
-SocketInput::SocketInput(CSettingsUser* Creator, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(0, _("Socket Input")),
-                                                                                                                         CDefaultFilter(Creator, Controller, pFramerate, 2, "Socket Mode")
+SocketInput::SocketInput(Dasher::CSettingsStore* pSettingsStore, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(_("Socket Input")),
+                                                                                                                                            CDefaultFilter(pSettingsStore, Controller, pFramerate, "Socket Mode")
 {
-    xLabel = GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);
-    yLabel = GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);
+    xLabel = m_pSettingsStore->GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);
+    yLabel = m_pSettingsStore->GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);
 }
 
 SocketInput::~SocketInput()
@@ -35,7 +35,7 @@ bool SocketInput::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY,
 
 void SocketInput::startListen()
 {
-	session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), static_cast<short>(GetLongParameter(Dasher::LP_SOCKET_PORT))));
+	session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), static_cast<short>(m_pSettingsStore->GetLongParameter(Dasher::LP_SOCKET_PORT))));
 
 	receiveThread = std::thread([this](){
 
diff --git a/src/SocketInput.h b/src/SocketInput.h
@@ -8,7 +8,7 @@
 class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter
 {
 public:
-    SocketInput(CSettingsUser* Creator, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate);
+    SocketInput(Dasher::CSettingsStore* pSettingsStore, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate);
     virtual ~SocketInput();
 
 	bool GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView) override;

Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,18 @@ void DasherController::editDelete(const std::string& strText, Dasher::CDasherNod`
`30`	`30`	`CDasherInterfaceBase::editDelete(strText, pNode);`
`31`	`31`	`}`
`32`	`32`
`33`		`-unsigned DasherController::ctrlMove(bool bForwards, Dasher::CControlManager::EditDistance dist)`
	`33`	`+unsigned DasherController::ctrlMove(bool bForwards, Dasher::EditDistance dist)`
`34`	`34`	`{`
`35`		`- if (dist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {`
	`35`	`+ if (dist == Dasher::EditDistance::EDIT_CHAR) {`
`36`	`36`	`if (bForwards) Cursor++;`
`37`	`37`	`else Cursor--;`
`38`	`38`	`}`
`39`	`39`	`return Cursor;`
`40`	`40`	`}`
`41`	`41`
`42`		`-unsigned DasherController::ctrlDelete(bool bForwards, Dasher::CControlManager::EditDistance dist)`
	`42`	`+unsigned DasherController::ctrlDelete(bool bForwards, Dasher::EditDistance dist)`
`43`	`43`	`{`
`44`		`- if(dist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {`
	`44`	`+ if(dist == Dasher::EditDistance::EDIT_CHAR) {`
`45`	`45`
`46`	`46`	`Buffer.erase(Cursor - (bForwards ? 0 : 1), 1);`
`47`	`47`	`}`
`@@ -61,9 +61,9 @@ std::string DasherController::GetAllContext()`
`61`	`61`	`return CurrentBuffer;`
`62`	`62`	`}`
`63`	`63`
`64`		`-std::string DasherController::GetTextAroundCursor(Dasher::CControlManager::EditDistance iDist) {`
	`64`	`+std::string DasherController::GetTextAroundCursor(Dasher::EditDistance iDist) {`
`65`	`65`	`if (Buffer.length() > Cursor && Buffer.length() >= 2) {`
`66`		`- if (iDist == Dasher::CControlManager::EditDistance::EDIT_CHAR) {`
	`66`	`+ if (iDist == Dasher::EditDistance::EDIT_CHAR) {`
`67`	`67`	`return Buffer.substr(Cursor - 1, 2);`
`68`	`68`	`}`
`69`	`69`
`@@ -90,13 +90,13 @@ void DasherController::CreateModules()`
`90`	`90`	`{`
`91`	`91`	`CDashIntfScreenMsgs::CreateModules();`
`92`	`92`
`93`		`- RegisterModule(ScreenModule.get());`
	`93`	`+ GetModuleManager()->RegisterInputDeviceModule(ScreenModule.get());`
`94`	`94`
`95`		`- SocketInputModule = std::make_shared<SocketInput>(static_cast<CSettingsUser*>(this), this, m_pFramerate);`
`96`		`- RegisterModule(static_cast<Dasher::CInputFilter*>(SocketInputModule.get()));`
	`95`	`+ SocketInputModule = std::make_shared<SocketInput>(m_pSettingsStore, this, m_pFramerate);`
	`96`	`+ GetModuleManager()->RegisterInputDeviceModule(SocketInputModule.get());`
`97`	`97`	`SocketInputModule->startListen();`
`98`	`98`
`99`		`- SetDefaultInputDevice(SocketInputModule.get());`
	`99`	`+ GetModuleManager()->SetDefaultInputDevice(SocketInputModule.get());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`void DasherController::CopyToClipboard(const std::string& text)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "MainWindow.h"`
`4`	`4`	`#include "imgui/imgui_internal.h"`
`5`	`5`
`6`		`-DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput(0, _("Mouse Input"))`
	`6`	`+DasherUIScreen::DasherUIScreen(): Dasher::CDasherScreen(100,100), CScreenCoordInput(_("Mouse Input"))`
`7`	`7`	`{`
`8`	`8`	`Font = MainWindow::LoadFonts(50.0f);`
`9`	`9`	`}`
`@@ -48,7 +48,7 @@ void DasherUIScreen::DrawCircle(Dasher::screenint iCX, Dasher::screenint iCY, Da`
`48`	`48`	`{`
`49`	`49`	`const ImVec4 ImOutlineColor = { static_cast<float>(LineColor.Red) / 255.0f, static_cast<float>(LineColor.Green) / 255.0f, static_cast<float>(LineColor.Blue) / 255.0f, static_cast<float>(LineColor.Alpha) / 255.0f };`
`50`	`50`
`51`		`- ImGui::GetWindowDrawList()->AddCircle(CanvasPos + ImVec2(static_cast<float>(iCX), static_cast<float>(iCY)), static_cast<float>(iR), ImGui::ColorConvertFloat4ToU32(ImFillColor),0, static_cast<float>(iLineWidth));`
	`51`	`+ ImGui::GetWindowDrawList()->AddCircle(CanvasPos + ImVec2(static_cast<float>(iCX), static_cast<float>(iCY)), static_cast<float>(iR), ImGui::ColorConvertFloat4ToU32(ImOutlineColor),0, static_cast<float>(iLineWidth));`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`MainWindow::MainWindow()`
`10`	`10`	`{`
`11`		`- ImGui::SetCurrentFont(LoadFonts(14.0f));`
	`11`	`+ ImGui::SetCurrentFont(LoadFonts(22.0f));`
`12`	`12`
`13`	`13`	`Settings = std::make_unique<Dasher::XmlSettingsStore>("Settings.xml", this);`
`14`	`14`	`Settings->Load();`
`@@ -18,7 +18,6 @@ MainWindow::MainWindow()`
`18`	`18`	`Controller->Initialize();`
`19`	`19`
`20`	`20`	`Controller->GetPermittedValues(Dasher::SP_ALPHABET_ID, Alphabets);`
`21`		`-`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`#define FORWARD_KEY(ImGui_Key, DasherKey) { \`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`#include "DasherInterfaceBase.h"`
`7`	`7`	`#include "DasherModel.h"`
`8`	`8`
`9`		`-SocketInput::SocketInput(CSettingsUser* Creator, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(0, _("Socket Input")),`
`10`		`- CDefaultFilter(Creator, Controller, pFramerate, 2, "Socket Mode")`
	`9`	`+SocketInput::SocketInput(Dasher::CSettingsStore* pSettingsStore, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate): CScreenCoordInput(_("Socket Input")),`
	`10`	`+ CDefaultFilter(pSettingsStore, Controller, pFramerate, "Socket Mode")`
`11`	`11`	`{`
`12`		`- xLabel = GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);`
`13`		`- yLabel = GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);`
	`12`	`+ xLabel = m_pSettingsStore->GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_X_LABEL);`
	`13`	`+ yLabel = m_pSettingsStore->GetStringParameter(Dasher::Parameter::SP_SOCKET_INPUT_Y_LABEL);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`SocketInput::~SocketInput()`
`@@ -35,7 +35,7 @@ bool SocketInput::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY,`
`35`	`35`
`36`	`36`	`void SocketInput::startListen()`
`37`	`37`	`{`
`38`		`- session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), static_cast<short>(GetLongParameter(Dasher::LP_SOCKET_PORT))));`
	`38`	`+ session_acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), static_cast<short>(m_pSettingsStore->GetLongParameter(Dasher::LP_SOCKET_PORT))));`
`39`	`39`
`40`	`40`	`receiveThread = std::thread([this](){`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`		`- SocketInput(CSettingsUser* Creator, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate);`
	`11`	`+ SocketInput(Dasher::CSettingsStore* pSettingsStore, Dasher::CDasherInterfaceBase* Controller, Dasher::CFrameRate* pFramerate);`
`12`	`12`	`virtual ~SocketInput();`
`13`	`13`
`14`	`14`	`bool GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView) override;`