diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index c08fce867..7e98b088b 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -133,7 +133,7 @@ jobs: root_dir: package file_path: ${{ env.PACKAGE_NAME }} verbose: true - + # Nightly tags (for commits to main branch) - name: Upload binaries to release (main) uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 0b1294140..7aa07659b 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -127,7 +127,7 @@ jobs: root_dir: package file_path: ${{ env.PACKAGE_NAME }} verbose: true - + # Nightly tags (for commits to main branch) - name: Upload binaries to release (main) uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index 847a283cc..077356c12 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -60,7 +60,7 @@ jobs: - name: Retrieve dependencies hash id: dep_hash run: echo "hash=$(xmake l utils.ci.packageskey)" >> $GITHUB_OUTPUT - + # Cache xmake dependencies - name: Restore cached xmake dependencies id: restore-depcache @@ -127,7 +127,7 @@ jobs: root_dir: package file_path: ${{ env.PACKAGE_NAME }} verbose: true - + # Nightly tags (for commits to main branch) - name: Upload binaries to release (main) uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/wasm-build.yml b/.github/workflows/wasm-build.yml index 203f24297..642168eac 100644 --- a/.github/workflows/wasm-build.yml +++ b/.github/workflows/wasm-build.yml @@ -118,7 +118,7 @@ jobs: root_dir: package file_path: ${{ env.PACKAGE_NAME }} verbose: true - + # Nightly tags (for commits to main branch) - name: Upload binaries to release (main) uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 27c3b1779..93c687080 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -121,7 +121,7 @@ jobs: root_dir: package file_path: ${{ env.PACKAGE_NAME }} verbose: true - + # Nightly tags (for commits to main branch) - name: Upload binaries to release (main) uses: svenstaro/upload-release-action@v2 diff --git a/Doxyfile b/Doxyfile index 47af03df4..8ee51aab4 100644 --- a/Doxyfile +++ b/Doxyfile @@ -162,7 +162,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = +STRIP_FROM_PATH = # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which @@ -171,7 +171,7 @@ STRIP_FROM_PATH = # specify the list of include paths that are normally passed to the compiler # using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # less readable) file names. This can be useful is your file systems doesn't @@ -238,13 +238,13 @@ TAB_SIZE = 4 # "Side Effects:". You can put \n's in the value part of an alias to insert # newlines. -ALIASES = +ALIASES = # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding "class=itcl::class" # will allow you to use the command class in the itcl::class meaning. -TCL_SUBST = +TCL_SUBST = # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For @@ -291,7 +291,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # Note that for custom extensions you also need to set FILE_PATTERNS otherwise # the files are not read by doxygen. -EXTENSION_MAPPING = +EXTENSION_MAPPING = # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments # according to the Markdown format, which allows for more readable @@ -639,7 +639,7 @@ GENERATE_DEPRECATEDLIST= YES # sections, marked by \if ... \endif and \cond # ... \endcond blocks. -ENABLED_SECTIONS = +ENABLED_SECTIONS = # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the # initial value of a variable or macro / define can have for it to appear in the @@ -681,7 +681,7 @@ SHOW_NAMESPACES = YES # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed # by doxygen. The layout file controls the global structure of the generated @@ -694,7 +694,7 @@ FILE_VERSION_FILTER = # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE # tag is left empty. -LAYOUT_FILE = +LAYOUT_FILE = # The CITE_BIB_FILES tag can be used to specify one or more bib files containing # the reference definitions. This must be a list of .bib files. The .bib @@ -704,7 +704,7 @@ LAYOUT_FILE = # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the # search path. See also \cite for info how to create references. -CITE_BIB_FILES = +CITE_BIB_FILES = #--------------------------------------------------------------------------- # Configuration options related to warning and progress messages @@ -763,7 +763,7 @@ WARN_FORMAT = "$file:$line: $text" # messages should be written. If left blank the output is written to standard # error (stderr). -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files @@ -862,7 +862,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = # 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 @@ -878,7 +878,7 @@ EXCLUDE_SYMLINKS = NO # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the @@ -889,13 +889,13 @@ EXCLUDE_PATTERNS = # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = # The EXAMPLE_PATH tag can be used to specify one or more files or directories # that contain example code fragments that are included (see the \include # command). -EXAMPLE_PATH = +EXAMPLE_PATH = # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and @@ -915,7 +915,7 @@ EXAMPLE_RECURSIVE = NO # that contain images that are to be included in the documentation (see the # \image command). -IMAGE_PATH = +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -932,7 +932,7 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. -INPUT_FILTER = +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the @@ -941,7 +941,7 @@ INPUT_FILTER = # filters are used. If the FILTER_PATTERNS tag is empty or if none of the # patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = +FILTER_PATTERNS = # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER) will also be used to filter the input files that are used for @@ -956,14 +956,14 @@ FILTER_SOURCE_FILES = NO # *.ext= (so without naming a filter). # This tag requires that the tag FILTER_SOURCE_FILES is set to YES. -FILTER_SOURCE_PATTERNS = +FILTER_SOURCE_PATTERNS = # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that # is part of the input, its contents will be placed on the main page # (index.html). This can be useful if you have a project on for instance GitHub # and want to reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = +USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- # Configuration options related to source browsing @@ -1068,7 +1068,7 @@ CLANG_ASSISTED_PARSING = NO # specified with INPUT and INCLUDE_PATH. # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. -CLANG_OPTIONS = +CLANG_OPTIONS = #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index @@ -1094,7 +1094,7 @@ COLS_IN_ALPHA_INDEX = 5 # while generating the index headers. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the HTML output @@ -1138,7 +1138,7 @@ HTML_FILE_EXTENSION = .html # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = +HTML_HEADER = # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -1148,7 +1148,7 @@ HTML_HEADER = # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of @@ -1160,7 +1160,7 @@ HTML_FOOTER = # obsolete. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_STYLESHEET = +HTML_STYLESHEET = # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined # cascading style sheets that are included after the standard style sheets @@ -1173,7 +1173,7 @@ HTML_STYLESHEET = # list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note @@ -1183,7 +1183,7 @@ HTML_EXTRA_STYLESHEET = # files will be copied as-is; there are no commands or markers available. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_FILES = +HTML_EXTRA_FILES = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to @@ -1312,7 +1312,7 @@ GENERATE_HTMLHELP = NO # written to the html output directory. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_FILE = +CHM_FILE = # The HHC_LOCATION tag can be used to specify the location (absolute path # including file name) of the HTML help compiler (hhc.exe). If non-empty, @@ -1320,7 +1320,7 @@ CHM_FILE = # The file has to be specified with full path. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -HHC_LOCATION = +HHC_LOCATION = # The GENERATE_CHI flag controls if a separate .chi index file is generated # (YES) or that it should be included in the master .chm file (NO). @@ -1333,7 +1333,7 @@ GENERATE_CHI = NO # and project file content. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. -CHM_INDEX_ENCODING = +CHM_INDEX_ENCODING = # The BINARY_TOC flag controls whether a binary table of contents is generated # (YES) or a normal table of contents (NO) in the .chm file. Furthermore it @@ -1364,7 +1364,7 @@ GENERATE_QHP = NO # the HTML output folder. # This tag requires that the tag GENERATE_QHP is set to YES. -QCH_FILE = +QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace @@ -1389,7 +1389,7 @@ QHP_VIRTUAL_FOLDER = doc # filters). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom @@ -1397,21 +1397,21 @@ QHP_CUST_FILTER_NAME = # filters). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_CUST_FILTER_ATTRS = +QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. -QHP_SECT_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = # The QHG_LOCATION tag can be used to specify the location of Qt's # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the # generated .qhp file. # This tag requires that the tag GENERATE_QHP is set to YES. -QHG_LOCATION = +QHG_LOCATION = # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be # generated, together with the HTML files, they form an Eclipse help plugin. To @@ -1544,7 +1544,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_EXTENSIONS = +MATHJAX_EXTENSIONS = # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces # of code that will be used on startup of the MathJax code. See the MathJax site @@ -1552,7 +1552,7 @@ MATHJAX_EXTENSIONS = # example see the documentation. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_CODEFILE = +MATHJAX_CODEFILE = # When the SEARCHENGINE tag is enabled doxygen will generate a search box for # the HTML output. The underlying search engine uses javascript and DHTML and @@ -1612,7 +1612,7 @@ EXTERNAL_SEARCH = NO # Searching" for details. # This tag requires that the tag SEARCHENGINE is set to YES. -SEARCHENGINE_URL = +SEARCHENGINE_URL = # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed # search data is written to a file for indexing by an external tool. With the @@ -1628,7 +1628,7 @@ SEARCHDATA_FILE = searchdata.xml # projects and redirect the results back to the right project. # This tag requires that the tag SEARCHENGINE is set to YES. -EXTERNAL_SEARCH_ID = +EXTERNAL_SEARCH_ID = # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen # projects other than the one defined by this configuration file, but that are @@ -1638,7 +1638,7 @@ EXTERNAL_SEARCH_ID = # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... # This tag requires that the tag SEARCHENGINE is set to YES. -EXTRA_SEARCH_MAPPINGS = +EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- # Configuration options related to the LaTeX output @@ -1702,7 +1702,7 @@ PAPER_TYPE = a4 # If left blank no extra packages will be included. # This tag requires that the tag GENERATE_LATEX is set to YES. -EXTRA_PACKAGES = +EXTRA_PACKAGES = # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the # generated LaTeX document. The header should contain everything until the first @@ -1718,7 +1718,7 @@ EXTRA_PACKAGES = # to HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_HEADER = +LATEX_HEADER = # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the # generated LaTeX document. The footer should contain everything after the last @@ -1729,7 +1729,7 @@ LATEX_HEADER = # Note: Only use a user-defined footer if you know what you are doing! # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_FOOTER = +LATEX_FOOTER = # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined # LaTeX style sheets that are included after the standard style sheets created @@ -1740,7 +1740,7 @@ LATEX_FOOTER = # list). # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_EXTRA_STYLESHEET = +LATEX_EXTRA_STYLESHEET = # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the LATEX_OUTPUT output @@ -1748,7 +1748,7 @@ LATEX_EXTRA_STYLESHEET = # markers available. # This tag requires that the tag GENERATE_LATEX is set to YES. -LATEX_EXTRA_FILES = +LATEX_EXTRA_FILES = # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will @@ -1848,14 +1848,14 @@ RTF_HYPERLINKS = NO # default style sheet that doxygen normally uses. # This tag requires that the tag GENERATE_RTF is set to YES. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = # Set optional variables used in the generation of an RTF document. Syntax is # similar to doxygen's config file. A template extensions file can be generated # using doxygen -e rtf extensionFile. # This tag requires that the tag GENERATE_RTF is set to YES. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = # If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code # with syntax highlighting in the RTF output. @@ -1900,7 +1900,7 @@ MAN_EXTENSION = .3 # MAN_EXTENSION with the initial . removed. # This tag requires that the tag GENERATE_MAN is set to YES. -MAN_SUBDIR = +MAN_SUBDIR = # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it # will generate one additional man file for each entity documented in the real @@ -2013,7 +2013,7 @@ PERLMOD_PRETTY = YES # overwrite each other's variables. # This tag requires that the tag GENERATE_PERLMOD is set to YES. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor @@ -2054,7 +2054,7 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the @@ -2062,7 +2062,7 @@ INCLUDE_PATH = # used. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = # The PREDEFINED tag can be used to specify one or more macro names that are # defined before the preprocessor is started (similar to the -D option of e.g. @@ -2072,7 +2072,7 @@ INCLUDE_FILE_PATTERNS = # recursively expanded use the := operator instead of the = operator. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -PREDEFINED = +PREDEFINED = # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The @@ -2081,7 +2081,7 @@ PREDEFINED = # definition found in the source code. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will # remove all references to function-like macros that are alone on a line, have @@ -2110,13 +2110,13 @@ SKIP_FUNCTION_MACROS = YES # the path). If a tag file is not located in the directory in which doxygen is # run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = # When a file name is specified after GENERATE_TAGFILE, doxygen will create a # tag file that is based on the input files it reads. See section "Linking to # external documentation" for more information about the usage of tag files. -GENERATE_TAGFILE = +GENERATE_TAGFILE = # If the ALLEXTERNALS tag is set to YES, all external class will be listed in # the class index. If set to NO, only the inherited external classes will be @@ -2165,14 +2165,14 @@ CLASS_DIAGRAMS = YES # the mscgen tool resides. If left empty the tool is assumed to be found in the # default search path. -MSCGEN_PATH = +MSCGEN_PATH = # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. # If left empty dia is assumed to be found in the default search path. -DIA_PATH = +DIA_PATH = # If set to YES the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. @@ -2221,7 +2221,7 @@ DOT_FONTSIZE = 10 # the path where dot can find it using this tag. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTPATH = +DOT_FONTPATH = # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for # each documented class showing the direct and indirect inheritance relations. @@ -2365,26 +2365,26 @@ INTERACTIVE_SVG = NO # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile # command). # This tag requires that the tag HAVE_DOT is set to YES. -DOTFILE_DIRS = +DOTFILE_DIRS = # The MSCFILE_DIRS tag can be used to specify one or more directories that # contain msc files that are included in the documentation (see the \mscfile # command). -MSCFILE_DIRS = +MSCFILE_DIRS = # The DIAFILE_DIRS tag can be used to specify one or more directories that # contain dia files that are included in the documentation (see the \diafile # command). -DIAFILE_DIRS = +DIAFILE_DIRS = # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the # path where java can find the plantuml.jar file. If left blank, it is assumed @@ -2392,12 +2392,12 @@ DIAFILE_DIRS = # generate a warning when it encounters a \startuml command in this case and # will not generate output for the diagram. -PLANTUML_JAR_PATH = +PLANTUML_JAR_PATH = # When using plantuml, the specified paths are searched for files specified by # the !include statement in a plantuml block. -PLANTUML_INCLUDE_PATH = +PLANTUML_INCLUDE_PATH = # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes diff --git a/documentation/generator/src/main.cpp b/documentation/generator/src/main.cpp index 825c61105..a0a6925a9 100644 --- a/documentation/generator/src/main.cpp +++ b/documentation/generator/src/main.cpp @@ -285,7 +285,7 @@ nlohmann::ordered_json buildClass(const std::string& scope, const cppast::cpp_cl if (!isPublic) break; - const auto& memberFunc = static_cast(e); + const auto& memberFunc = static_cast(e); auto& constructorDoc = classDoc["constructors"].emplace_back(); constructorDoc["name"] = memberFunc.name(); diff --git a/examples/FirstScene/main.cpp b/examples/FirstScene/main.cpp index b5dcac3c9..c830638dc 100644 --- a/examples/FirstScene/main.cpp +++ b/examples/FirstScene/main.cpp @@ -263,7 +263,7 @@ int main() application.EnableFPSCounter(true); - //Gestion des Evenements + //Gestion des Evenements Nz::EventHandler& eventHandler = window.GetEventHandler(); Nz::Mouse::SetRelativeMouseMode(true); diff --git a/include/Nazara/Audio/Algorithm.inl b/include/Nazara/Audio/Algorithm.inl index 0970eaa23..a3ba1ae9c 100644 --- a/include/Nazara/Audio/Algorithm.inl +++ b/include/Nazara/Audio/Algorithm.inl @@ -13,7 +13,7 @@ namespace Nz * \returns The number of channels occupied by an audio format (mono returns 1, stereo returns 2, etc.) * * \param format A valid audio format - * + * * \remark format cannot be AudioFormat::Unknown * * \see GuessAudioFormat diff --git a/include/Nazara/Core/StateMachine.inl b/include/Nazara/Core/StateMachine.inl index 6a48141e6..b74ff8758 100644 --- a/include/Nazara/Core/StateMachine.inl +++ b/include/Nazara/Core/StateMachine.inl @@ -97,7 +97,7 @@ namespace Nz * \return true If it is the case * * \param state State to compare the top with - * + * * \remark Because all actions popping or pushing a state don't take effect until next state machine update, this can return false on a just enabled state */ inline bool StateMachine::IsStateEnabled(const State* state) const @@ -113,7 +113,7 @@ namespace Nz * \return true If it is the case * * \param state State to compare the top with - * + * * \remark Because all actions popping or pushing a state don't take effect until next state machine update, this can return false on a just pushed state */ inline bool StateMachine::IsTopState(const State* state) const diff --git a/include/Nazara/Core/VirtualDirectory.inl b/include/Nazara/Core/VirtualDirectory.inl index eaba79686..f9f29731f 100644 --- a/include/Nazara/Core/VirtualDirectory.inl +++ b/include/Nazara/Core/VirtualDirectory.inl @@ -393,7 +393,7 @@ namespace Nz directory = std::move(newDirectory); return true; - }, + }, [&](std::string_view name) { if (name.empty()) diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl index 2634d43cd..250298367 100644 --- a/include/Nazara/Math/Frustum.inl +++ b/include/Nazara/Math/Frustum.inl @@ -26,7 +26,7 @@ namespace Nz /*! * \brief Constructs a Frustum by specifying its planes * - * \param corners Corners + * \param corners Corners * \param planes Frustum of type U to convert to type T */ template diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index fd9568dba..af0fcc5a9 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -773,7 +773,7 @@ namespace Nz * \param context Serialization context * \param vector Input Vector2 */ - template + template bool Serialize(SerializationContext& context, const Vector2& vector, TypeTag>) { if (!Serialize(context, vector.x)) diff --git a/include/Nazara/Network/TcpServer.inl b/include/Nazara/Network/TcpServer.inl index 9f0d04b9b..08e134cd5 100644 --- a/include/Nazara/Network/TcpServer.inl +++ b/include/Nazara/Network/TcpServer.inl @@ -62,7 +62,7 @@ namespace Nz inline SocketState TcpServer::Listen(NetProtocol protocol, UInt16 port, unsigned int queueSize) { NazaraAssert(protocol != NetProtocol::Any, "Any protocol not supported for Listen"); //< TODO - NazaraAssert(protocol != NetProtocol::Unknown, "Invalid protocol"); + NazaraAssert(protocol != NetProtocol::Unknown, "Invalid protocol"); IpAddress any; switch (protocol) diff --git a/include/Nazara/Utility/Algorithm.inl b/include/Nazara/Utility/Algorithm.inl index a327d63cc..3da103998 100644 --- a/include/Nazara/Utility/Algorithm.inl +++ b/include/Nazara/Utility/Algorithm.inl @@ -82,8 +82,8 @@ namespace Nz template constexpr ComponentType GetComponentTypeOf() - { - return ComponentTypeId>(); + { + return ComponentTypeId>(); } } diff --git a/include/Nazara/Utility/RichTextDrawer.inl b/include/Nazara/Utility/RichTextDrawer.inl index c9a878957..9f1bef4f0 100644 --- a/include/Nazara/Utility/RichTextDrawer.inl +++ b/include/Nazara/Utility/RichTextDrawer.inl @@ -400,7 +400,7 @@ namespace Nz /*! * \class Nz::RichTextDrawer::BlockRef * \brief Helper class representing a block inside a RichTextDrawer, allowing easier access. - * + * * \warning This class is meant for temporary use, moving or destroying the RichTextDrawer or one of its blocks invalidates all BlockRef */ @@ -543,7 +543,7 @@ namespace Nz } /*! - * Changes the color of the referenced block characters + * Changes the color of the referenced block characters * \remark This is the only property that can be changed without forcing a glyph regeneration * * \see GetTextColor, SetCharacterSize, SetFont, SetStyle, SetText diff --git a/include/Nazara/Utility/VertexMapper.inl b/include/Nazara/Utility/VertexMapper.inl index ae4d1c580..143b7c5ca 100644 --- a/include/Nazara/Utility/VertexMapper.inl +++ b/include/Nazara/Utility/VertexMapper.inl @@ -30,7 +30,7 @@ namespace Nz return GetVertexBuffer()->GetVertexCount(); } - template + template bool VertexMapper::HasComponentOfType(VertexComponent component) const { return m_mapper.GetBuffer()->GetVertexDeclaration()->HasComponentOfType(component); diff --git a/include/Nazara/VulkanRenderer/Utils.inl b/include/Nazara/VulkanRenderer/Utils.inl index 5bc99ab0c..83bdead05 100644 --- a/include/Nazara/VulkanRenderer/Utils.inl +++ b/include/Nazara/VulkanRenderer/Utils.inl @@ -354,14 +354,14 @@ namespace Nz { switch (comparison) { - case RendererComparison::Never: return VK_COMPARE_OP_NEVER; - case RendererComparison::Less: return VK_COMPARE_OP_LESS; - case RendererComparison::Equal: return VK_COMPARE_OP_EQUAL; - case RendererComparison::LessOrEqual: return VK_COMPARE_OP_LESS_OR_EQUAL; - case RendererComparison::Greater: return VK_COMPARE_OP_GREATER; - case RendererComparison::NotEqual: return VK_COMPARE_OP_NOT_EQUAL; - case RendererComparison::GreaterOrEqual: return VK_COMPARE_OP_GREATER_OR_EQUAL; - case RendererComparison::Always: return VK_COMPARE_OP_ALWAYS; + case RendererComparison::Never: return VK_COMPARE_OP_NEVER; + case RendererComparison::Less: return VK_COMPARE_OP_LESS; + case RendererComparison::Equal: return VK_COMPARE_OP_EQUAL; + case RendererComparison::LessOrEqual: return VK_COMPARE_OP_LESS_OR_EQUAL; + case RendererComparison::Greater: return VK_COMPARE_OP_GREATER; + case RendererComparison::NotEqual: return VK_COMPARE_OP_NOT_EQUAL; + case RendererComparison::GreaterOrEqual: return VK_COMPARE_OP_GREATER_OR_EQUAL; + case RendererComparison::Always: return VK_COMPARE_OP_ALWAYS; } NazaraErrorFmt("unhandled RendererComparison {0:#x})", UnderlyingCast(comparison)); diff --git a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp index 9e2811929..1cbf71c06 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp index 3e11079b4..4f22c24c6 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp index 87c4dbcc6..4f52494eb 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp index 5b25e2f4d..9362f3849 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp @@ -13,7 +13,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp index 0d23b6eb6..a44eb88e0 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl index 999a3f562..b0575e6b5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.inl @@ -15,7 +15,7 @@ namespace Nz inline bool DescriptorSetLayout::Create(Device& device, UInt32 bindingCount, const VkDescriptorSetLayoutBinding* binding, VkDescriptorSetLayoutCreateFlags flags, const VkAllocationCallbacks* allocator) { - VkDescriptorSetLayoutCreateInfo createInfo = + VkDescriptorSetLayoutCreateInfo createInfo = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, // VkStructureType sType; nullptr, // const void* pNext; diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp index c28f47e81..e7a44e0b1 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp @@ -23,7 +23,7 @@ VK_DEFINE_HANDLE(VmaAllocator) VK_DEFINE_HANDLE(VmaAllocation) -namespace Nz +namespace Nz { class VulkanDescriptorSetLayoutCache; diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp index 61476af8d..d2a7043b0 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp @@ -11,7 +11,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp b/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp index 1983069a0..03dbe4b76 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Fence.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp index 5ebc084ba..b874f3405 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp index 27b9f0679..0e37dcbba 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp index b5a74dce3..9f449fa35 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Instance.inl b/include/Nazara/VulkanRenderer/Wrapper/Instance.inl index f7f30ac08..1f741442a 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Instance.inl +++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.inl @@ -11,7 +11,7 @@ namespace Nz::Vk { inline bool Instance::Create(RenderAPIValidationLevel validationLevel, const std::string& appName, UInt32 appVersion, const std::string& engineName, UInt32 engineVersion, UInt32 apiVersion, const std::vector& layers, const std::vector& extensions, const VkAllocationCallbacks* allocator) { - VkApplicationInfo appInfo = + VkApplicationInfo appInfo = { VK_STRUCTURE_TYPE_APPLICATION_INFO, nullptr, @@ -22,7 +22,7 @@ namespace Nz::Vk apiVersion }; - VkInstanceCreateInfo instanceInfo = + VkInstanceCreateInfo instanceInfo = { VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, nullptr, diff --git a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp index 2397de727..337fcafbd 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp @@ -13,7 +13,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp index 128dd06db..74b926ea0 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp @@ -11,7 +11,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp index 9321cf5e1..6d7bd04ce 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp index 409c68967..dd982f199 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp index 2a0097332..d9b21a854 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp @@ -12,7 +12,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp index 3ad966d76..26a1529e0 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp index 609d17fe8..cc6677522 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp index 62ca430bb..c739cad5d 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp @@ -10,7 +10,7 @@ #include #include -namespace Nz +namespace Nz { namespace Vk { diff --git a/include/Nazara/VulkanRenderer/Wrapper/Surface.inl b/include/Nazara/VulkanRenderer/Wrapper/Surface.inl index 4da5925b6..6768d0e2e 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Surface.inl +++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.inl @@ -37,7 +37,7 @@ namespace Nz::Vk inline bool Surface::Create(ANativeWindow* window, VkAndroidSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator) { - VkAndroidSurfaceCreateInfoKHR createInfo = + VkAndroidSurfaceCreateInfoKHR createInfo = { VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR, nullptr, diff --git a/src/Nazara/Audio/SoundEmitter.cpp b/src/Nazara/Audio/SoundEmitter.cpp index fe880c713..64c7d9b55 100644 --- a/src/Nazara/Audio/SoundEmitter.cpp +++ b/src/Nazara/Audio/SoundEmitter.cpp @@ -50,7 +50,7 @@ namespace Nz /*! * \brief Gets the attenuation - * \return Amount that your sound will drop off as by the inverse square law + * \return Amount that your sound will drop off as by the inverse square law */ float SoundEmitter::GetAttenuation() const { @@ -125,7 +125,7 @@ namespace Nz /*! * \brief Sets the attenuation * - * \param attenuation Amount that your sound will drop off as by the inverse square law + * \param attenuation Amount that your sound will drop off as by the inverse square law */ void SoundEmitter::SetAttenuation(float attenuation) { diff --git a/src/Nazara/Core/MemoryView.cpp b/src/Nazara/Core/MemoryView.cpp index ec18bac8a..e92da68ab 100644 --- a/src/Nazara/Core/MemoryView.cpp +++ b/src/Nazara/Core/MemoryView.cpp @@ -26,7 +26,7 @@ namespace Nz MemoryView::MemoryView(void* ptr, UInt64 size) : Stream(StreamOption::None, OpenMode_ReadWrite), - m_ptr(static_cast(ptr)), + m_ptr(static_cast(ptr)), m_pos(0), m_size(size) { diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index 41c15a3ce..5b91fff1a 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -105,7 +105,7 @@ NAZARA_WARNING_POP() #endif } #endif - + void SetCurrentThreadName(const char* threadName) { SetThreadName(GetCurrentThreadHandle(), threadName); diff --git a/src/Nazara/Graphics/FrameGraph.cpp b/src/Nazara/Graphics/FrameGraph.cpp index 9206b11a4..ca45d1b54 100644 --- a/src/Nazara/Graphics/FrameGraph.cpp +++ b/src/Nazara/Graphics/FrameGraph.cpp @@ -1072,7 +1072,7 @@ namespace Nz auto CheckExternalTexture = [this](std::size_t attachmentIndex, FrameGraphTextureData& data) { - // Check if texture + // Check if texture if (auto externalIt = m_externalTextures.find(attachmentIndex); externalIt != m_externalTextures.end()) { if (data.viewData) diff --git a/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl index f67708df1..33b70ef21 100644 --- a/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl @@ -154,16 +154,16 @@ fn FragDepthNoAlpha() {} //< dummy [cond(!Billboard)] struct VertIn { - [location(VertexPositionLoc)] + [location(VertexPositionLoc)] pos: vec3[f32], - [cond(HasVertexColor), location(VertexColorLoc)] + [cond(HasVertexColor), location(VertexColorLoc)] color: vec4[f32], [cond(HasNormal), location(VertexNormalLoc)] normal: vec3[f32], - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasSkinning), location(VertexJointIndicesLoc)] @@ -181,7 +181,7 @@ struct BillboardVertIn [location(VertexSizeRotLocation)] sizeRot: vec4[f32], //< width,height,sin,cos - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasVertexColor), location(VertexColorLoc)] diff --git a/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/InstanceData.nzsl b/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/InstanceData.nzsl index a3d1f33f3..afc7f1485 100644 --- a/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/InstanceData.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/Modules/Engine/InstanceData.nzsl @@ -1,6 +1,6 @@ [nzsl_version("1.0")] module Engine.InstanceData; - + [export] [layout(std140)] struct InstanceData diff --git a/src/Nazara/Graphics/Resources/Shaders/Modules/Math/CookTorrancePBR.nzsl b/src/Nazara/Graphics/Resources/Shaders/Modules/Math/CookTorrancePBR.nzsl index bb1533c93..c3f51a7b8 100644 --- a/src/Nazara/Graphics/Resources/Shaders/Modules/Math/CookTorrancePBR.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/Modules/Math/CookTorrancePBR.nzsl @@ -47,7 +47,7 @@ fn FresnelSchlick(cosTheta: f32, F0: vec3[f32]) -> vec3[f32] { // TODO: Clamp return F0 + (vec3[f32](1.0, 1.0, 1.0) - F0) * pow(min(max(1.0 - cosTheta, 0.0), 1.0), 5.0); -} +} [export] fn ComputeLightRadiance(lightColor: vec3[f32], posToLight: vec3[f32], lightAttenuation: f32, albedoFactor: vec3[f32], eyeVec: vec3[f32], F0: vec3[f32], normal: vec3[f32], metallic: f32, roughness: f32) -> vec3[f32] diff --git a/src/Nazara/Graphics/Resources/Shaders/Modules/Math/Depth.nzsl b/src/Nazara/Graphics/Resources/Shaders/Modules/Math/Depth.nzsl index 7e3ca1d36..73c70e2cd 100644 --- a/src/Nazara/Graphics/Resources/Shaders/Modules/Math/Depth.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/Modules/Math/Depth.nzsl @@ -5,4 +5,4 @@ module Math.Depth; fn LinearizeDepth(depth: f32, zNear: f32, zFar: f32) -> f32 { return zNear * zFar / (zFar + depth * (zNear - zFar)); -} +} diff --git a/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl index bb2fb916a..f30735830 100644 --- a/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl @@ -297,13 +297,13 @@ fn FragDepthNoAlpha() {} //< dummy [cond(!Billboard)] struct VertIn { - [location(VertexPositionLoc)] + [location(VertexPositionLoc)] pos: vec3[f32], - [cond(HasVertexColor), location(VertexColorLoc)] + [cond(HasVertexColor), location(VertexColorLoc)] color: vec4[f32], - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasNormal), location(VertexNormalLoc)] @@ -327,7 +327,7 @@ struct BillboardVertIn [location(VertexSizeRotLocation)] sizeRot: vec4[f32], //< width,height,sin,cos - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasVertexColor), location(VertexColorLoc)] diff --git a/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl index 93f8a654d..4790da7a5 100644 --- a/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/PhysicallyBasedMaterial.nzsl @@ -294,13 +294,13 @@ fn FragDepthNoAlpha() {} //< dummy [cond(!Billboard)] struct VertIn { - [location(VertexPositionLoc)] + [location(VertexPositionLoc)] pos: vec3[f32], - [cond(HasVertexColor), location(VertexColorLoc)] + [cond(HasVertexColor), location(VertexColorLoc)] color: vec4[f32], - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasNormal), location(VertexNormalLoc)] @@ -324,7 +324,7 @@ struct BillboardVertIn [location(VertexSizeRotLocation)] sizeRot: vec4[f32], //< width,height,sin,cos - [cond(HasVertexUV), location(VertexUvLoc)] + [cond(HasVertexUV), location(VertexUvLoc)] uv: vec2[f32], [cond(HasVertexColor), location(VertexColorLoc)] diff --git a/src/Nazara/JoltPhysics3D/JoltRigidBody3D.cpp b/src/Nazara/JoltPhysics3D/JoltRigidBody3D.cpp index 4eda46979..06332f878 100644 --- a/src/Nazara/JoltPhysics3D/JoltRigidBody3D.cpp +++ b/src/Nazara/JoltPhysics3D/JoltRigidBody3D.cpp @@ -302,7 +302,7 @@ namespace Nz void JoltRigidBody3D::WakeUp() { JPH::BodyInterface& bodyInterface = m_world->GetPhysicsSystem()->GetBodyInterface(); - bodyInterface.ActivateBody(m_body->GetID()); + bodyInterface.ActivateBody(m_body->GetID()); } JoltRigidBody3D& JoltRigidBody3D::operator=(JoltRigidBody3D&& body) noexcept diff --git a/src/Nazara/Network/Win32/SocketPollerImpl.cpp b/src/Nazara/Network/Win32/SocketPollerImpl.cpp index 3e5af3389..a55848acd 100644 --- a/src/Nazara/Network/Win32/SocketPollerImpl.cpp +++ b/src/Nazara/Network/Win32/SocketPollerImpl.cpp @@ -58,7 +58,7 @@ namespace Nz return m_allSockets.count(socket) != 0; #else // FD_ISSET is not const-correct - return FD_ISSET(socket, const_cast(&m_readSockets)) != 0 || + return FD_ISSET(socket, const_cast(&m_readSockets)) != 0 || FD_ISSET(socket, const_cast(&m_writeSockets)) != 0; #endif } diff --git a/src/Nazara/Renderer/Resources/Shaders/DebugDraw.nzsl b/src/Nazara/Renderer/Resources/Shaders/DebugDraw.nzsl index d566100a0..e6ca18ca6 100644 --- a/src/Nazara/Renderer/Resources/Shaders/DebugDraw.nzsl +++ b/src/Nazara/Renderer/Resources/Shaders/DebugDraw.nzsl @@ -35,10 +35,10 @@ fn main(input: FragIn) -> FragOut // Vertex stage struct VertIn { - [location(0)] + [location(0)] pos: vec3[f32], - [location(1)] + [location(1)] color: vec4[f32] } diff --git a/src/Nazara/Utility/Formats/DDSConstants.hpp b/src/Nazara/Utility/Formats/DDSConstants.hpp index b8dd1863d..38d730cf8 100644 --- a/src/Nazara/Utility/Formats/DDSConstants.hpp +++ b/src/Nazara/Utility/Formats/DDSConstants.hpp @@ -162,7 +162,7 @@ namespace Nz DDSCAPS2_VOLUME = 0x00200000, DDSCAPS2_CUBEMAP_ALLFACES = DDSCAPS2_CUBEMAP_POSITIVEX | DDSCAPS2_CUBEMAP_NEGATIVEX | - DDSCAPS2_CUBEMAP_POSITIVEY | DDSCAPS2_CUBEMAP_NEGATIVEY | + DDSCAPS2_CUBEMAP_POSITIVEY | DDSCAPS2_CUBEMAP_NEGATIVEY | DDSCAPS2_CUBEMAP_POSITIVEZ | DDSCAPS2_CUBEMAP_NEGATIVEZ }; diff --git a/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp b/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp index 978898105..52d153871 100644 --- a/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp +++ b/src/Nazara/VulkanRenderer/Wrapper/DescriptorPool.cpp @@ -29,7 +29,7 @@ namespace Nz std::vector DescriptorPool::AllocateDescriptorSets(UInt32 descriptorSetCount, const VkDescriptorSetLayout* setLayouts) { VkDescriptorSetAllocateInfo createInfo = { - VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, + VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, nullptr, m_handle, descriptorSetCount, diff --git a/src/ShaderNode/Previews/QuadPreview.cpp b/src/ShaderNode/Previews/QuadPreview.cpp index 8867e0d78..0fd42332b 100644 --- a/src/ShaderNode/Previews/QuadPreview.cpp +++ b/src/ShaderNode/Previews/QuadPreview.cpp @@ -13,7 +13,7 @@ PreviewValues QuadPreview::GetPreview(InputRole role, [[maybe_unused]] std::size return dummy; } - PreviewValues uv(128, 128); + PreviewValues uv(128, 128); float invWidth = 1.f / uv.GetWidth(); float invHeight = 1.f / uv.GetHeight(); diff --git a/tests/ComputeParticlesTest/xmake.lua b/tests/ComputeParticlesTest/xmake.lua index 8a08c1611..644f32f75 100644 --- a/tests/ComputeParticlesTest/xmake.lua +++ b/tests/ComputeParticlesTest/xmake.lua @@ -1,4 +1,4 @@ -if is_plat("wasm") then +if is_plat("wasm") then return -- Compute shaders are not supported with WebGL (but are with WebGPU) end diff --git a/tests/ComputeTest/xmake.lua b/tests/ComputeTest/xmake.lua index 08362a5d8..717609178 100644 --- a/tests/ComputeTest/xmake.lua +++ b/tests/ComputeTest/xmake.lua @@ -1,4 +1,4 @@ -if is_plat("wasm") then +if is_plat("wasm") then return -- Compute shaders are not supported with WebGL (but are with WebGPU) end diff --git a/tests/UnitTests/Engine/Audio/MusicTest.cpp b/tests/UnitTests/Engine/Audio/MusicTest.cpp index b97c59b3d..cb04ac5c3 100644 --- a/tests/UnitTests/Engine/Audio/MusicTest.cpp +++ b/tests/UnitTests/Engine/Audio/MusicTest.cpp @@ -44,7 +44,7 @@ SCENARIO("Music", "[AUDIO][MUSIC]") music.Play(); CHECK(music.GetStatus() == Nz::SoundStatus::Playing); - std::this_thread::sleep_for(std::chrono::seconds(1)); + std::this_thread::sleep_for(std::chrono::seconds(1)); Nz::Time t = music.GetPlayingOffset(); CHECK(music.GetPlayingOffset() >= 950_ms); std::this_thread::sleep_for(std::chrono::milliseconds(200)); diff --git a/tests/UnitTests/Engine/Math/QuaternionTest.cpp b/tests/UnitTests/Engine/Math/QuaternionTest.cpp index 15bac2e75..961a0d99f 100644 --- a/tests/UnitTests/Engine/Math/QuaternionTest.cpp +++ b/tests/UnitTests/Engine/Math/QuaternionTest.cpp @@ -203,7 +203,7 @@ SCENARIO("Quaternion", "[MATH][QUATERNION]") REQUIRE((rotation * origin).ApproxEqual(extremity, 0.0001f)); } } - } + } GIVEN("Different angles") { diff --git a/xmake/actions/checkfiles.lua b/xmake/actions/checkfiles.lua index 928baca9e..f2a371657 100644 --- a/xmake/actions/checkfiles.lua +++ b/xmake/actions/checkfiles.lua @@ -541,7 +541,7 @@ on_run(function () if folderCountA == folderCountB then return a.path < b.path else - return folderCountA < folderCountB + return folderCountA < folderCountB end else return a.order < b.order diff --git a/xmake/actions/generateheaders.lua b/xmake/actions/generateheaders.lua index 9b0a37583..913223674 100644 --- a/xmake/actions/generateheaders.lua +++ b/xmake/actions/generateheaders.lua @@ -91,7 +91,7 @@ on_run(function () Header = paths["OpenGLRenderer"].Header, HeaderGuard = "NAZARA_OPENGLRENDERER_WRAPPER_HPP", Name = "OpenGL wrapper", - SearchDir = "include/Nazara/OpenGLRenderer/Wrapper", + SearchDir = "include/Nazara/OpenGLRenderer/Wrapper", Target = "include/Nazara/OpenGLRenderer/Wrapper.hpp" } @@ -105,7 +105,7 @@ on_run(function () Header = paths["VulkanRenderer"].Header, HeaderGuard = "NAZARA_VULKANRENDERER_WRAPPER_HPP", Name = "Vulkan wrapper", - SearchDir = "include/Nazara/VulkanRenderer/Wrapper", + SearchDir = "include/Nazara/VulkanRenderer/Wrapper", Target = "include/Nazara/VulkanRenderer/Wrapper.hpp" } diff --git a/xmake/actions/unicode.lua b/xmake/actions/unicode.lua index fe2299c87..08e25b9c8 100644 --- a/xmake/actions/unicode.lua +++ b/xmake/actions/unicode.lua @@ -12,43 +12,43 @@ on_run(function() import("net.http") local CategoryToString = {} - CategoryToString["C"] = "Category_Other" - CategoryToString["Cc"] = "Category_Other_Control" - CategoryToString["Cf"] = "Category_Other_Format" - CategoryToString["Cn"] = "Category_Other_NotAssigned" - CategoryToString["Co"] = "Category_Other_PrivateUse" - CategoryToString["Cs"] = "Category_Other_Surrogate" - CategoryToString["L"] = "Category_Letter" - CategoryToString["Ll"] = "Category_Letter_Lowercase" - CategoryToString["Lm"] = "Category_Letter_Modifier" - CategoryToString["Lo"] = "Category_Letter_Other" - CategoryToString["Lt"] = "Category_Letter_Titlecase" - CategoryToString["Lu"] = "Category_Letter_Uppercase" - CategoryToString["M"] = "Category_Mark" - CategoryToString["Me"] = "Category_Mark_Enclosing" - CategoryToString["Mn"] = "Category_Mark_NonSpacing" - CategoryToString["Mc"] = "Category_Mark_SpacingCombining" - CategoryToString["N"] = "Category_Number" - CategoryToString["Nd"] = "Category_Number_DecimalDigit" - CategoryToString["Nl"] = "Category_Number_Letter" - CategoryToString["No"] = "Category_Number_Other" - CategoryToString["P"] = "Category_Punctuation" - CategoryToString["Pe"] = "Category_Punctuation_Close" - CategoryToString["Pc"] = "Category_Punctuation_Connector" - CategoryToString["Pd"] = "Category_Punctuation_Dash" - CategoryToString["Pf"] = "Category_Punctuation_FinalQuote" - CategoryToString["Pi"] = "Category_Punctuation_InitialQuote" - CategoryToString["Ps"] = "Category_Punctuation_Open" - CategoryToString["Po"] = "Category_Punctuation_Other" - CategoryToString["S"] = "Category_Symbol" - CategoryToString["Sc"] = "Category_Symbol_Currency" - CategoryToString["Sm"] = "Category_Symbol_Math" - CategoryToString["Sk"] = "Category_Symbol_Modifier" - CategoryToString["So"] = "Category_Symbol_Other" - CategoryToString["Z"] = "Category_Separator" - CategoryToString["Zl"] = "Category_Separator_Line" - CategoryToString["Zp"] = "Category_Separator_Paragraph" - CategoryToString["Zs"] = "Category_Separator_Space" + CategoryToString["C"] = "Category_Other" + CategoryToString["Cc"] = "Category_Other_Control" + CategoryToString["Cf"] = "Category_Other_Format" + CategoryToString["Cn"] = "Category_Other_NotAssigned" + CategoryToString["Co"] = "Category_Other_PrivateUse" + CategoryToString["Cs"] = "Category_Other_Surrogate" + CategoryToString["L"] = "Category_Letter" + CategoryToString["Ll"] = "Category_Letter_Lowercase" + CategoryToString["Lm"] = "Category_Letter_Modifier" + CategoryToString["Lo"] = "Category_Letter_Other" + CategoryToString["Lt"] = "Category_Letter_Titlecase" + CategoryToString["Lu"] = "Category_Letter_Uppercase" + CategoryToString["M"] = "Category_Mark" + CategoryToString["Me"] = "Category_Mark_Enclosing" + CategoryToString["Mn"] = "Category_Mark_NonSpacing" + CategoryToString["Mc"] = "Category_Mark_SpacingCombining" + CategoryToString["N"] = "Category_Number" + CategoryToString["Nd"] = "Category_Number_DecimalDigit" + CategoryToString["Nl"] = "Category_Number_Letter" + CategoryToString["No"] = "Category_Number_Other" + CategoryToString["P"] = "Category_Punctuation" + CategoryToString["Pe"] = "Category_Punctuation_Close" + CategoryToString["Pc"] = "Category_Punctuation_Connector" + CategoryToString["Pd"] = "Category_Punctuation_Dash" + CategoryToString["Pf"] = "Category_Punctuation_FinalQuote" + CategoryToString["Pi"] = "Category_Punctuation_InitialQuote" + CategoryToString["Ps"] = "Category_Punctuation_Open" + CategoryToString["Po"] = "Category_Punctuation_Other" + CategoryToString["S"] = "Category_Symbol" + CategoryToString["Sc"] = "Category_Symbol_Currency" + CategoryToString["Sm"] = "Category_Symbol_Math" + CategoryToString["Sk"] = "Category_Symbol_Modifier" + CategoryToString["So"] = "Category_Symbol_Other" + CategoryToString["Z"] = "Category_Separator" + CategoryToString["Zl"] = "Category_Separator_Line" + CategoryToString["Zp"] = "Category_Separator_Paragraph" + CategoryToString["Zs"] = "Category_Separator_Space" local DirectionToString = {} DirectionToString["AL"] = "Direction_Arabic_Letter" diff --git a/xmake/rules/download_assets.lua b/xmake/rules/download_assets.lua index 9cbf017a9..1c51c64fc 100644 --- a/xmake/rules/download_assets.lua +++ b/xmake/rules/download_assets.lua @@ -6,7 +6,7 @@ local function downloadAssetsRule(name) before_build(function (opt) import("net.http") import("utils.archive") - + local referenceVersion = tonumber(io.readfile("assets/" .. name .. "_version.txt")) local currentVersion = os.exists("assets/" .. name .. "/version.txt") and tonumber(io.readfile("assets/" .. name .. "/version.txt")) if referenceVersion == currentVersion then @@ -28,7 +28,7 @@ local function downloadAssetsRule(name) utils.vprintf("aborting " .. name .. " assets downloading\n") return end - + os.rm("assets/" .. name) http.download(baseDownloadURL .. "/assets_" .. name .. ".zip", "assets_" .. name .. ".zip") archive.extract("assets_" .. name .. ".zip", "assets")