mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/documentation-overhaul

Browse Source 
# Conflicts:
#	src/properties/propertyowner.cpp
#	src/scripting/scriptengine.cpp
This commit is contained in:
Ylva Selling
2023-03-02 11:28:33 -05:00
parent 8144fc9ea5 88972fc27b
commit c645fa81b6
1607 changed files with 10349 additions and 12703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/documentation/core_registration.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

4
include/openspace/documentation/documentation.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -121,6 +121,8 @@ struct SpecificationError : public ghoul::RuntimeError {
TestResult result;
};
void logError(const SpecificationError& error, std::string component = "");
struct Verifier;
/**

2
include/openspace/documentation/documentationengine.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

2
include/openspace/documentation/documentationgenerator.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
include/openspace/documentation/verifier.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -174,6 +174,8 @@ private:
* refers to an existing file on disk.
*/
struct FileVerifier : public StringVerifier {
FileVerifier();
TestResult operator()(const ghoul::Dictionary& dict,
const std::string& key) const override;
@@ -185,6 +187,8 @@ struct FileVerifier : public StringVerifier {
* refers to an existing directory on disk.
*/
struct DirectoryVerifier : public StringVerifier {
DirectoryVerifier();
TestResult operator()(const ghoul::Dictionary& dict,
const std::string& key) const override;
@@ -196,6 +200,8 @@ struct DirectoryVerifier : public StringVerifier {
* a valid date time
*/
struct DateTimeVerifier : public StringVerifier {
DateTimeVerifier();
TestResult operator()(const ghoul::Dictionary& dict,
const std::string& key) const override;

2
include/openspace/documentation/verifier.inl
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *