Commit 779e8a31 authored by Arun Das's avatar Arun Das
Browse files

Merge branch 'develop' into 'main'

Merge develop into main for v1.2

Closes #273 and #285

See merge request !266
parents 6c50b56f cd5eeb34
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ CheckOptions:
  - key: readability-identifier-naming.FunctionCase
    value: CamelCase
  - key: readability-identifier-naming.FunctionIgnoredRegexp
    value: 'OpenPASS_GetVersion|OpenPASS_CreateInstance|OpenPASS_DestroyInstance|OpenPASS_UpdateInput|OpenPASS_UpdateOutput|OpenPASS_Trigger|OpenPASS_OpSimulationManagerPreHook|OpenPASS_OpSimulationManagerPostHook|OpenPASS_OpSimulationPreHook|OpenPASS_OpSimulationPreRunHook|OpenPASS_OpSimulationUpdateHook|OpenPASS_OpSimulationPostRunHook|OpenPASS_OpSimulationPostHook|OpenPASS_OpSimulationResultFile'
    value: 'OpenPASS_GetVersion|OpenPASS_CreateInstance|OpenPASS_DestroyInstance|OpenPASS_UpdateInput|OpenPASS_UpdateOutput|OpenPASS_Trigger|OpenPASS_OpSimulationPreHook|OpenPASS_OpSimulationPreRunHook|OpenPASS_OpSimulationUpdateHook|OpenPASS_OpSimulationPostRunHook|OpenPASS_OpSimulationPostHook'
  - key: readability-identifier-naming.GlobalVariableCase
    value: camelBack
  - key: readability-identifier-naming.GlobalVariablePrefix 
+0 −1
Original line number Diff line number Diff line
* text=auto
+1 −18
Original line number Diff line number Diff line
Thumbs.db
# qt artifact
**/build-*
/.project
*.autosave
*.orig
*.rej
*.user
.directory
.vscode
DoxyGen/Function/doxy_build/*
Doxygen
doxyoutput
build
*.bak
Doxygen.log
Doxygen
DoxygenWarningLog.txt
.devcontainer

# autogenerated by cmake
doc/source/version.txt

# autogenerated by sphinx
doc/source/api.rst

# third party references
deps/*
sim/deps/*
deps/*

# clangd cache
.cache
+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ if(INSTALL_EXAMPLES)
  install(
    DIRECTORY sim/contrib/examples/
    DESTINATION ${SUBDIR_EXAMPLES}
    MESSAGE_NEVER
  )
endif()

+2 −23
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ WARN_LOGFILE = "DoxygenWarningLog.txt"

INPUT                  =  \
                          sim/src \
                          ../deps/direct_deploy/mantleapi/include \
                          sim/include \

# This tag can be used to specify the character encoding of the source files
@@ -957,27 +958,6 @@ RECURSIVE = YES
EXCLUDE                = \
                         sim/deps/thirdParty \
                         sim/src/core/opSimulation/modules/World_OSI/OWL/fakes \
                         \
                         sim/src/core/opSimulation/framework/vehicle.h \
                         sim/src/core/opSimulation/framework/pedestrian.h \
                         sim/src/core/opSimulation/framework/environment.h \
                         sim/src/core/opSimulation/framework/entity.h \
                         sim/src/core/opSimulation/framework/entityRepository.h \
                         sim/src/core/opSimulation/framework/controller.h \
                         sim/src/core/opSimulation/framework/controllerRepository.h \
                         sim/src/core/opSimulation/framework/coordConverter.h \
                         sim/src/core/opSimulation/framework/geometryHelper.h \
                         sim/src/core/opSimulation/framework/geometryHelper.cpp \
                         sim/src/core/opSimulation/framework/laneLocationQueryService.h \
                         sim/src/core/opSimulation/framework/laneLocationQueryService.cpp \
                         sim/src/core/opSimulation/framework/logger.h \
                         sim/src/core/opSimulation/framework/trafficSwarmService.h \
                         sim/src/core/opSimulation/framework/vehicle.cpp \
                         sim/src/core/opSimulation/framework/pedestrian.cpp \
                         sim/src/core/opSimulation/framework/environment.cpp \
                         sim/src/core/opSimulation/framework/entity.cpp \
                         sim/src/core/opSimulation/framework/entityRepository.cpp \
                         sim/src/core/opSimulation/framework/controllerRepository.cpp \

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -2310,7 +2290,6 @@ PREDEFINED = \
    SENSOR_DRIVER_SHARED_EXPORT=, \
    SENSOR_FUSION_SHARED_EXPORT=, \
    SENSOR_OSI_SHARED_EXPORT=, \
    SENSOR_RECORD_STATE_SHARED_EXPORT=, \
    SIGNAL_PRIORITIZER_SHARED_EXPORT=, \
    SPAWNPOINT_SHARED_EXPORT=, \
    STOCHASTICS_SHARED_EXPORT=, \
Loading