Listener refactor

2021-03-04 22:18:42 -08:00
parent 430837ccd6
commit b14027c787
20 changed files with 93 additions and 85 deletions
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -255,14 +255,6 @@
 				RelativePath=".\src\source\BrowserCallHandler.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ButtonListener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\CameraButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\CameraController.cpp"
 				>
@@ -271,10 +263,6 @@
 				RelativePath=".\src\source\DataModelInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\DeleteListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\ErrorFunctions.cpp"
 				>
@@ -287,10 +275,6 @@
 				RelativePath=".\src\source\GroupInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\GUDButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\GuiRootInstance.cpp"
 				>
@@ -319,14 +303,6 @@
 				RelativePath=".\src\source\main.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\MenuButtonListener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\ModeSelectionListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\Mouse.cpp"
 				>
@@ -347,10 +323,6 @@
 				RelativePath=".\src\source\PVInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\RotateButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\StringFunctions.cpp"
 				>
@@ -367,10 +339,6 @@
 				RelativePath=".\src\source\ToggleImageButtonInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ToolbarListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\WindowFunctions.cpp"
 				>
@@ -391,6 +359,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\source\Listener\ButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\DeleteListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ToolbarListener.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -416,14 +420,6 @@
 				RelativePath=".\src\include\BrowserCallHandler.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ButtonListener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\CameraButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\CameraController.h"
 				>
@@ -432,10 +428,6 @@
 				RelativePath=".\src\include\DataModelInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\DeleteListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Enum.h"
 				>
@@ -456,10 +448,6 @@
 				RelativePath=".\src\include\GroupInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\GUDButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\GuiRootInstance.h"
 				>
@@ -484,14 +472,6 @@
 				RelativePath=".\src\include\LevelInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\MenuButtonListener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\ModeSelectionListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Mouse.h"
 				>
@@ -516,10 +496,6 @@
 				RelativePath=".\src\include\resource.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\RotateButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\StringFunctions.h"
 				>
@@ -536,10 +512,6 @@
 				RelativePath=".\src\include\ToggleImageButtonInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ToolbarListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\win32Defines.h"
 				>
@@ -572,6 +544,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\include\Listener\ButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\CameraButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\DeleteListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\GUDButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\MenuButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ModeSelectionListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\RotateButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ToolbarListener.h"
+					>
+				</File>
+			</Filter>
 			<Filter
 				Name="Tool"
 				>
--- a/src/include/BaseButtonInstance.h
+++ b/src/include/BaseButtonInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "instance.h"
-#include "ButtonListener.h"
+#include "Listener/ButtonListener.h"

 class ButtonListener;
 class Instance;
--- a/src/include/Listener/ButtonListener.h
+++ b/src/include/Listener/ButtonListener.h
--- a/src/include/Listener/CameraButtonListener.h
+++ b/src/include/Listener/CameraButtonListener.h
--- a/src/include/Listener/DeleteListener.h
+++ b/src/include/Listener/DeleteListener.h
--- a/src/include/Listener/GUDButtonListener.h
+++ b/src/include/Listener/GUDButtonListener.h
--- a/src/include/Listener/MenuButtonListener.h
+++ b/src/include/Listener/MenuButtonListener.h
--- a/src/include/Listener/ModeSelectionListener.h
+++ b/src/include/Listener/ModeSelectionListener.h
--- a/src/include/Listener/RotateButtonListener.h
+++ b/src/include/Listener/RotateButtonListener.h
--- a/src/include/Listener/ToolbarListener.h
+++ b/src/include/Listener/ToolbarListener.h
--- a/src/source/Application.cpp
+++ b/src/source/Application.cpp
@@ -25,11 +25,11 @@
 #include "StringFunctions.h"
 #include "GuiRootInstance.h"

-#include "GUDButtonListener.h"
-#include "ModeSelectionListener.h"
-#include "DeleteListener.h"
-#include "CameraButtonListener.h"
-#include "RotateButtonListener.h"
+#include "Listener/GUDButtonListener.h"
+#include "Listener/ModeSelectionListener.h"
+#include "Listener/DeleteListener.h"
+#include "Listener/CameraButtonListener.h"
+#include "Listener/RotateButtonListener.h"
 #define LEGACY_LOAD_G3DFUN_LEVEL
 //Ray testRay;
 //static int cursorid = 0;
--- a/src/source/GuiRootInstance.cpp
+++ b/src/source/GuiRootInstance.cpp
@@ -9,13 +9,13 @@
 #include "Globals.h"
 #include "StringFunctions.h"

-#include "GUDButtonListener.h"
-#include "ModeSelectionListener.h"
-#include "MenuButtonListener.h"
-#include "RotateButtonListener.h"
-#include "CameraButtonListener.h"
-#include "DeleteListener.h"
-#include "ToolbarListener.h"
+#include "Listener/GUDButtonListener.h"
+#include "Listener/ModeSelectionListener.h"
+#include "Listener/MenuButtonListener.h"
+#include "Listener/RotateButtonListener.h"
+#include "Listener/CameraButtonListener.h"
+#include "Listener/DeleteListener.h"
+#include "Listener/ToolbarListener.h"

 #include "ImageButtonInstance.h"

--- a/src/source/Listener/ButtonListener.cpp
+++ b/src/source/Listener/ButtonListener.cpp
@@ -1,5 +1,5 @@
 #include "BaseButtonInstance.h"
-#include "ButtonListener.h"
+#include "Listener/ButtonListener.h"


 ButtonListener::ButtonListener()
--- a/src/source/Listener/CameraButtonListener.cpp
+++ b/src/source/Listener/CameraButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "CameraButtonListener.h"
+#include "Listener/CameraButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
 #include "Application.h"
--- a/src/source/Listener/DeleteListener.cpp
+++ b/src/source/Listener/DeleteListener.cpp
@@ -1,4 +1,4 @@
-#include "DeleteListener.h"
+#include "Listener/DeleteListener.h"
 #include "Globals.h"
 #include "Application.h"

--- a/src/source/Listener/GUDButtonListener.cpp
+++ b/src/source/Listener/GUDButtonListener.cpp
@@ -2,7 +2,7 @@
 #include "Application.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
-#include "GUDButtonListener.h"
+#include "Listener/GUDButtonListener.h"

 void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
--- a/src/source/Listener/MenuButtonListener.cpp
+++ b/src/source/Listener/MenuButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "MenuButtonListener.h"
+#include "Listener/MenuButtonListener.h"
 #include "toggleimagebuttoninstance.h"
 #include "Globals.h"
 void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
--- a/src/source/Listener/ModeSelectionListener.cpp
+++ b/src/source/Listener/ModeSelectionListener.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "Instance.h"
-#include "ModeSelectionListener.h"
+#include "Listener/ModeSelectionListener.h"
 #include "Application.h"
 #include "Tool/ArrowTool.h"

--- a/src/source/Listener/RotateButtonListener.cpp
+++ b/src/source/Listener/RotateButtonListener.cpp
@@ -1,5 +1,5 @@
 #include "BaseButtonInstance.h"
-#include "RotateButtonListener.h"
+#include "Listener/RotateButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"

--- a/src/source/Listener/ToolbarListener.cpp
+++ b/src/source/Listener/ToolbarListener.cpp
@@ -1,4 +1,4 @@
-#include "ToolbarListener.h"
+#include "Listener/ToolbarListener.h"
 #include "Globals.h"
 #include "StringFunctions.h"
 #include "Application.h"