Towers

CMakeLists.txt

@@ -53,6 +53,30 @@ if(BUILD_TESTING)
     add_test(NAME trackeditor-e3-s5b-track-assets
              COMMAND trackeditor-e3-s5b-track-assets-test)
 
+    add_executable(trackeditor-e7-s5-tower-model-test
+        tests/editor_tower_model_test.cpp
+        TrackEditor/EditorTowerModel.cpp
+        TrackEditor/EditorTowerModel.h)
+    target_compile_features(trackeditor-e7-s5-tower-model-test PRIVATE cxx_std_17)
+    target_include_directories(trackeditor-e7-s5-tower-model-test PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/TrackEditor")
+    target_link_libraries(trackeditor-e7-s5-tower-model-test PRIVATE
+        TrackEditor::track-model)
+    add_test(NAME trackeditor-e7-s5-tower-model
+             COMMAND trackeditor-e7-s5-tower-model-test)
+
+    add_executable(trackeditor-e7-s7-sign-model-test
+        tests/editor_sign_model_test.cpp
+        TrackEditor/EditorSignModel.cpp
+        TrackEditor/EditorSignModel.h)
+    target_compile_features(trackeditor-e7-s7-sign-model-test PRIVATE cxx_std_17)
+    target_include_directories(trackeditor-e7-s7-sign-model-test PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/TrackEditor")
+    target_link_libraries(trackeditor-e7-s7-sign-model-test PRIVATE
+        TrackEditor::track-model)
+    add_test(NAME trackeditor-e7-s7-sign-model
+             COMMAND trackeditor-e7-s7-sign-model-test)
+
     find_package(Python3 COMPONENTS Interpreter QUIET)
     if(Python3_Interpreter_FOUND)
         add_test(
@@ -200,6 +224,26 @@ if(BUILD_TESTING)
             COMMAND "${Python3_EXECUTABLE}"
                     "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e6_s3_releases.py"
                     -v)
+        add_test(
+            NAME trackeditor-e7-s4-tower-display-contract
+            COMMAND "${Python3_EXECUTABLE}"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e7_s4_tower_display.py"
+                    -v)
+        add_test(
+            NAME trackeditor-e7-s5-edit-towers-contract
+            COMMAND "${Python3_EXECUTABLE}"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e7_s5_edit_towers.py"
+                    -v)
+        add_test(
+            NAME trackeditor-e7-s6-view-from-tower-contract
+            COMMAND "${Python3_EXECUTABLE}"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e7_s6_view_from_tower.py"
+                    -v)
+        add_test(
+            NAME trackeditor-e7-s7-sign-tower-lockout-contract
+            COMMAND "${Python3_EXECUTABLE}"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_e7_s7_sign_tower_lockout.py"
+                    -v)
         add_test(
             NAME trackeditor-graphics-settings-contract
             COMMAND "${Python3_EXECUTABLE}"
@@ -390,6 +434,8 @@ if(BUILD_TESTING)
     foreach(trackeditor_test_target IN ITEMS
             trackeditor-e3-s5a-track-model-test
             trackeditor-e3-s5b-track-assets-test
+            trackeditor-e7-s5-tower-model-test
+            trackeditor-e7-s7-sign-model-test
             trackeditor-e3-s1-frame-delivery-test
             trackeditor-e3-s1-render-service-test
             trackeditor-e3a-s2-overlay-settings-test

TrackEditor/CMakeLists.txt

@@ -29,6 +29,9 @@ set(trackeditor_sources
     EditStuntWidget.cpp
     EditStuntWidget.h
     EditStuntWidget.ui
+    EditTowerWidget.cpp
+    EditTowerWidget.h
+    EditTowerWidget.ui
     EditSurfaceDialog.cpp
     EditSurfaceDialog.h
     EditSurfaceDialog.ui
@@ -52,6 +55,10 @@ set(trackeditor_sources
     EditorOverlaySettings.h
     EditorReferenceMesh.cpp
     EditorReferenceMesh.h
+    EditorSignModel.cpp
+    EditorSignModel.h
+    EditorTowerModel.cpp
+    EditorTowerModel.h
     EditorRenderQueue.cpp
     EditorRenderQueue.h
     EditorRenderService.cpp

TrackEditor/DisplaySettings.cpp

@@ -21,6 +21,7 @@ CDisplaySettings::CDisplaySettings(QWidget *pParent)
   ckTestCar->setChecked(true);
   ckAudio->setChecked(true);
   ckStunts->setChecked(true);
+  ckTowers->setChecked(true);
 
   cbTestCarType->addItem("F1WACK", (int)eWhipModel::CAR_F1WACK);
   cbTestCarType->addItem("XAUTO", (int)eWhipModel::CAR_XAUTO);
@@ -78,6 +79,7 @@ CDisplaySettings::CDisplaySettings(QWidget *pParent)
   connect(ckSigns, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
   connect(ckAudio, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
   connect(ckStunts, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
+  connect(ckTowers, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
   connect(ckAnimateStunts, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
   connect(ckTestCar, &QCheckBox::toggled, this, &CDisplaySettings::UpdatePreviewSelection);
   connect(cbTestCarType, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdatePreviewSelection()));
@@ -196,6 +198,23 @@ void CDisplaySettings::SetDisplaySettings(uint32 uiShowModels, eWhipModel carMod
 
 //-------------------------------------------------------------------------------------------------
 
+uint32 CDisplaySettings::GetFeatureSettings() const
+{
+  uint32 uiShowFeatures = 0;
+  if (ckTowers->isChecked()) uiShowFeatures |= SHOW_FEATURE_TOWERS;
+  return uiShowFeatures;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void CDisplaySettings::SetFeatureSettings(uint32 uiShowFeatures)
+{
+  BLOCK_SIG_AND_DO(ckTowers, setChecked(uiShowFeatures & SHOW_FEATURE_TOWERS));
+  UpdatePreviewSelection();
+}
+
+//-------------------------------------------------------------------------------------------------
+
 bool CDisplaySettings::GetAnimateStunts() const
 {
   return ckAnimateStunts->isChecked();

TrackEditor/DisplaySettings.h

@@ -17,6 +17,8 @@ class CDisplaySettings : public QWidget, private Ui::DisplaySettings
 
   uint32 GetDisplaySettings(eWhipModel &carModel, eShapeSection &aiLine, bool &bMillionPlus);
   void SetDisplaySettings(uint32 uiShowModels, eWhipModel carModel, eShapeSection aiLine, bool bMillionPlus);
+  uint32 GetFeatureSettings() const;
+  void SetFeatureSettings(uint32 uiShowFeatures);
   bool GetAnimateStunts() const;
   void SetAnimateStunts(bool bAnimate);
   bool GetAttachLast();