Started refactor to lazily compilable shaders.
This commit is contained in:
3
.idea/codeStyles/Project.xml
generated
3
.idea/codeStyles/Project.xml
generated
@@ -147,6 +147,9 @@
|
|||||||
<pair source="c" header="h" fileNamingConvention="SNAKE_CASE" />
|
<pair source="c" header="h" fileNamingConvention="SNAKE_CASE" />
|
||||||
</extensions>
|
</extensions>
|
||||||
</files>
|
</files>
|
||||||
|
<codeStyleSettings language="Glsl">
|
||||||
|
<option name="SPACE_BEFORE_COLON" value="false" />
|
||||||
|
</codeStyleSettings>
|
||||||
<codeStyleSettings language="ObjectiveC">
|
<codeStyleSettings language="ObjectiveC">
|
||||||
<indentOptions>
|
<indentOptions>
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
|||||||
479
.idea/editor.xml
generated
479
.idea/editor.xml
generated
@@ -98,6 +98,483 @@
|
|||||||
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/INDENT_SIZE/@EntryValue" value="4" type="int" />
|
||||||
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Single" type="string" />
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/CONTINUOUS_LINE_INDENT/@EntryValue" value="Single" type="string" />
|
||||||
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
|
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/TAB_WIDTH/@EntryValue" value="4" type="int" />
|
||||||
<option name="/Default/CodeStyle/CodeFormatting/CppFormatting/ALIGNMENT_TAB_FILL_STYLE/@EntryValue" />
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSmartPointerVsMakeFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionalStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReinterpretCastFromVoidPtr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConvertingConstructor/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConversionOperator/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDiscardedPostfixOperatorResult/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstValueFunctionReturnType/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeConst/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeStatic/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConst/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVariableCanBeMadeConstexpr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConstPtrOrRef/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPassValueParameterByConstReference/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppThrowExpressionCanBeReplacedWithRethrow/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroConstantCanBeReplacedWithNullptr/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCompileTimeConstantCanBeReplacedWithBooleanConstant/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIfCanBeReplacedByConstexprIf/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstevalIfIsAlwaysConstant/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStructuredBinding/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseTypeTraitAlias/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAlgorithmWithCount/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseRangeAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseElementsView/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStdSize/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForLoopCanBeReplacedWithWhile/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppJoinDeclarationAndAssignment/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceTieWithStructuredBinding/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceMemsetWithZeroInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAssociativeContains/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseEraseAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseFamiliarTemplateSyntaxForGenericLambdas/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScope/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScopeInitStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantNamespaceDefinition/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineFunctionDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineVariableDefinitionInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrivateSpecialMemberFunctionIsNotImplemented/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHiddenFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHidingFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPolymorphicClassWithNonVirtualPublicDestructor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractClassWithoutSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompleteSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultCaseNotHandledInSwitchStatement/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyErroneousEmptyStatements/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExpressionWithoutSideEffects/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNoDiscardExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionResultShouldBeUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingKeywordThrow/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTypeWithoutTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTemplateWithoutTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppImplicitDefaultConstructorNotAvailable/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedNonStaticDataMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRangeBasedForIncompatibleReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroValuedExpressionUsedAsNullPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUnintendedObjectSlicing/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorDisambiguatedAsFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionInFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMustBePublicVirtualToImplementInterface/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationSpecifierWithoutDeclarators/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEmptyDeclaration/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesLocal/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesUncapturedLocal/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMismatchedClassTags/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUsingResultOfAssignmentAsCondition/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIntegralToPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerToIntegralConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompatiblePointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerConversionDropsQualifiers/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStringLiteralToCharPointerConversion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExceptionSafeResourceAcquisition/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionCallInsideCtor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractVirtualFunctionCallInCtor/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInvalidLineContinuation/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfBadFormat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfRiskyFormat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfMissedArg/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfExtraArg/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatBadCode/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatLegacyCode/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatMixedArgs/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooFewArgs/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedEntity/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingIncludeGuard/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenSyntaxError/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUnresolvedReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUndocumentedParameter/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeletingVoidPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBooleanIncrementExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedRegisterStorageClassSpecifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIdenticalOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEqualOperandsInBinaryExpression/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedefinitionOfDefaultArgumentInOverrideFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnamedNamespaceInHeaderFile/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNamesMismatch/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultedSpecialMemberFunctionIsImplicitlyDeleted/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNodiscardFunctionWithoutReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantComplexityInComparison/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractFinalClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSpecialFunctionWithoutNoexceptSpecification/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnsignedZeroComparison/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterLiteral/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterWideLiteral/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAccessSpecifierWithNoDeclarations/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeyword/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeywordInsideCompoundStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantControlFlowJump/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyStatement/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyDeclaration/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantParentheses/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantLambdaParameterList/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantCastExpression/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHeaderHasBeenAlreadyIncluded/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateArgumentsCanBeDeduced/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateArguments/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticSpecifierOnAnonymousNamespaceMember/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnMemberAllocationFunction/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnThreadLocalLocalVariable/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassAccessSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantInlineSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConstSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBooleanExpressionArgument/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantVoidArgumentList/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantMemberInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassInitializer/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVolatileParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalFunctionInFinalClass/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalNonOverridingVirtualFunction/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElaboratedTypeSpecifier/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantDereferencingAndTakingAddress/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConditionalExpression/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConditionalExpressionCanBeSimplified/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantExportKeyword/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantZeroInitializerInAggregateInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUserDefinedLiteralSuffixDoesNotStartWithUnderscore/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterShadowing/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMutableSpecifierOnReferenceMember/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultInitializationWithNoUserConstructor/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExplicitSpecializationInNonNamespaceScope/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnionMemberOfReferenceType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedDependentBaseClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderIsNotIncluded/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderNotFound/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCoroutineCallResolveError/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAwaiterTypeIsNotClass/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppOutParameterMustBeWritten/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWarningDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticAssertFailure/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEvaluationFailure/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTypeAliasNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConceptNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnumeratorNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLambdaCaptureNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterNeverUsed/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityAssignedButNoRead/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityUsedOnlyInUnevaluatedContext/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppObjectMemberMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSomeObjectMembersMightNotBeInitialized/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorUsedBeforeInitialization/@EntryIndexedValue" value="ERROR" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnusedIncludeDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNotAllPathsReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CDeclarationWithImplicitIntType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionDoesntReturnValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReturnNoValueInNonVoidFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDereferenceOperatorLimitExceeded/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForwardEnumDeclarationWithoutUnderlyingType/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaEndRegionDirective/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticDataMemberInUnnamedStruct/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultIsUsedAsIdentifier/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLongFloat/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtReinterpretCastFromNullptr/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtBindingRValueToLvalueReference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtAddressOfClassRValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtDoubleUserConversionInCopyInit/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtCopyElisionInCopyInitDeclarator/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtNotInitializedStaticConstLocalVar/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRemoveRedundantBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceIfStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceForStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceWhileStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceDoStatementBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongIncludesOrder/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongSlashesInIncludeDirective/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceNestedNamespacesStyle/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceTypeAliasCodeStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceFunctionDeclarationStyle/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberInitializersOrder/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingFunctionStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingDestructorStyle/@EntryIndexedValue" value="SUGGESTION" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAuto/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAutoForNumeric/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersPlacement/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersOrder/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexedValue" value="WARNING" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexedValue" value="HINT" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSmartPointerVsMakeFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionalStyleCast/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReinterpretCastFromVoidPtr/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConvertingConstructor/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExplicitConversionOperator/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDiscardedPostfixOperatorResult/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstValueFunctionReturnType/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeConst/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberFunctionMayBeStatic/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMayBeConst/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConst/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVariableCanBeMadeConstexpr/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterMayBeConstPtrOrRef/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPassValueParameterByConstReference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppThrowExpressionCanBeReplacedWithRethrow/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroConstantCanBeReplacedWithNullptr/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCompileTimeConstantCanBeReplacedWithBooleanConstant/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIfCanBeReplacedByConstexprIf/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IfStdIsConstantEvaluatedCanBeReplaced/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StdIsConstantEvaluatedWillAlwaysEvaluateToConstant/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConstevalIfIsAlwaysConstant/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStructuredBinding/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseTypeTraitAlias/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAlgorithmWithCount/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseRangeAlgorithm/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseElementsView/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStdSize/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForLoopCanBeReplacedWithWhile/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppJoinDeclarationAndAssignment/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceTieWithStructuredBinding/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceMemsetWithZeroInitialization/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAssociativeContains/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseEraseAlgorithm/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseFamiliarTemplateSyntaxForGenericLambdas/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScope/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTooWideScopeInitStatement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantNamespaceDefinition/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineFunctionDefinitionInHeaderFile/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonInlineVariableDefinitionInHeaderFile/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionIsNotImplemented/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrivateSpecialMemberFunctionIsNotImplemented/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHiddenFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHidingFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPolymorphicClassWithNonVirtualPublicDestructor/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractClassWithoutSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompleteSwitchStatement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultCaseNotHandledInSwitchStatement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyErroneousEmptyStatements/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExpressionWithoutSideEffects/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNoDiscardExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionResultShouldBeUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingKeywordThrow/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTypeWithoutTypenameKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTemplateWithoutTemplateKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppImplicitDefaultConstructorNotAvailable/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedNonStaticDataMember/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRangeBasedForIncompatibleReference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppZeroValuedExpressionUsedAsNullPointer/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUnintendedObjectSlicing/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPossiblyUninitializedMember/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorDisambiguatedAsFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionInFinalClass/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMustBePublicVirtualToImplementInterface/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationSpecifierWithoutDeclarators/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEmptyDeclaration/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesLocal/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesUncapturedLocal/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMismatchedClassTags/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUsingResultOfAssignmentAsCondition/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIntegralToPointerConversion/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerToIntegralConversion/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIncompatiblePointerConversion/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPointerConversionDropsQualifiers/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStringLiteralToCharPointerConversion/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNonExceptionSafeResourceAcquisition/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVirtualFunctionCallInsideCtor/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractVirtualFunctionCallInCtor/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInvalidLineContinuation/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfBadFormat/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfRiskyFormat/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfMissedArg/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrintfExtraArg/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatBadCode/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatLegacyCode/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatMixedArgs/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooFewArgs/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedEntity/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMissingIncludeGuard/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenSyntaxError/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUnresolvedReference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDoxygenUndocumentedParameter/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeletingVoidPointer/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBooleanIncrementExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeprecatedRegisterStorageClassSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppIdenticalOperandsInBinaryExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEqualOperandsInBinaryExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedefinitionOfDefaultArgumentInOverrideFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnamedNamespaceInHeaderFile/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNamesMismatch/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultedSpecialMemberFunctionIsImplicitlyDeleted/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNodiscardFunctionWithoutReturnValue/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantComplexityInComparison/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAbstractFinalClass/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSpecialFunctionWithoutNoexceptSpecification/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnsignedZeroComparison/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterLiteral/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMultiCharacterWideLiteral/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantQualifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantAccessSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAccessSpecifierWithNoDeclarations/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTypenameKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElseKeywordInsideCompoundStatement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantControlFlowJump/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyStatement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantEmptyDeclaration/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantParentheses/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantLambdaParameterList/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantCastExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppHeaderHasBeenAlreadyIncluded/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateArgumentsCanBeDeduced/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTemplateArguments/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticSpecifierOnAnonymousNamespaceMember/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnMemberAllocationFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantStaticSpecifierOnThreadLocalLocalVariable/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassAccessSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantInlineSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConstSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBooleanExpressionArgument/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantVoidArgumentList/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantMemberInitializer/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantBaseClassInitializer/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstParameterInDeclaration/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppVolatileParameterInDeclaration/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalFunctionInFinalClass/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFinalNonOverridingVirtualFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantElaboratedTypeSpecifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantDereferencingAndTakingAddress/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantConditionalExpression/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConditionalExpressionCanBeSimplified/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantExportKeyword/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantZeroInitializerInAggregateInitialization/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUserDefinedLiteralSuffixDoesNotStartWithUnderscore/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterShadowing/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMutableSpecifierOnReferenceMember/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultInitializationWithNoUserConstructor/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppExplicitSpecializationInNonNamespaceScope/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnionMemberOfReferenceType/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUninitializedDependentBaseClass/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderIsNotIncluded/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppPrecompiledHeaderNotFound/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCoroutineCallResolveError/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppAwaiterTypeIsNotClass/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppOutParameterMustBeWritten/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWarningDirective/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticAssertFailure/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEvaluationFailure/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTypeAliasNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConceptNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnumeratorNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLambdaCaptureNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableWithNonTrivialDtorIsNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppParameterNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTemplateParameterNeverUsed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityAssignedButNoRead/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEntityUsedOnlyInUnevaluatedContext/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLocalVariableMightNotBeInitialized/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppObjectMemberMightNotBeInitialized/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppSomeObjectMembersMightNotBeInitialized/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclaratorUsedBeforeInitialization/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnusedIncludeDirective/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppNotAllPathsReturnValue/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CDeclarationWithImplicitIntType/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppFunctionDoesntReturnValue/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReturnNoValueInNonVoidFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDereferenceOperatorLimitExceeded/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppForwardEnumDeclarationWithoutUnderlyingType/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaRegionDirective/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnmatchedPragmaEndRegionDirective/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppStaticDataMemberInUnnamedStruct/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultIsUsedAsIdentifier/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppLongFloat/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtReinterpretCastFromNullptr/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtBindingRValueToLvalueReference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtAddressOfClassRValue/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtDoubleUserConversionInCopyInit/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtCopyElisionInCopyInitDeclarator/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMsExtNotInitializedStaticConstLocalVar/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRemoveRedundantBraces/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceIfStatementBraces/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceForStatementBraces/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceWhileStatementBraces/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceDoStatementBraces/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongIncludesOrder/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppWrongSlashesInIncludeDirective/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceNestedNamespacesStyle/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceTypeAliasCodeStyle/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceFunctionDeclarationStyle/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppMemberInitializersOrder/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingFunctionStyle/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceOverridingDestructorStyle/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAuto/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAutoForNumeric/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersPlacement/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppEnforceCVQualifiersOrder/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUnnecessaryWhitespace/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppTabsAreDisallowed/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppInconsistentNaming/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexRemoved" />
|
||||||
|
<option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexRemoved" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
6
.idea/misc.xml
generated
6
.idea/misc.xml
generated
@@ -1,11 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="BackendCodeEditorMiscSettings">
|
|
||||||
<option name="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue" value="true" type="bool" />
|
|
||||||
<option name="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue" value="69" type="long" />
|
|
||||||
<option name="/Default/Housekeeping/OptionsDialog/SelectedPageId/@EntryValue" value="CppFormatterOtherPage" type="string" />
|
|
||||||
<option name="/Default/Housekeeping/RefactoringsMru/RenameRefactoring/DoSearchForTextInStrings/@EntryValue" />
|
|
||||||
</component>
|
|
||||||
<component name="CMakePythonSetting">
|
<component name="CMakePythonSetting">
|
||||||
<option name="pythonIntegrationState" value="YES" />
|
<option name="pythonIntegrationState" value="YES" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
1
.idea/vcs.xml
generated
1
.idea/vcs.xml
generated
@@ -3,6 +3,5 @@
|
|||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/libraries/include/glm" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/libraries/include/glm" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/libraries/include/stb" vcs="Git" />
|
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@@ -102,12 +102,11 @@ add_executable(z3d main.cpp
|
|||||||
source/opengl/handles/shader_program_handle.cpp
|
source/opengl/handles/shader_program_handle.cpp
|
||||||
include/opengl/shader_program_lookup.hpp
|
include/opengl/shader_program_lookup.hpp
|
||||||
source/opengl/shader_program_lookup.cpp
|
source/opengl/shader_program_lookup.cpp
|
||||||
include/shader_program/attributes/mesh_attributes.hpp
|
|
||||||
include/shader_program/attributes/point_cloud_attributes.hpp
|
include/shader_program/attributes/point_cloud_attributes.hpp
|
||||||
include/shader_program/uniforms/mesh_uniforms.hpp
|
include/shader_program/uniforms/mesh_uniforms.hpp
|
||||||
include/shader_program/uniforms/point_cloud_uniforms.hpp
|
include/shader_program/uniforms/point_cloud_uniforms.hpp
|
||||||
include/shader_program/capabilities/mesh_capabilities.hpp
|
include/shader_program/features/mesh_features.hpp
|
||||||
include/shader_program/capabilities/point_cloud_capabilities.hpp
|
include/shader_program/features/point_cloud_features.hpp
|
||||||
include/rendering/requirements/mesh_requirements.hpp
|
include/rendering/requirements/mesh_requirements.hpp
|
||||||
include/rendering/requirements/point_cloud_requirements.hpp
|
include/rendering/requirements/point_cloud_requirements.hpp
|
||||||
include/rendering/modes/mesh_modes.hpp
|
include/rendering/modes/mesh_modes.hpp
|
||||||
@@ -123,11 +122,11 @@ add_executable(z3d main.cpp
|
|||||||
source/geometry/normal_estimation.cpp
|
source/geometry/normal_estimation.cpp
|
||||||
include/geometry/normal_estimation.hpp
|
include/geometry/normal_estimation.hpp
|
||||||
include/assets/components/texture_components.hpp
|
include/assets/components/texture_components.hpp
|
||||||
include/util/enum_operators.hpp
|
include/util/enum_bitfield_operators.hpp
|
||||||
include/assets/dynamic_read_buffers/dynamic_texture_buffer.hpp
|
include/assets/dynamic_read_buffers/dynamic_texture_buffer.hpp
|
||||||
source/assets/dynamic_read_buffers/dynamic_mesh_buffer.ipp
|
source/assets/dynamic_read_buffers/dynamic_mesh_buffer.ipp
|
||||||
source/assets/dynamic_read_buffers/dynamic_material_buffer.ipp
|
source/assets/dynamic_read_buffers/dynamic_material_buffer.ipp
|
||||||
include/assets/dynamic_read_buffers/dynamic_vertex_buffer.hpp
|
include/assets/dynamic_read_buffers/generic/dynamic_vertex_buffer.hpp
|
||||||
source/assets/dynamic_read_buffers/dynamic_model_buffer.ipp
|
source/assets/dynamic_read_buffers/dynamic_model_buffer.ipp
|
||||||
source/assets/dynamic_read_buffers/dynamic_texture_buffer.ipp
|
source/assets/dynamic_read_buffers/dynamic_texture_buffer.ipp
|
||||||
source/assets/dynamic_read_buffers/dynamic_point_cloud_buffer.ipp
|
source/assets/dynamic_read_buffers/dynamic_point_cloud_buffer.ipp
|
||||||
@@ -173,12 +172,15 @@ add_executable(z3d main.cpp
|
|||||||
include/assets/dynamic_data_loaders/dynamic_material_library_loader.hpp
|
include/assets/dynamic_data_loaders/dynamic_material_library_loader.hpp
|
||||||
include/assets/prefetch_lookups/material_library_prefetch_lookup.hpp
|
include/assets/prefetch_lookups/material_library_prefetch_lookup.hpp
|
||||||
include/assets/prefetch_lookups/shader_prefetch_lookup.hpp
|
include/assets/prefetch_lookups/shader_prefetch_lookup.hpp
|
||||||
include/assets/dynamic_data_stores/dynamic_shader_store.hpp
|
include/assets/dynamic_data_stores/dynamic_shader_source_store.hpp
|
||||||
include/assets/data_loaders/generic/generic_3dtk_loader.hpp
|
include/assets/data_loaders/generic/generic_3dtk_loader.hpp
|
||||||
source/assets/data_loaders/generic/generic_3dtk_loader.ipp
|
source/assets/data_loaders/generic/generic_3dtk_loader.ipp
|
||||||
include/assets/prefetch_lookup.hpp
|
include/assets/prefetch_lookup.hpp
|
||||||
source/assets/prefetch_lookups/pose_prefetch_lookup.cpp
|
source/assets/prefetch_lookups/pose_prefetch_lookup.cpp
|
||||||
include/assets/dynamic_data_store.hpp
|
include/assets/dynamic_data_store.hpp
|
||||||
|
include/opengl/data_uploaders/shader_program_compiler.hpp
|
||||||
|
include/shader_program/metadata_type.hpp
|
||||||
|
source/opengl/data_uploaders/shader_compiler.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(z3d PRIVATE include)
|
target_include_directories(z3d PRIVATE include)
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include "../dynamic_read_buffers"
|
#include "../dynamic_read_buffers"
|
||||||
#include "assets/data/surface_properties.hpp"
|
#include "assets/data/surface_properties.hpp"
|
||||||
#include "util/enum_operators.hpp"
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
|
||||||
namespace components::material
|
namespace components::material
|
||||||
{
|
{
|
||||||
@@ -56,4 +56,4 @@ constexpr inline auto count = std::tuple_size_v<all>;
|
|||||||
|
|
||||||
} // namespace material_component
|
} // namespace material_component
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(components::material::flags)
|
DEFINE_ENUM_BITFIELD_OPERATORS(components::material::flags)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include "util/enum_operators.hpp"
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
|
||||||
namespace components::mesh_vertex {
|
namespace components::mesh_vertex {
|
||||||
|
|
||||||
@@ -36,4 +36,4 @@ constexpr inline auto count = std::tuple_size_v<all>;
|
|||||||
|
|
||||||
} // namespace components::mesh_vertex
|
} // namespace components::mesh_vertex
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(components::mesh_vertex::flags)
|
DEFINE_ENUM_BITFIELD_OPERATORS(components::mesh_vertex::flags)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include "util/enum_operators.hpp"
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
|
||||||
namespace components::point_cloud_vertex {
|
namespace components::point_cloud_vertex {
|
||||||
|
|
||||||
@@ -33,4 +33,4 @@ constexpr inline auto count = std::tuple_size_v<all>;
|
|||||||
|
|
||||||
} // namespace components::point_cloud_vertex
|
} // namespace components::point_cloud_vertex
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(components::point_cloud_vertex::flags)
|
DEFINE_ENUM_BITFIELD_OPERATORS(components::point_cloud_vertex::flags)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
#include "util/enum_operators.hpp"
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
|
||||||
namespace components::texture {
|
namespace components::texture {
|
||||||
|
|
||||||
@@ -25,4 +25,4 @@ constexpr inline auto count = std::tuple_size_v<all>;
|
|||||||
|
|
||||||
} // namespace components::texture
|
} // namespace components::texture
|
||||||
|
|
||||||
DEFINE_ENUM_FLAG_OPERATORS(components::texture::flags)
|
DEFINE_ENUM_BITFIELD_OPERATORS(components::texture::flags)
|
||||||
@@ -24,7 +24,7 @@ struct glsl_loader
|
|||||||
dynamic_shader_buffer& buffer,
|
dynamic_shader_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -26,7 +26,7 @@ struct kitti_loader
|
|||||||
dynamic_point_cloud_buffer& buffer,
|
dynamic_point_cloud_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ struct kitti_pose_loader
|
|||||||
dynamic_pose_buffer& buffer,
|
dynamic_pose_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ struct mtl_loader
|
|||||||
dynamic_material_library_buffer& material_library_buffer,
|
dynamic_material_library_buffer& material_library_buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ struct obj_loader {
|
|||||||
dynamic_mesh_buffer& buffer,
|
dynamic_mesh_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -76,7 +76,7 @@ protected:
|
|||||||
std::set<indexed_vertex_type>& vertex_ids,
|
std::set<indexed_vertex_type>& vertex_ids,
|
||||||
std::ifstream& in,
|
std::ifstream& in,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic
|
bool pedantic
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ struct stl_loader {
|
|||||||
dynamic_mesh_buffer& buffer,
|
dynamic_mesh_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ struct threedtk_pose_loader
|
|||||||
dynamic_pose_buffer& buffer,
|
dynamic_pose_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic = false
|
bool pedantic = false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#include "dynamic_data_stores/dynamic_mesh_store.hpp"
|
#include "dynamic_data_stores/dynamic_mesh_store.hpp"
|
||||||
#include "dynamic_data_stores/dynamic_point_cloud_store.hpp"
|
#include "dynamic_data_stores/dynamic_point_cloud_store.hpp"
|
||||||
#include "dynamic_data_stores/dynamic_pose_store.hpp"
|
#include "dynamic_data_stores/dynamic_pose_store.hpp"
|
||||||
#include "dynamic_data_stores/dynamic_shader_store.hpp"
|
#include "dynamic_data_stores/dynamic_shader_source_store.hpp"
|
||||||
#include "dynamic_data_stores/dynamic_texture_store.hpp"
|
#include "dynamic_data_stores/dynamic_texture_store.hpp"
|
||||||
|
|
||||||
struct dynamic_data_store
|
struct dynamic_data_store
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "generic/generic_dynamic_store.hpp"
|
||||||
|
#include "assets/dynamic_read_buffers/dynamic_shader_buffer.hpp"
|
||||||
|
|
||||||
|
// TODO use compressed store where all shaders are condensed into one vector
|
||||||
|
using dynamic_shader_source_store = generic_dynamic_store<dynamic_shader_buffer>;
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "generic/generic_dynamic_store.hpp"
|
|
||||||
#include "glm/mat4x4.hpp"
|
|
||||||
|
|
||||||
class dynamic_shader_store {
|
|
||||||
|
|
||||||
|
|
||||||
};
|
|
||||||
204
include/opengl/data_uploaders/shader_compiler.hpp
Normal file
204
include/opengl/data_uploaders/shader_compiler.hpp
Normal file
@@ -0,0 +1,204 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <bit>
|
||||||
|
#include <format>
|
||||||
|
#include <ranges>
|
||||||
|
#include <bits/ranges_algo.h>
|
||||||
|
|
||||||
|
#include "assets/dynamic_data_stores/dynamic_shader_source_store.hpp"
|
||||||
|
#include "opengl/shader_program_lookup.hpp"
|
||||||
|
#include "opengl/handles/shader_handle.hpp"
|
||||||
|
#include "opengl/handles/shader_program_handle.hpp"
|
||||||
|
#include "shader_program/metadata_type.hpp"
|
||||||
|
#include "shader_program/features/mesh_features.hpp"
|
||||||
|
#include "shader_program/features/point_cloud_features.hpp"
|
||||||
|
#include "util/string_lookup.hpp"
|
||||||
|
#include "shader_program/metadata_type.hpp"
|
||||||
|
|
||||||
|
namespace zgl
|
||||||
|
{
|
||||||
|
class shader_program_compiler
|
||||||
|
{
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// compile shader programs for given requirements
|
||||||
|
// cache shader programs with their capabilities
|
||||||
|
// store sstream for creating defines
|
||||||
|
|
||||||
|
// register shader source code
|
||||||
|
// store define types for these shaders as bitmap
|
||||||
|
void register_shader_sources(
|
||||||
|
const dynamic_shader_source_store& shader_sources
|
||||||
|
);
|
||||||
|
|
||||||
|
void compile_shaders(
|
||||||
|
const dynamic_shader_source_store& shader_sources,
|
||||||
|
std::span<const shader_program::metadata_type> required_capabilities,
|
||||||
|
std::vector<shader_handle>& shader_handles
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void tokenize_declarations(
|
||||||
|
std::string_view source,
|
||||||
|
std::vector<std::string_view> tokens,
|
||||||
|
std::vector<std::size_t> declaration_token_counts,
|
||||||
|
std::span<std::size_t> declaration_type_indices
|
||||||
|
);
|
||||||
|
|
||||||
|
std::optional<shader_program::metadata_type> parse_metadata_from_tokens(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
std::span<const std::size_t> declaration_token_counts,
|
||||||
|
std::span<const std::size_t> declaration_type_indices
|
||||||
|
);
|
||||||
|
|
||||||
|
[[nodiscard]] static bool parse_stage_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
[[nodiscard]] static bool parse_geometry_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
[[nodiscard]] static bool parse_features_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
[[nodiscard]] static bool parse_feature_toggles_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
);
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
static void parse_feature_tokens(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
const ztu::string_lookup<T>& feature_lookup,
|
||||||
|
T& features
|
||||||
|
);
|
||||||
|
|
||||||
|
std::optional<dynamic_shader_source_store::id_type> zgl::shader_program_compiler::find_compatible_shader_source(
|
||||||
|
shader_program::metadata_type& requirements
|
||||||
|
);
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void add_required_feature_defines(
|
||||||
|
T toggle_flags,
|
||||||
|
std::span<const std::string> defines,
|
||||||
|
std::vector<const char*>& shader_strings
|
||||||
|
);
|
||||||
|
|
||||||
|
private:
|
||||||
|
enum class metadata_declaration_type : std::size_t
|
||||||
|
{
|
||||||
|
stage = 0,
|
||||||
|
geometry = 1,
|
||||||
|
features = 2,
|
||||||
|
feature_toggles = 3,
|
||||||
|
invalid = std::numeric_limits<std::size_t>::max()
|
||||||
|
};
|
||||||
|
|
||||||
|
inline static auto declaration_lookup = ztu::string_lookup<metadata_declaration_type>{
|
||||||
|
{ "STAGE", metadata_declaration_type::stage },
|
||||||
|
{ "GEOMETRY", metadata_declaration_type::geometry },
|
||||||
|
{ "FEATURES", metadata_declaration_type::features },
|
||||||
|
{ "FEATURE_TOGGLES", metadata_declaration_type::feature_toggles }
|
||||||
|
};
|
||||||
|
|
||||||
|
inline static auto stage_lookup = ztu::string_lookup<shader_program::stages>{
|
||||||
|
{ "VERTEX", shader_program::stages::vertex },
|
||||||
|
{ "GEOMETRY", shader_program::stages::geometry },
|
||||||
|
{ "FRAGMENT", shader_program::stages::fragment },
|
||||||
|
};
|
||||||
|
|
||||||
|
inline static auto geometry_lookup = ztu::string_lookup<shader_program::geometries>{
|
||||||
|
{ "MESH", shader_program::geometries::mesh },
|
||||||
|
{ "POINT_CLOUD", shader_program::geometries::point_cloud }
|
||||||
|
};
|
||||||
|
|
||||||
|
inline static auto mesh_feature_lookup = []
|
||||||
|
{
|
||||||
|
using namespace shader_program::features::mesh;
|
||||||
|
|
||||||
|
auto lookup = ztu::string_lookup<flags>{};
|
||||||
|
lookup.reserve(all.size());
|
||||||
|
|
||||||
|
constexpr auto all_flags = std::array{
|
||||||
|
flags::face, flags::line, flags::point,
|
||||||
|
flags::luminance, flags::color, flags::alpha,
|
||||||
|
flags::lighting, flags::texture, flags::uniform_color
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const auto& [ define, flag ] : std::ranges::views::zip(defines, all_flags))
|
||||||
|
{
|
||||||
|
lookup.emplace(std::string(define), flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
return lookup;
|
||||||
|
}();
|
||||||
|
|
||||||
|
inline static auto point_cloud_feature_lookup = []
|
||||||
|
{
|
||||||
|
using namespace shader_program::features::point_cloud;
|
||||||
|
|
||||||
|
auto lookup = ztu::string_lookup<flags>{};
|
||||||
|
lookup.reserve(all.size());
|
||||||
|
|
||||||
|
constexpr auto all_flags = std::array{
|
||||||
|
flags::square, flags::lighting, flags::luminance,
|
||||||
|
flags::color, flags::alpha, flags::uniform_color,
|
||||||
|
flags::rainbow
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const auto& [ define, flag ] : std::ranges::views::zip(defines, all_flags))
|
||||||
|
{
|
||||||
|
lookup.emplace(std::string(define), flag);
|
||||||
|
}
|
||||||
|
|
||||||
|
return lookup;
|
||||||
|
}();
|
||||||
|
|
||||||
|
inline static auto mesh_feature_defines = []
|
||||||
|
{
|
||||||
|
using namespace shader_program::features::mesh;
|
||||||
|
|
||||||
|
auto statements = std::array<std::string, all.size()>{};
|
||||||
|
|
||||||
|
std::ranges::transform(
|
||||||
|
defines,
|
||||||
|
statements.begin(),
|
||||||
|
[](const auto& name) {
|
||||||
|
return std::format("#define {}\n", name);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return statements;
|
||||||
|
}();
|
||||||
|
|
||||||
|
inline static auto point_cloud_feature_defines = []
|
||||||
|
{
|
||||||
|
using namespace shader_program::features::point_cloud;
|
||||||
|
|
||||||
|
auto statements = std::array<std::string, all.size()>{};
|
||||||
|
|
||||||
|
std::ranges::transform(
|
||||||
|
defines,
|
||||||
|
statements.begin(),
|
||||||
|
[](const auto& name) {
|
||||||
|
return std::format("#define {}\n", name);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return statements;
|
||||||
|
}();
|
||||||
|
|
||||||
|
|
||||||
|
std::vector<std::pair<shader_program::metadata_type, dynamic_shader_source_store::id_type>> shader_lookup;
|
||||||
|
};
|
||||||
|
}
|
||||||
42
include/opengl/data_uploaders/shader_program_compiler.hpp
Normal file
42
include/opengl/data_uploaders/shader_program_compiler.hpp
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
|
#include "assets/dynamic_data_stores/dynamic_shader_source_store.hpp"
|
||||||
|
#include "opengl/shader_program_lookup.hpp"
|
||||||
|
#include "opengl/handles/shader_program_handle.hpp"
|
||||||
|
|
||||||
|
template<typename Capabilities>
|
||||||
|
class shader_program_compiler
|
||||||
|
{
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
|
||||||
|
// compile shader programs for given requirements
|
||||||
|
// cache shader programs with their capabilities
|
||||||
|
// store sstream for creating defines
|
||||||
|
|
||||||
|
// register shader source code
|
||||||
|
// store define types for these shaders as bitmap
|
||||||
|
void register_shader_sources(
|
||||||
|
const dynamic_shader_source_store& shader_sources
|
||||||
|
);
|
||||||
|
|
||||||
|
void find_or_compile_shader_programs(
|
||||||
|
std::span<const Capabilities> required_capabilities,
|
||||||
|
zgl::shader_program_lookup& shader_program_lookup
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
// create metadata for all sources
|
||||||
|
|
||||||
|
// get
|
||||||
|
|
||||||
|
protected:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unordered_map<dynamic_shader_source_store::id_type, Capabilities> shader_capabilities;
|
||||||
|
|
||||||
|
};
|
||||||
@@ -16,26 +16,15 @@ class texture_data_uploader
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
std::vector<GLuint> texture_ids;
|
std::vector<GLuint> texture_ids;
|
||||||
std::vector<GLuint> invalid_texture_ids;
|
|
||||||
|
|
||||||
texture_ids.resize(dynamic_data.size());
|
texture_ids.resize(dynamic_data.size());
|
||||||
|
|
||||||
glGenTextures(texture_ids.size(), texture_ids.data());
|
glGenTextures(texture_ids.size(), texture_ids.data());
|
||||||
|
|
||||||
auto texture_id_it = texture_ids.begin();
|
const auto invalid_texture_ids = std::ranges::partition(
|
||||||
|
texture_ids,
|
||||||
for (std::size_t i{}; i != dynamic_data.size(); ++i)
|
[](GLuint texture_id)
|
||||||
{
|
{
|
||||||
const auto& texture_id = *texture_id_it;
|
|
||||||
const auto& texture = dynamic_data[i];
|
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texture_id);
|
|
||||||
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
||||||
|
|
||||||
GLenum format;
|
GLenum format;
|
||||||
switch (texture.components()) {
|
switch (texture.components()) {
|
||||||
using enum components::texture::flags;
|
using enum components::texture::flags;
|
||||||
@@ -52,16 +41,17 @@ class texture_data_uploader
|
|||||||
format = GL_RGBA;
|
format = GL_RGBA;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
format = GL_INVALID_ENUM;
|
return false;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (format == GL_INVALID_ENUM)
|
glBindTexture(GL_TEXTURE_2D, texture_id);
|
||||||
{
|
|
||||||
invalid_texture_ids.push_back(texture_id);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
|
||||||
}
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
|
||||||
else
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||||
{
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||||
|
|
||||||
|
|
||||||
glTexImage2D(
|
glTexImage2D(
|
||||||
GL_TEXTURE_2D, 0,
|
GL_TEXTURE_2D, 0,
|
||||||
GL_RGBA8,
|
GL_RGBA8,
|
||||||
@@ -73,12 +63,16 @@ class texture_data_uploader
|
|||||||
texture.data()
|
texture.data()
|
||||||
);
|
);
|
||||||
glGenerateMipmap(GL_TEXTURE_2D);
|
glGenerateMipmap(GL_TEXTURE_2D);
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
);
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, 0);
|
glBindTexture(GL_TEXTURE_2D, 0);
|
||||||
|
|
||||||
glDeleteTextures(invalid_texture_ids.size(), invalid_texture_ids.data());
|
glDeleteTextures(invalid_texture_ids.size(), invalid_texture_ids.data());
|
||||||
|
|
||||||
|
invalid_texture_ids.resize(texture_ids.size() - invalid_texture_ids.size());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "assets/components/material_components.hpp"
|
#include "assets/components/material_components.hpp"
|
||||||
#include "assets/components/mesh_vertex_components.hpp"
|
#include "assets/components/mesh_vertex_components.hpp"
|
||||||
#include "shader_program/capabilities/mesh_capabilities.hpp"
|
#include "shader_program/features/mesh_features.hpp"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "assets/components/point_cloud_vertex_components.hpp"
|
#include "assets/components/point_cloud_vertex_components.hpp"
|
||||||
#include "shader_program/capabilities/point_cloud_capabilities.hpp"
|
#include "shader_program/features/point_cloud_features.hpp"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
|
|||||||
@@ -2,82 +2,42 @@
|
|||||||
|
|
||||||
#include "opengl/shader_program_variable.hpp"
|
#include "opengl/shader_program_variable.hpp"
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
namespace shader_program::attributes::mesh
|
namespace shader_program::attributes::mesh
|
||||||
{
|
{
|
||||||
|
|
||||||
enum class flags : int {
|
enum class flags : unsigned {
|
||||||
none = 0,
|
none = 0,
|
||||||
position = 1 << 0,
|
position = 1 << 0,
|
||||||
normal = 1 << 1,
|
normal = 1 << 1,
|
||||||
tex_coord = 1 << 2
|
luminance = 1 << 2,
|
||||||
|
color = 1 << 3,
|
||||||
|
alpha = 1 << 4,
|
||||||
|
tex_coord = 1 << 5
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr inline auto position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 0 }, "vertex_position");
|
constexpr inline auto position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 0 }, "model_vertex_position");
|
||||||
constexpr inline auto normal = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "vertex_normal");
|
constexpr inline auto normal = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "model_vertex_normal");
|
||||||
constexpr inline auto tex_coord = zgl::shader_program_variable({ GL_FLOAT_VEC2, 2 }, "vertex_tex_coord");
|
constexpr inline auto luminance = zgl::shader_program_variable({ GL_FLOAT, 2 }, "model_vertex_l");
|
||||||
|
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 2 }, "model_vertex_rgb");
|
||||||
|
constexpr inline auto alpha = zgl::shader_program_variable({ GL_FLOAT, 3 }, "model_vertex_a");
|
||||||
|
constexpr inline auto tex_coord = zgl::shader_program_variable({ GL_FLOAT_VEC2, 2 }, "model_vertex_tex_coord");
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
constexpr inline auto all = std::array{
|
||||||
position, normal, tex_coord
|
position, normal, luminance, color, alpha, tex_coord
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array<std::string_view, 6>{
|
||||||
|
"position",
|
||||||
|
"normal",
|
||||||
|
"luminance",
|
||||||
|
"color",
|
||||||
|
"alpha",
|
||||||
|
"tex_coord"
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DEFINE_ENUM_BITFIELD_OPERATORS(shader_program::attributes::mesh::flags)
|
||||||
[[nodiscard]] constexpr shader_program::attributes::mesh::flags operator|(
|
|
||||||
const shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::mesh::flags>(static_cast<int>(a) | static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::mesh::flags operator&(
|
|
||||||
const shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::mesh::flags>(static_cast<int>(a) & static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::mesh::flags operator^(
|
|
||||||
const shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::mesh::flags>(static_cast<int>(a) ^ static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::mesh::flags operator~(const shader_program::attributes::mesh::flags& a) {
|
|
||||||
return static_cast<shader_program::attributes::mesh::flags>(~static_cast<int>(a));
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::mesh::flags& operator|=(shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b) {
|
|
||||||
return a = a | b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::mesh::flags& operator&=(shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b) {
|
|
||||||
return a = a & b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::mesh::flags& operator^=(shader_program::attributes::mesh::flags& a, const shader_program::attributes::mesh::flags& b) {
|
|
||||||
return a = a ^ b;
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<(
|
|
||||||
shader_program::attributes::mesh::flags lhs, shader_program::attributes::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) < static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<=(
|
|
||||||
shader_program::attributes::mesh::flags lhs, shader_program::attributes::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) <= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>(
|
|
||||||
shader_program::attributes::mesh::flags lhs, shader_program::attributes::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) > static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>=(
|
|
||||||
shader_program::attributes::mesh::flags lhs, shader_program::attributes::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) >= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,83 +2,40 @@
|
|||||||
|
|
||||||
#include "opengl/shader_program_variable.hpp"
|
#include "opengl/shader_program_variable.hpp"
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
namespace shader_program::attributes::point_cloud
|
namespace shader_program::attributes::point_cloud
|
||||||
{
|
{
|
||||||
|
|
||||||
enum class flags : int {
|
enum class flags : unsigned {
|
||||||
none = 0,
|
none = 0,
|
||||||
position = 1 << 0,
|
position = 1 << 0,
|
||||||
normal = 1 << 1,
|
normal = 1 << 1,
|
||||||
|
luminance = 1 << 2,
|
||||||
color = 1 << 2,
|
color = 1 << 2,
|
||||||
reflectance = 1 << 3
|
alpha = 1 << 3
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr inline auto position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 0 }, "vertex_position");
|
constexpr inline auto position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 0 }, "model_vertex_position");
|
||||||
constexpr inline auto normal = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "vertex_normal");
|
constexpr inline auto normal = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "model_vertex_normal");
|
||||||
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 2 }, "vertex_color");
|
constexpr inline auto luminance = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "model_vertex_l");
|
||||||
constexpr inline auto reflectance = zgl::shader_program_variable({ GL_FLOAT, 2 }, "vertex_reflectance");
|
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "model_vertex_rgb");
|
||||||
|
constexpr inline auto alpha = zgl::shader_program_variable({ GL_FLOAT_VEC3, 1 }, "model_vertex_a");
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
constexpr inline auto all = std::array{
|
||||||
position, normal, color, reflectance
|
position, normal, luminance, color, alpha
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array<std::string_view, 5>{
|
||||||
|
"position",
|
||||||
|
"normal",
|
||||||
|
"luminance",
|
||||||
|
"color",
|
||||||
|
"alpha"
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::point_cloud::flags operator|(
|
DEFINE_ENUM_BITFIELD_OPERATORS(shader_program::attributes::point_cloud::flags)
|
||||||
const shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::point_cloud::flags>(static_cast<int>(a) | static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::point_cloud::flags operator&(
|
|
||||||
const shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::point_cloud::flags>(static_cast<int>(a) & static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::point_cloud::flags operator^(
|
|
||||||
const shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::attributes::point_cloud::flags>(static_cast<int>(a) ^ static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::attributes::point_cloud::flags operator~(const shader_program::attributes::point_cloud::flags& a) {
|
|
||||||
return static_cast<shader_program::attributes::point_cloud::flags>(~static_cast<int>(a));
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::point_cloud::flags& operator|=(shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b) {
|
|
||||||
return a = a | b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::point_cloud::flags& operator&=(shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b) {
|
|
||||||
return a = a & b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::attributes::point_cloud::flags& operator^=(shader_program::attributes::point_cloud::flags& a, const shader_program::attributes::point_cloud::flags& b) {
|
|
||||||
return a = a ^ b;
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<(
|
|
||||||
shader_program::attributes::point_cloud::flags lhs, shader_program::attributes::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) < static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<=(
|
|
||||||
shader_program::attributes::point_cloud::flags lhs, shader_program::attributes::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) <= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>(
|
|
||||||
shader_program::attributes::point_cloud::flags lhs, shader_program::attributes::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) > static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>=(
|
|
||||||
shader_program::attributes::point_cloud::flags lhs, shader_program::attributes::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) >= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "assets/components/mesh_vertex_components.hpp"
|
|
||||||
#include "assets/components/point_cloud_vertex_components.hpp"
|
|
||||||
#include "assets/components/material_components.hpp"
|
|
||||||
#include "shader_program/attributes/mesh_attributes.hpp"
|
|
||||||
#include "shader_program/uniforms/mesh_uniforms.hpp"
|
|
||||||
|
|
||||||
namespace shader_program::capabilities::mesh
|
|
||||||
{
|
|
||||||
|
|
||||||
struct type
|
|
||||||
{
|
|
||||||
attributes::mesh::flags attributes{
|
|
||||||
attributes::mesh::flags::none
|
|
||||||
};
|
|
||||||
uniforms::mesh::flags uniforms{
|
|
||||||
uniforms::mesh::flags::none
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace indices
|
|
||||||
{
|
|
||||||
using type = ztu::u8;
|
|
||||||
constexpr inline type position = 0;
|
|
||||||
constexpr inline type lit = 1;
|
|
||||||
constexpr inline type textured = 2;
|
|
||||||
constexpr inline type uniform_color = 3;
|
|
||||||
constexpr inline type uniform_alpha = 4;
|
|
||||||
constexpr inline type point = 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
enum class flags : int
|
|
||||||
{
|
|
||||||
none = 0,
|
|
||||||
position = 1 << indices::position,
|
|
||||||
lit = 1 << indices::lit,
|
|
||||||
textured = 1 << indices::textured,
|
|
||||||
uniform_color = 1 << indices::uniform_color,
|
|
||||||
uniform_alpha = 1 << indices::uniform_alpha,
|
|
||||||
point = 1 << indices::point
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto position = type{
|
|
||||||
.attributes = attributes::mesh::flags::position,
|
|
||||||
.uniforms = uniforms::mesh::flags::mvp
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto lit = type{
|
|
||||||
.attributes = attributes::mesh::flags::normal,
|
|
||||||
.uniforms = (
|
|
||||||
uniforms::mesh::flags::model_matrix |
|
|
||||||
uniforms::mesh::flags::view_pos |
|
|
||||||
uniforms::mesh::flags::point_light_direction |
|
|
||||||
uniforms::mesh::flags::point_light_color |
|
|
||||||
uniforms::mesh::flags::ambient_light_color |
|
|
||||||
uniforms::mesh::flags::ambient_filter |
|
|
||||||
uniforms::mesh::flags::diffuse_filter |
|
|
||||||
uniforms::mesh::flags::specular_filter |
|
|
||||||
uniforms::mesh::flags::shininess
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto point = type{
|
|
||||||
.uniforms = uniforms::mesh::flags::point_size
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto textured = type{
|
|
||||||
.attributes = attributes::mesh::flags::tex_coord,
|
|
||||||
.uniforms = uniforms::mesh::flags::tex
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto uniform_color = type{
|
|
||||||
.uniforms = uniforms::mesh::flags::color
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto uniform_alpha = type{
|
|
||||||
.uniforms = uniforms::mesh::flags::alpha
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
|
||||||
position, lit, textured, uniform_color, uniform_alpha, point
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "shader_program/attributes/point_cloud_attributes.hpp"
|
|
||||||
#include "shader_program/uniforms/point_cloud_uniforms.hpp"
|
|
||||||
|
|
||||||
#include "assets/components/mesh_vertex_components.hpp"
|
|
||||||
#include "assets/components/point_cloud_vertex_components.hpp"
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
namespace shader_program::capabilities::point_cloud
|
|
||||||
{
|
|
||||||
|
|
||||||
struct type
|
|
||||||
{
|
|
||||||
attributes::point_cloud::flags attributes{
|
|
||||||
attributes::point_cloud::flags::none
|
|
||||||
};
|
|
||||||
uniforms::point_cloud::flags uniforms{
|
|
||||||
uniforms::point_cloud::flags::none
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace indices
|
|
||||||
{
|
|
||||||
using type = ztu::u8;
|
|
||||||
constexpr inline type position = 0;
|
|
||||||
constexpr inline type vertex_color = 1;
|
|
||||||
constexpr inline type uniform_color = 2;
|
|
||||||
constexpr inline type normal = 3;
|
|
||||||
constexpr inline type reflectance = 4;
|
|
||||||
constexpr inline type rainbow = 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
enum class flags : int
|
|
||||||
{
|
|
||||||
none = 0,
|
|
||||||
position = 1 << indices::position,
|
|
||||||
vertex_color = 1 << indices::vertex_color,
|
|
||||||
uniform_color = 1 << indices::uniform_color,
|
|
||||||
normal = 1 << indices::normal,
|
|
||||||
reflectance = 1 << indices::reflectance,
|
|
||||||
rainbow = 1 << indices::rainbow
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto position = type{
|
|
||||||
.attributes = attributes::point_cloud::flags::position,
|
|
||||||
.uniforms = uniforms::point_cloud::flags::mvp
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto rainbow = type{};
|
|
||||||
|
|
||||||
constexpr inline auto vertex_color = type{
|
|
||||||
.attributes = attributes::point_cloud::flags::color
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto uniform_color = type{
|
|
||||||
.uniforms = uniforms::point_cloud::flags::color
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto normal = type{
|
|
||||||
.attributes = attributes::point_cloud::flags::normal,
|
|
||||||
.uniforms = (
|
|
||||||
uniforms::point_cloud::flags::model |
|
|
||||||
uniforms::point_cloud::flags::camera_position
|
|
||||||
)
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto reflectance = type{
|
|
||||||
.attributes = attributes::point_cloud::flags::reflectance
|
|
||||||
};
|
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
|
||||||
position, vertex_color, uniform_color, normal, reflectance, rainbow
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
134
include/shader_program/features/mesh_features.hpp
Normal file
134
include/shader_program/features/mesh_features.hpp
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "assets/components/mesh_vertex_components.hpp"
|
||||||
|
#include "assets/components/point_cloud_vertex_components.hpp"
|
||||||
|
#include "assets/components/material_components.hpp"
|
||||||
|
#include "shader_program/attributes/mesh_attributes.hpp"
|
||||||
|
#include "shader_program/uniforms/mesh_uniforms.hpp"
|
||||||
|
#include <array>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace shader_program::features::mesh
|
||||||
|
{
|
||||||
|
|
||||||
|
struct type
|
||||||
|
{
|
||||||
|
attributes::mesh::flags attributes{
|
||||||
|
attributes::mesh::flags::none
|
||||||
|
};
|
||||||
|
uniforms::mesh::flags uniforms{
|
||||||
|
uniforms::mesh::flags::none
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace indices
|
||||||
|
{
|
||||||
|
using type = ztu::u8;
|
||||||
|
constexpr inline type face = 0;
|
||||||
|
constexpr inline type line = 1;
|
||||||
|
constexpr inline type point = 2;
|
||||||
|
constexpr inline type luminance = 3;
|
||||||
|
constexpr inline type color = 4;
|
||||||
|
constexpr inline type alpha = 5;
|
||||||
|
constexpr inline type lighting = 6;
|
||||||
|
constexpr inline type texture = 7;
|
||||||
|
constexpr inline type uniform_color = 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class flags : unsigned
|
||||||
|
{
|
||||||
|
none = 0,
|
||||||
|
face = 1 << indices::face,
|
||||||
|
line = 1 << indices::line,
|
||||||
|
point = 1 << indices::point,
|
||||||
|
luminance = 1 << indices::luminance,
|
||||||
|
color = 1 << indices::color,
|
||||||
|
alpha = 1 << indices::alpha,
|
||||||
|
lighting = 1 << indices::lighting,
|
||||||
|
texture = 1 << indices::texture,
|
||||||
|
uniform_color = 1 << indices::uniform_color,
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto face = type{
|
||||||
|
.attributes = attributes::mesh::flags::position,
|
||||||
|
.uniforms = uniforms::mesh::flags::mvp_matrix
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto line = type{
|
||||||
|
.attributes = attributes::mesh::flags::position,
|
||||||
|
.uniforms = uniforms::mesh::flags::mvp_matrix
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto point = type{
|
||||||
|
.attributes = attributes::mesh::flags::position,
|
||||||
|
.uniforms = (
|
||||||
|
uniforms::mesh::flags::mvp_matrix |
|
||||||
|
uniforms::mesh::flags::point_size
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto luminance = type{
|
||||||
|
.attributes = attributes::mesh::flags::luminance
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto color = type{
|
||||||
|
.attributes = attributes::mesh::flags::color
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto alpha = type{
|
||||||
|
.attributes = attributes::mesh::flags::alpha
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto lighting = type{
|
||||||
|
.attributes = attributes::mesh::flags::normal,
|
||||||
|
.uniforms = (
|
||||||
|
uniforms::mesh::flags::model_matrix |
|
||||||
|
uniforms::mesh::flags::view_pos |
|
||||||
|
uniforms::mesh::flags::point_light_direction |
|
||||||
|
uniforms::mesh::flags::point_light_color |
|
||||||
|
uniforms::mesh::flags::ambient_light_color |
|
||||||
|
uniforms::mesh::flags::ambient_filter |
|
||||||
|
uniforms::mesh::flags::diffuse_filter |
|
||||||
|
uniforms::mesh::flags::specular_filter |
|
||||||
|
uniforms::mesh::flags::shininess
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto texture = type{
|
||||||
|
.attributes = attributes::mesh::flags::tex_coord,
|
||||||
|
.uniforms = uniforms::mesh::flags::tex
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto uniform_color = type{
|
||||||
|
.uniforms = uniforms::mesh::flags::color
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto all = std::array{
|
||||||
|
face, line, point, luminance, color, alpha, lighting, texture, uniform_color
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array<std::string_view, 9>{
|
||||||
|
"face",
|
||||||
|
"line",
|
||||||
|
"point",
|
||||||
|
"luminance",
|
||||||
|
"color",
|
||||||
|
"alpha",
|
||||||
|
"lighting",
|
||||||
|
"texture",
|
||||||
|
"uniform_color"
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto defines = std::array<std::string_view, 9>{
|
||||||
|
"FACE",
|
||||||
|
"LINE",
|
||||||
|
"POINT",
|
||||||
|
"V_L",
|
||||||
|
"V_RGB",
|
||||||
|
"V_A",
|
||||||
|
"LIGHTING",
|
||||||
|
"TEXTURE",
|
||||||
|
"U_RGBA"
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
112
include/shader_program/features/point_cloud_features.hpp
Normal file
112
include/shader_program/features/point_cloud_features.hpp
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "shader_program/attributes/point_cloud_attributes.hpp"
|
||||||
|
#include "shader_program/uniforms/point_cloud_uniforms.hpp"
|
||||||
|
|
||||||
|
#include "assets/components/mesh_vertex_components.hpp"
|
||||||
|
#include "assets/components/point_cloud_vertex_components.hpp"
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
|
||||||
|
namespace shader_program::features::point_cloud
|
||||||
|
{
|
||||||
|
|
||||||
|
struct type
|
||||||
|
{
|
||||||
|
attributes::point_cloud::flags attributes{
|
||||||
|
attributes::point_cloud::flags::none
|
||||||
|
};
|
||||||
|
uniforms::point_cloud::flags uniforms{
|
||||||
|
uniforms::point_cloud::flags::none
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace indices
|
||||||
|
{
|
||||||
|
using type = ztu::u8;
|
||||||
|
constexpr inline type square = 0;
|
||||||
|
constexpr inline type lighting = 1;
|
||||||
|
constexpr inline type luminance = 2;
|
||||||
|
constexpr inline type color = 3;
|
||||||
|
constexpr inline type alpha = 4;
|
||||||
|
constexpr inline type uniform_color = 5;
|
||||||
|
constexpr inline type rainbow = 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class flags : unsigned
|
||||||
|
{
|
||||||
|
none = 0,
|
||||||
|
square = 1 << indices::square,
|
||||||
|
lighting = 1 << indices::lighting,
|
||||||
|
luminance = 1 << indices::luminance,
|
||||||
|
color = 1 << indices::color,
|
||||||
|
alpha = 1 << indices::alpha,
|
||||||
|
uniform_color = 1 << indices::uniform_color,
|
||||||
|
rainbow = 1 << indices::rainbow
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto square = type{
|
||||||
|
.attributes = attributes::point_cloud::flags::position,
|
||||||
|
.uniforms = (
|
||||||
|
uniforms::point_cloud::flags::mvp_matrix |
|
||||||
|
uniforms::point_cloud::flags::point_size
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto lighting = type{
|
||||||
|
.attributes = attributes::point_cloud::flags::normal,
|
||||||
|
.uniforms = (
|
||||||
|
uniforms::point_cloud::flags::model_matrix |
|
||||||
|
uniforms::point_cloud::flags::camera_position
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto luminance = type{
|
||||||
|
.attributes = attributes::point_cloud::flags::luminance
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto color = type{
|
||||||
|
.attributes = attributes::point_cloud::flags::color
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto alpha = type{
|
||||||
|
.attributes = attributes::point_cloud::flags::alpha
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto uniform_color = type{
|
||||||
|
.uniforms = uniforms::point_cloud::flags::color
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto rainbow = type{
|
||||||
|
.uniforms = (
|
||||||
|
uniforms::point_cloud::flags::rainbow_offset_y |
|
||||||
|
uniforms::point_cloud::flags::rainbow_scale_y
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto all = std::array{
|
||||||
|
square, lighting, luminance, color, alpha, uniform_color, rainbow
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array{
|
||||||
|
"square",
|
||||||
|
"lighting",
|
||||||
|
"luminance",
|
||||||
|
"color",
|
||||||
|
"alpha",
|
||||||
|
"uniform_color",
|
||||||
|
"rainbow"
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline auto defines = std::array{
|
||||||
|
"SQUARE",
|
||||||
|
"LIGHTING",
|
||||||
|
"V_L",
|
||||||
|
"V_RGB",
|
||||||
|
"V_A",
|
||||||
|
"U_RGBA",
|
||||||
|
"RAINBOW"
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
219
include/shader_program/metadata_type.hpp
Normal file
219
include/shader_program/metadata_type.hpp
Normal file
@@ -0,0 +1,219 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
#include "features/mesh_features.hpp"
|
||||||
|
#include "features/point_cloud_features.hpp"
|
||||||
|
|
||||||
|
namespace shader_program
|
||||||
|
{
|
||||||
|
|
||||||
|
enum class geometries : int
|
||||||
|
{
|
||||||
|
mesh = 0,
|
||||||
|
point_cloud = 1
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class stages : GLenum
|
||||||
|
{
|
||||||
|
vertex = GL_VERTEX_SHADER,
|
||||||
|
geometry = GL_GEOMETRY_SHADER,
|
||||||
|
fragment = GL_FRAGMENT_SHADER
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
union combined_feature_type
|
||||||
|
{
|
||||||
|
features::mesh::flags mesh;
|
||||||
|
features::point_cloud::flags point_cloud;
|
||||||
|
|
||||||
|
using generic_type = std::common_type_t<
|
||||||
|
std::underlying_type_t<features::mesh::flags>,
|
||||||
|
std::underlying_type_t<features::point_cloud::flags>
|
||||||
|
>;
|
||||||
|
|
||||||
|
generic_type generic(const geometries geometry) const noexcept
|
||||||
|
{
|
||||||
|
switch (geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
return static_cast<generic_type>(mesh);
|
||||||
|
case geometries::point_cloud:
|
||||||
|
return static_cast<generic_type>(point_cloud);
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_generic(
|
||||||
|
const geometries geometry,
|
||||||
|
generic_type new_features
|
||||||
|
) noexcept {
|
||||||
|
switch (geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
mesh = static_cast<features::mesh::flags>(new_features);
|
||||||
|
case geometries::point_cloud:
|
||||||
|
point_cloud = static_cast<features::point_cloud::flags>(new_features);
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
struct metadata_type
|
||||||
|
{
|
||||||
|
geometries geometry;
|
||||||
|
stages stage;
|
||||||
|
combined_feature_type features;
|
||||||
|
combined_feature_type feature_toggles;
|
||||||
|
|
||||||
|
std::pair<combined_feature_type::generic_type, combined_feature_type::generic_type> generic() const noexcept
|
||||||
|
{
|
||||||
|
switch (geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
return {
|
||||||
|
static_cast<combined_feature_type::generic_type>(features.mesh),
|
||||||
|
static_cast<combined_feature_type::generic_type>(feature_toggles.mesh)
|
||||||
|
};
|
||||||
|
case geometries::point_cloud:
|
||||||
|
return {
|
||||||
|
static_cast<combined_feature_type::generic_type>(features.point_cloud),
|
||||||
|
static_cast<combined_feature_type::generic_type>(feature_toggles.point_cloud)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
|
void from_generic(
|
||||||
|
combined_feature_type::generic_type new_features,
|
||||||
|
combined_feature_type::generic_type new_feature_toggles
|
||||||
|
) noexcept {
|
||||||
|
switch (geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
features.mesh = static_cast<features::mesh::flags>(new_features);
|
||||||
|
feature_toggles.mesh = static_cast<features::mesh::flags>(new_feature_toggles);
|
||||||
|
case geometries::point_cloud:
|
||||||
|
features.point_cloud = static_cast<features::point_cloud::flags>(new_features);
|
||||||
|
feature_toggles.point_cloud = static_cast<features::point_cloud::flags>(new_feature_toggles);
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto operator<=>(const metadata_type& other) const noexcept
|
||||||
|
{
|
||||||
|
if (this->geometry == other.geometry)
|
||||||
|
{
|
||||||
|
switch (this->geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
return (
|
||||||
|
std::tie(this->stage, this->features.mesh, this->feature_toggles.mesh) <=>
|
||||||
|
std::tie(other.stage, other.features.mesh, other.feature_toggles.mesh)
|
||||||
|
);
|
||||||
|
case geometries::point_cloud:
|
||||||
|
return (
|
||||||
|
std::tie(this->stage, this->features.point_cloud, this->feature_toggles.point_cloud) <=>
|
||||||
|
std::tie(other.stage, other.features.point_cloud, other.feature_toggles.point_cloud)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return this->geometry <=> other.geometry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const metadata_type& other) const noexcept
|
||||||
|
{
|
||||||
|
if (this->geometry == other.geometry)
|
||||||
|
{
|
||||||
|
switch (this->geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
return (
|
||||||
|
std::tie(this->stage, this->features.mesh, this->feature_toggles.mesh) ==
|
||||||
|
std::tie(other.stage, other.features.mesh, other.feature_toggles.mesh)
|
||||||
|
);
|
||||||
|
case geometries::point_cloud:
|
||||||
|
return (
|
||||||
|
std::tie(this->stage, this->features.point_cloud, this->feature_toggles.point_cloud) ==
|
||||||
|
std::tie(other.stage, other.features.point_cloud, other.feature_toggles.point_cloud)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
struct feature_ignorant_less
|
||||||
|
{
|
||||||
|
bool operator()(const metadata_type& a, const metadata_type& b) const
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
std::tie(a.geometry, a.stage) <
|
||||||
|
std::tie(a.geometry, b.stage)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct feature_count_less
|
||||||
|
{
|
||||||
|
bool operator()(const metadata_type& a, const metadata_type& b) const
|
||||||
|
{
|
||||||
|
if (a.geometry == b.geometry)
|
||||||
|
{
|
||||||
|
int feature_count{}, feature_toggle_count{};
|
||||||
|
int other_feature_count{}, other_feature_toggle_count{};
|
||||||
|
|
||||||
|
constexpr auto count_features = []<typename T>(const T features)
|
||||||
|
{
|
||||||
|
using int_type = std::underlying_type_t<T>;
|
||||||
|
using uint_type = std::make_unsigned_t<int_type>;
|
||||||
|
return std::popcount(static_cast<uint_type>(static_cast<int_type>(features)));
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (a.geometry)
|
||||||
|
{
|
||||||
|
case geometries::mesh:
|
||||||
|
for (auto& [ count, features ] : {
|
||||||
|
std::tie(feature_count, a.features.mesh),
|
||||||
|
std::tie(feature_toggle_count, a.feature_toggles.mesh),
|
||||||
|
std::tie(other_feature_count, b.features.mesh),
|
||||||
|
std::tie(other_feature_toggle_count, b.feature_toggles.mesh)
|
||||||
|
}) {
|
||||||
|
count = count_features(features);
|
||||||
|
}
|
||||||
|
case geometries::point_cloud:
|
||||||
|
for (auto& [ count, features ] : {
|
||||||
|
std::tie(feature_count, a.features.point_cloud),
|
||||||
|
std::tie(feature_toggle_count, a.feature_toggles.point_cloud),
|
||||||
|
std::tie(other_feature_count, b.features.point_cloud),
|
||||||
|
std::tie(other_feature_toggle_count, b.feature_toggles.point_cloud)
|
||||||
|
}) {
|
||||||
|
count = count_features(features);
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
std::tie(a.stage, feature_count, feature_toggle_count) <
|
||||||
|
std::tie(b.stage, other_feature_count, other_feature_toggle_count)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return a.geometry < b.geometry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@@ -2,14 +2,15 @@
|
|||||||
|
|
||||||
#include "opengl/shader_program_variable.hpp"
|
#include "opengl/shader_program_variable.hpp"
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include "util/enum_bitfield_operators.hpp"
|
||||||
|
|
||||||
namespace shader_program::uniforms::mesh
|
namespace shader_program::uniforms::mesh
|
||||||
{
|
{
|
||||||
|
|
||||||
enum class flags : int
|
enum class flags : unsigned
|
||||||
{
|
{
|
||||||
none = 0,
|
none = 0,
|
||||||
mvp = 1 << 0,
|
mvp_matrix = 1 << 0,
|
||||||
model_matrix = 1 << 1,
|
model_matrix = 1 << 1,
|
||||||
point_size = 1 << 2,
|
point_size = 1 << 2,
|
||||||
color = 1 << 3,
|
color = 1 << 3,
|
||||||
@@ -21,27 +22,25 @@ enum class flags : int
|
|||||||
ambient_filter = 1 << 9,
|
ambient_filter = 1 << 9,
|
||||||
diffuse_filter = 1 << 10,
|
diffuse_filter = 1 << 10,
|
||||||
specular_filter = 1 << 11,
|
specular_filter = 1 << 11,
|
||||||
shininess = 1 << 12,
|
shininess = 1 << 12
|
||||||
alpha = 1 << 13
|
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr inline auto mvp = zgl::shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp_matrix");
|
constexpr inline auto mvp_matrix = zgl::shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp_matrix");
|
||||||
constexpr inline auto model_matrix = zgl::shader_program_variable({ GL_FLOAT_MAT4, 1 }, "model_matrix");
|
constexpr inline auto model_matrix = zgl::shader_program_variable({ GL_FLOAT_MAT4, 1 }, "model_matrix");
|
||||||
constexpr inline auto point_size = zgl::shader_program_variable({ GL_FLOAT, 2 }, "point_size");
|
constexpr inline auto point_size = zgl::shader_program_variable({ GL_FLOAT, 2 }, "point_size");
|
||||||
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC4, 3 }, "color");
|
|
||||||
constexpr inline auto tex = zgl::shader_program_variable({ GL_SAMPLER_2D, 3 }, "tex");
|
constexpr inline auto tex = zgl::shader_program_variable({ GL_SAMPLER_2D, 3 }, "tex");
|
||||||
constexpr inline auto view_pos = zgl::shader_program_variable({ GL_FLOAT_VEC3, 4 }, "view_pos");
|
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC4, 4 }, "color");
|
||||||
constexpr inline auto point_light_direction = zgl::shader_program_variable({ GL_FLOAT_VEC3, 5 }, "point_light_direction");
|
constexpr inline auto view_pos = zgl::shader_program_variable({ GL_FLOAT_VEC3, 5 }, "view_pos");
|
||||||
constexpr inline auto point_light_color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 6 }, "point_light_color");
|
constexpr inline auto point_light_direction = zgl::shader_program_variable({ GL_FLOAT_VEC3, 6 }, "point_light_direction");
|
||||||
constexpr inline auto ambient_light_color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 7 }, "ambient_light_color");
|
constexpr inline auto point_light_color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 7 }, "point_light_color");
|
||||||
constexpr inline auto ambient_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 8 }, "ambient_filter");
|
constexpr inline auto ambient_light_color = zgl::shader_program_variable({ GL_FLOAT_VEC3, 8 }, "ambient_light_color");
|
||||||
constexpr inline auto diffuse_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 9 }, "diffuse_filter");
|
constexpr inline auto ambient_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 9 }, "ambient_filter");
|
||||||
constexpr inline auto specular_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 10 }, "specular_filter");
|
constexpr inline auto diffuse_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 10 }, "diffuse_filter");
|
||||||
constexpr inline auto shininess = zgl::shader_program_variable({ GL_FLOAT, 11 }, "shininess");
|
constexpr inline auto specular_filter = zgl::shader_program_variable({ GL_FLOAT_VEC3, 11 }, "specular_filter");
|
||||||
constexpr inline auto alpha = zgl::shader_program_variable({ GL_FLOAT, 12 }, "alpha");
|
constexpr inline auto shininess = zgl::shader_program_variable({ GL_FLOAT, 12 }, "shininess");
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
constexpr inline auto all = std::array{
|
||||||
mvp,
|
mvp_matrix,
|
||||||
model_matrix,
|
model_matrix,
|
||||||
point_size,
|
point_size,
|
||||||
color,
|
color,
|
||||||
@@ -53,65 +52,24 @@ constexpr inline auto all = std::array{
|
|||||||
ambient_filter,
|
ambient_filter,
|
||||||
diffuse_filter,
|
diffuse_filter,
|
||||||
specular_filter,
|
specular_filter,
|
||||||
shininess,
|
shininess
|
||||||
alpha
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array{
|
||||||
|
"mvp_matrix",
|
||||||
|
"model_matrix",
|
||||||
|
"point_size",
|
||||||
|
"color",
|
||||||
|
"tex",
|
||||||
|
"view_pos",
|
||||||
|
"point_light_direction",
|
||||||
|
"point_light_color",
|
||||||
|
"ambient_light_color",
|
||||||
|
"ambient_filter",
|
||||||
|
"diffuse_filter",
|
||||||
|
"specular_filter",
|
||||||
|
"shininess"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::mesh::flags operator|(
|
DEFINE_ENUM_BITFIELD_OPERATORS(shader_program::uniforms::mesh::flags)
|
||||||
const shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::mesh::flags>(static_cast<int>(a) | static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::mesh::flags operator&(
|
|
||||||
const shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::mesh::flags>(static_cast<int>(a) & static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::mesh::flags operator^(
|
|
||||||
const shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::mesh::flags>(static_cast<int>(a) ^ static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::mesh::flags operator~(const shader_program::uniforms::mesh::flags& a) {
|
|
||||||
return static_cast<shader_program::uniforms::mesh::flags>(~static_cast<int>(a));
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::mesh::flags& operator|=(shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b) {
|
|
||||||
return a = a | b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::mesh::flags& operator&=(shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b) {
|
|
||||||
return a = a & b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::mesh::flags& operator^=(shader_program::uniforms::mesh::flags& a, const shader_program::uniforms::mesh::flags& b) {
|
|
||||||
return a = a ^ b;
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<(
|
|
||||||
shader_program::uniforms::mesh::flags lhs, shader_program::uniforms::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) < static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<=(
|
|
||||||
shader_program::uniforms::mesh::flags lhs, shader_program::uniforms::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) <= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>(
|
|
||||||
shader_program::uniforms::mesh::flags lhs, shader_program::uniforms::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) > static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>=(
|
|
||||||
shader_program::uniforms::mesh::flags lhs, shader_program::uniforms::mesh::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) >= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -6,92 +6,46 @@
|
|||||||
namespace shader_program::uniforms::point_cloud
|
namespace shader_program::uniforms::point_cloud
|
||||||
{
|
{
|
||||||
|
|
||||||
enum class flags : int
|
enum class flags : unsigned
|
||||||
{
|
{
|
||||||
none = 0,
|
none = 0,
|
||||||
mvp = 1 << 0,
|
mvp_matrix = 1 << 0,
|
||||||
point_size = 1 << 1,
|
point_size = 1 << 1,
|
||||||
color = 1 << 2,
|
color = 1 << 2,
|
||||||
model = 1 << 3,
|
model_matrix = 1 << 3,
|
||||||
camera_position = 1 << 4,
|
camera_position = 1 << 4,
|
||||||
rainbow_offset_y = 1 << 5,
|
rainbow_offset_y = 1 << 5,
|
||||||
rainbow_scale_y = 1 << 6,
|
rainbow_scale_y = 1 << 6
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr inline auto mvp = zgl::shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp");
|
constexpr inline auto mvp_matrix = zgl::shader_program_variable({ GL_FLOAT_MAT4, 0 }, "mvp_matrix");
|
||||||
constexpr inline auto point_size = zgl::shader_program_variable({ GL_FLOAT, 2 }, "point_size");
|
constexpr inline auto point_size = zgl::shader_program_variable({ GL_FLOAT, 1 }, "point_size");
|
||||||
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC4, 3 }, "color");
|
constexpr inline auto color = zgl::shader_program_variable({ GL_FLOAT_VEC4, 2 }, "color");
|
||||||
constexpr inline auto model = zgl::shader_program_variable({ GL_FLOAT_MAT4, 4 }, "model");
|
constexpr inline auto model_matrix = zgl::shader_program_variable({ GL_FLOAT_MAT4, 3 }, "model_matrix");
|
||||||
constexpr inline auto camera_position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 5 }, "camera_position");
|
constexpr inline auto camera_position = zgl::shader_program_variable({ GL_FLOAT_VEC3, 4 }, "camera_position");
|
||||||
constexpr inline auto rainbow_offset_y = zgl::shader_program_variable({ GL_FLOAT, 6 }, "rainbow_offset_y");
|
constexpr inline auto rainbow_offset_y = zgl::shader_program_variable({ GL_FLOAT, 5 }, "rainbow_offset_y");
|
||||||
constexpr inline auto rainbow_scale_y = zgl::shader_program_variable({ GL_FLOAT, 7 }, "rainbow_scale_y");
|
constexpr inline auto rainbow_scale_y = zgl::shader_program_variable({ GL_FLOAT, 6 }, "rainbow_scale_y");
|
||||||
|
|
||||||
constexpr inline auto all = std::array{
|
constexpr inline auto all = std::array{
|
||||||
mvp,
|
mvp_matrix,
|
||||||
point_size,
|
point_size,
|
||||||
color,
|
color,
|
||||||
model,
|
model_matrix,
|
||||||
camera_position,
|
camera_position,
|
||||||
rainbow_offset_y,
|
rainbow_offset_y,
|
||||||
rainbow_scale_y
|
rainbow_scale_y
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr inline auto names = std::array{
|
||||||
|
"mvp_matrix",
|
||||||
|
"point_size",
|
||||||
|
"color",
|
||||||
|
"model_matrix",
|
||||||
|
"camera_position",
|
||||||
|
"rainbow_offset_y",
|
||||||
|
"rainbow_scale_y"
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::point_cloud::flags operator|(
|
DEFINE_ENUM_BITFIELD_OPERATORS(shader_program::uniforms::point_cloud::flags)
|
||||||
const shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::point_cloud::flags>(static_cast<int>(a) | static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::point_cloud::flags operator&(
|
|
||||||
const shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::point_cloud::flags>(static_cast<int>(a) & static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::point_cloud::flags operator^(
|
|
||||||
const shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b
|
|
||||||
) {
|
|
||||||
return static_cast<shader_program::uniforms::point_cloud::flags>(static_cast<int>(a) ^ static_cast<int>(b));
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr shader_program::uniforms::point_cloud::flags operator~(const shader_program::uniforms::point_cloud::flags& a) {
|
|
||||||
return static_cast<shader_program::uniforms::point_cloud::flags>(~static_cast<int>(a));
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::point_cloud::flags& operator|=(shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b) {
|
|
||||||
return a = a | b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::point_cloud::flags& operator&=(shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b) {
|
|
||||||
return a = a & b;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr shader_program::uniforms::point_cloud::flags& operator^=(shader_program::uniforms::point_cloud::flags& a, const shader_program::uniforms::point_cloud::flags& b) {
|
|
||||||
return a = a ^ b;
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<(
|
|
||||||
shader_program::uniforms::point_cloud::flags lhs, shader_program::uniforms::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) < static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator<=(
|
|
||||||
shader_program::uniforms::point_cloud::flags lhs, shader_program::uniforms::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) <= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>(
|
|
||||||
shader_program::uniforms::point_cloud::flags lhs, shader_program::uniforms::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) > static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] constexpr bool operator>=(
|
|
||||||
shader_program::uniforms::point_cloud::flags lhs, shader_program::uniforms::point_cloud::flags rhs
|
|
||||||
) {
|
|
||||||
return static_cast<int>(lhs) >= static_cast<int>(rhs);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define DEFINE_ENUM_FLAG_OPERATORS(ENUM_TYPE) \
|
#define DEFINE_ENUM_BITFIELD_OPERATORS(ENUM_TYPE) \
|
||||||
[[nodiscard]] constexpr ENUM_TYPE operator|( \
|
[[nodiscard]] constexpr ENUM_TYPE operator|( \
|
||||||
const ENUM_TYPE lhs, const ENUM_TYPE rhs \
|
const ENUM_TYPE lhs, const ENUM_TYPE rhs \
|
||||||
) { \
|
) { \
|
||||||
@@ -35,6 +35,24 @@
|
|||||||
); \
|
); \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
|
constexpr ENUM_TYPE operator<<( \
|
||||||
|
ENUM_TYPE& lhs, \
|
||||||
|
int shift \
|
||||||
|
) { \
|
||||||
|
return static_cast<ENUM_TYPE>( \
|
||||||
|
static_cast<std::underlying_type_t<ENUM_TYPE>>(lhs) << shift \
|
||||||
|
); \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
constexpr ENUM_TYPE operator<<( \
|
||||||
|
ENUM_TYPE& lhs, \
|
||||||
|
int shift \
|
||||||
|
) { \
|
||||||
|
return static_cast<ENUM_TYPE>( \
|
||||||
|
static_cast<std::underlying_type_t<ENUM_TYPE>>(lhs) << shift \
|
||||||
|
); \
|
||||||
|
} \
|
||||||
|
\
|
||||||
constexpr ENUM_TYPE& operator|=( \
|
constexpr ENUM_TYPE& operator|=( \
|
||||||
ENUM_TYPE& lhs, \
|
ENUM_TYPE& lhs, \
|
||||||
const ENUM_TYPE rhs \
|
const ENUM_TYPE rhs \
|
||||||
@@ -54,4 +72,18 @@ constexpr ENUM_TYPE& operator^=( \
|
|||||||
const ENUM_TYPE rhs \
|
const ENUM_TYPE rhs \
|
||||||
) { \
|
) { \
|
||||||
return lhs = lhs ^ rhs; \
|
return lhs = lhs ^ rhs; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
constexpr ENUM_TYPE& operator<<=( \
|
||||||
|
ENUM_TYPE& lhs, \
|
||||||
|
const int shift \
|
||||||
|
) { \
|
||||||
|
return lhs = lhs << shift; \
|
||||||
|
} \
|
||||||
|
\
|
||||||
|
constexpr ENUM_TYPE& operator>>=( \
|
||||||
|
ENUM_TYPE& lhs, \
|
||||||
|
const int shift \
|
||||||
|
) { \
|
||||||
|
return lhs = lhs >> shift; \
|
||||||
}
|
}
|
||||||
59
shaders/fragment_mesh_face.glsl
Normal file
59
shaders/fragment_mesh_face.glsl
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
#pragma STAGE: FRAGMENT
|
||||||
|
#pragma GEOMETRY: MESH
|
||||||
|
#pragma FEATURES: FACE LINE V_L V_RGB V_A LIGHTING TEXTURE U_RGBA
|
||||||
|
#pragma FEATURE_TOGGLES: LIGHTING TEXTURE
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Uniforms ]------------//
|
||||||
|
#ifdef TEXTURE
|
||||||
|
layout (location = 3) uniform sampler2D tex;
|
||||||
|
#endif
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 5) uniform vec3 view_pos;
|
||||||
|
layout (location = 6) uniform vec3 point_light_direction;
|
||||||
|
layout (location = 7) uniform vec3 point_light_color;
|
||||||
|
layout (location = 8) uniform vec3 ambient_light_color;
|
||||||
|
layout (location = 9) uniform vec3 ambient_filter;
|
||||||
|
layout (location = 10) uniform vec3 diffuse_filter;
|
||||||
|
layout (location = 11) uniform vec3 specular_filter;
|
||||||
|
layout (location = 12) uniform float shininess;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec4 frag_color;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) in vec3 frag_position;
|
||||||
|
layout (location = 2) in vec3 frag_normal;
|
||||||
|
#endif
|
||||||
|
#ifdef TEXTURE
|
||||||
|
layout (location = 2) in vec2 frag_tex_coord;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 pixel_color;
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
pixel_color = frag_color;
|
||||||
|
|
||||||
|
#ifdef TEXTURE
|
||||||
|
pixel_color *= texture(tex, frag_tex_coord);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef LIGHTING
|
||||||
|
vec3 ambient = pixel_color.rgb * ambient_filter * ambient_light_color;
|
||||||
|
|
||||||
|
float point_light_alignment = max(dot(frag_normal, point_light_direction), 0.0);
|
||||||
|
vec3 diffuse = pixel_color.rgb * diffuse_filter * point_light_color * point_light_alignment;
|
||||||
|
|
||||||
|
vec3 reflection_dir = reflect(-point_light_direction, frag_normal);
|
||||||
|
vec3 view_dir = normalize(frag_position - view_pos);
|
||||||
|
float specular_strength = pow(max(dot(view_dir, reflection_dir), 0.0), shininess);
|
||||||
|
vec3 specular = specular_filter * point_light_color * specular_strength;
|
||||||
|
|
||||||
|
pixel_color.rgb *= ambient + diffuse + specular;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
18
shaders/fragment_mesh_point.glsl
Normal file
18
shaders/fragment_mesh_point.glsl
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#pragma STAGE: FRAGMENT
|
||||||
|
#pragma GEOMETRY: MESH
|
||||||
|
#pragma FEATURES: POINT V_L V_RGB V_A LIGHTING U_RGBA
|
||||||
|
#pragma FEATURE_TOGGLES:
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec4 frag_color;
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 pixel_color;
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
pixel_color = frag_color;
|
||||||
|
}
|
||||||
18
shaders/fragment_point_cloud.glsl
Normal file
18
shaders/fragment_point_cloud.glsl
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#pragma STAGE: FRAGMENT
|
||||||
|
#pragma GEOMETRY: POINT_CLOUD
|
||||||
|
#pragma FEATURES: SQUARE V_L V_RGB V_A LIGHTING U_RGBA RAINBOW
|
||||||
|
#pragma FEATURE_TOGGLES:
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec4 frag_color;
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 pixel_color;
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
pixel_color = frag_color;
|
||||||
|
}
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
#ifdef TEXTURE
|
|
||||||
#ifdef U_COLOR
|
|
||||||
#error Texture and color attribute are mutually exclusive.
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
out vec4 pixel_color;
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
layout (location = 3) uniform sampler2D tex;
|
|
||||||
layout (location = 2) in vec2 frag_tex_coord;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_COLOR
|
|
||||||
layout (location = 3) uniform vec4 color;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
layout (location = 4) uniform vec3 view_pos;
|
|
||||||
layout (location = 5) uniform vec3 point_light_direction;
|
|
||||||
layout (location = 6) uniform vec3 point_light_color;
|
|
||||||
layout (location = 7) uniform vec3 ambient_light_color;
|
|
||||||
layout (location = 8) uniform vec3 ambient_filter;
|
|
||||||
layout (location = 9) uniform vec3 diffuse_filter;
|
|
||||||
layout (location = 10) uniform vec3 specular_filter;
|
|
||||||
layout (location = 11) uniform float shininess;
|
|
||||||
layout (location = 0) in vec3 frag_position;
|
|
||||||
layout (location = 1) in vec3 frag_normal;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_ALPHA
|
|
||||||
layout (location = 12) uniform float alpha;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
|
|
||||||
pixel_color = vec4(1);
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
pixel_color *= texture(tex, frag_tex_coord);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_COLOR
|
|
||||||
pixel_color *= color;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_ALPHA
|
|
||||||
pixel_color.w *= alpha;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
vec3 ambient = pixel_color.rgb * ambient_filter * ambient_light_color;
|
|
||||||
|
|
||||||
float point_light_alignment = max(dot(frag_normal, point_light_direction), 0.0);
|
|
||||||
vec3 diffuse = pixel_color.rgb * diffuse_filter * point_light_color * point_light_alignment;
|
|
||||||
|
|
||||||
vec3 reflection_dir = reflect(-point_light_direction, frag_normal);
|
|
||||||
vec3 view_dir = normalize(frag_position - view_pos);
|
|
||||||
float specular_strength = pow(max(dot(view_dir, reflection_dir), 0.0), shininess);
|
|
||||||
vec3 specular = specular_filter * point_light_color * specular_strength;
|
|
||||||
|
|
||||||
pixel_color.rgb *= ambient + diffuse + specular;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
layout (location = 0) in vec4 frag_color;
|
|
||||||
|
|
||||||
out vec4 pixel_color;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
pixel_color = frag_color;
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
layout (location = 0) uniform mat4 mvp_matrix;
|
|
||||||
layout (location = 0) in vec3 vertex_position;
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
layout (location = 1) uniform mat4 model_matrix;
|
|
||||||
layout (location = 1) in vec3 vertex_normal;
|
|
||||||
layout (location = 0) out vec3 frag_position;
|
|
||||||
layout (location = 1) out vec3 frag_normal;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
layout (location = 2) in vec2 vertex_tex_coord;
|
|
||||||
layout (location = 2) out vec2 frag_tex_coord;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
gl_Position = mvp_matrix * vec4(vertex_position, 1.0);
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
frag_position = (model_matrix * vec4(vertex_position, 1.0)).xyz;
|
|
||||||
frag_normal = normalize(mat3(model_matrix) * vertex_normal);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
frag_tex_coord = vertex_tex_coord;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
layout (location = 0) uniform mat4 mvp_matrix;
|
|
||||||
layout (location = 2) uniform float point_size;
|
|
||||||
layout (location = 0) in vec3 vertex_position;
|
|
||||||
layout (location = 0) out vec4 frag_color;
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
layout (location = 3) uniform sampler2D tex;
|
|
||||||
layout (location = 2) in vec2 vertex_tex_coord;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
layout (location = 1) uniform mat4 model_matrix;
|
|
||||||
layout (location = 4) uniform vec3 view_pos;
|
|
||||||
layout (location = 5) uniform vec3 point_light_direction;
|
|
||||||
layout (location = 6) uniform vec3 point_light_color;
|
|
||||||
layout (location = 7) uniform vec3 ambient_light_color;
|
|
||||||
layout (location = 8) uniform vec3 ambient_filter;
|
|
||||||
layout (location = 9) uniform vec3 diffuse_filter;
|
|
||||||
layout (location = 10) uniform vec3 specular_filter;
|
|
||||||
layout (location = 11) uniform float shininess;
|
|
||||||
layout (location = 1) in vec3 vertex_normal;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_ALPHA
|
|
||||||
layout (location = 12) uniform float alpha;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
|
|
||||||
gl_Position = mvp_matrix * vec4(vertex_position, 1.0);
|
|
||||||
gl_PointSize = point_size / gl_Position.w;
|
|
||||||
|
|
||||||
frag_color = vec4(1);
|
|
||||||
|
|
||||||
#ifdef TEXTURE
|
|
||||||
frag_color *= texture(tex, vertex_tex_coord);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef U_ALPHA
|
|
||||||
frag_color.w *= alpha;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
vec3 position = (model_matrix * vec4(vertex_position, 1.0)).xyz;
|
|
||||||
vec3 normal = normalize(mat3(model_matrix) * vertex_normal);
|
|
||||||
|
|
||||||
vec3 ambient = frag_color.rgb * ambient_filter * ambient_light_color;
|
|
||||||
|
|
||||||
float point_light_alignment = max(dot(normal, point_light_direction), 0.0);
|
|
||||||
vec3 diffuse = frag_color.rgb * diffuse_filter * point_light_color * point_light_alignment;
|
|
||||||
|
|
||||||
vec3 reflection_dir = reflect(-point_light_direction, normal);
|
|
||||||
vec3 view_dir = normalize(position - view_pos);
|
|
||||||
float specular_strength = pow(max(dot(view_dir, reflection_dir), 0.0), shininess);
|
|
||||||
vec3 specular = specular_filter * point_light_color * specular_strength;
|
|
||||||
|
|
||||||
frag_color.rgb *= ambient + diffuse + specular;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
layout (location = 0) in vec4 frag_color;
|
|
||||||
|
|
||||||
out vec4 pixel_color;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
pixel_color = frag_color;
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
layout (location = 0) in vec3 vertex_position;
|
|
||||||
layout (location = 0) uniform mat4 mvp_matrix;
|
|
||||||
layout (location = 2) uniform float point_size;
|
|
||||||
layout (location = 0) out vec4 frag_color;
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
layout (location = 4) uniform mat4 model_matrix;
|
|
||||||
layout (location = 5) uniform vec3 camera_position;
|
|
||||||
layout (location = 1) in vec3 vertex_normal;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RAINBOW
|
|
||||||
layout (location = 6) uniform float rainbow_offset_y;
|
|
||||||
layout (location = 7) uniform float rainbow_scale_y;
|
|
||||||
|
|
||||||
// taken from 'https://github.com/hughsk/glsl-hsv2rgb'
|
|
||||||
vec3 hue2rgb(float hue)
|
|
||||||
{
|
|
||||||
vec4 offsets = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
|
|
||||||
vec3 p = abs(fract(vec3(hue) + offsets.xyz) * 6.0 - offsets.www);
|
|
||||||
return clamp(p - offsets.xxx, 0.0, 1.0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef REFLECTANCE
|
|
||||||
layout (location = 2) in float vertex_reflectance;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void main()
|
|
||||||
{
|
|
||||||
gl_Position = mvp_matrix * vec4(vertex_position, 1.0);
|
|
||||||
gl_PointSize = point_size / gl_Position.w;
|
|
||||||
|
|
||||||
frag_color = vec4(1);
|
|
||||||
|
|
||||||
#ifdef LIGHTING
|
|
||||||
vec3 world_position = vec3(model_matrix * vec4(vertex_position, 1.0));
|
|
||||||
vec3 world_normal = normalize(mat3(model_matrix) * vertex_normal);
|
|
||||||
vec3 view_direction = normalize(camera_position - world_position);
|
|
||||||
frag_color.rgb *= max(dot(world_normal, view_direction), 0.0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RAINBOW
|
|
||||||
float rainbow_pos = rainbow_scale_y * (vertex_position.y + rainbow_offset_y);
|
|
||||||
frag_color.rgb *= hue2rgb(mod(rainbow_pos, 1.0f));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef REFLECTANCE
|
|
||||||
frag_color.rgb *= vertex_reflectance;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
84
shaders/vertex_mesh_face.glsl
Normal file
84
shaders/vertex_mesh_face.glsl
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
#pragma STAGE: VERTEX
|
||||||
|
#pragma GEOMETRY: MESH
|
||||||
|
#pragma FEATURES: FACE LINE V_L V_RGB V_A LIGHTING TEXTURE U_RGBA
|
||||||
|
#pragma FEATURE_TOGGLES: V_L V_RGB V_A LIGHTING TEXTURE U_RGBA
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
#ifdef V_RGB
|
||||||
|
#error Vertex luminance and vertex RGB are mutually exclusive
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Uniforms ]------------//
|
||||||
|
layout (location = 0) uniform mat4 mvp_matrix;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) uniform mat4 model_matrix;
|
||||||
|
#endif
|
||||||
|
#ifdef U_RGBA
|
||||||
|
layout (location = 4) uniform vec4 color;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec3 model_vertex_position;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) in vec3 model_vertex_normal;
|
||||||
|
#endif
|
||||||
|
#ifdef V_L
|
||||||
|
layout (location = 2) in float model_vertex_l;
|
||||||
|
#endif
|
||||||
|
#ifdef V_RGB
|
||||||
|
layout (location = 2) in vec3 model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
#ifdef V_A
|
||||||
|
layout (location = 3) in float model_vertex_a;
|
||||||
|
#endif
|
||||||
|
#ifdef TEXTURE
|
||||||
|
layout (location = 4) in vec2 model_vertex_tex_coord;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 clip_vertex_color;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) out vec3 clip_vertex_position;
|
||||||
|
layout (location = 2) out vec3 clip_vertex_normal;
|
||||||
|
#endif
|
||||||
|
#ifdef TEXTURE
|
||||||
|
layout (location = 3) out vec2 clip_vertex_tex_coord;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
gl_Position = mvp_matrix * vec4(model_vertex_position, 1.0);
|
||||||
|
|
||||||
|
clip_vertex_color = vec4(1);
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
clip_vertex_color.rgb *= model_vertex_l;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_RGB
|
||||||
|
clip_vertex_color.rgb *= model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_A
|
||||||
|
clip_vertex_color.a *= model_vertex_a;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef U_RGBA
|
||||||
|
clip_vertex_color *= color;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef LIGHTING
|
||||||
|
clip_vertex_position = (model_matrix * vec4(model_vertex_position, 1.0)).xyz;
|
||||||
|
clip_vertex_normal = normalize(mat3(model_matrix) * model_vertex_normal);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef TEXTURE
|
||||||
|
clip_vertex_tex_coord = model_vertex_tex_coord;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
94
shaders/vertex_mesh_point.glsl
Normal file
94
shaders/vertex_mesh_point.glsl
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
#pragma STAGE: VERTEX
|
||||||
|
#pragma GEOMETRY: MESH
|
||||||
|
#pragma FEATURES: POINT V_L V_RGB V_A LIGHTING U_RGBA
|
||||||
|
#pragma FEATURE_TOGGLES: V_L V_RGB V_A LIGHTING U_RGBA
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
#ifdef V_RGB
|
||||||
|
#error Vertex luminance and vertex RGB are mutually exclusive
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Uniforms ]------------//
|
||||||
|
layout (location = 0) uniform mat4 mvp_matrix;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) uniform mat4 model_matrix;
|
||||||
|
#endif
|
||||||
|
layout (location = 2) uniform float point_size;
|
||||||
|
#ifdef U_RGBA
|
||||||
|
layout (location = 4) uniform vec4 color;
|
||||||
|
#endif
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 5) uniform vec3 view_pos;
|
||||||
|
layout (location = 6) uniform vec3 point_light_direction;
|
||||||
|
layout (location = 7) uniform vec3 point_light_color;
|
||||||
|
layout (location = 8) uniform vec3 ambient_light_color;
|
||||||
|
layout (location = 9) uniform vec3 ambient_filter;
|
||||||
|
layout (location = 10) uniform vec3 diffuse_filter;
|
||||||
|
layout (location = 11) uniform vec3 specular_filter;
|
||||||
|
layout (location = 12) uniform float shininess;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec3 model_vertex_position;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) in vec3 model_vertex_normal;
|
||||||
|
#endif
|
||||||
|
#ifdef V_L
|
||||||
|
layout (location = 2) in float model_vertex_l;
|
||||||
|
#endif
|
||||||
|
#ifdef V_RGB
|
||||||
|
layout (location = 2) in vec3 model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
#ifdef V_A
|
||||||
|
layout (location = 3) in float model_vertex_a;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 clip_vertex_color;
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
gl_Position = mvp_matrix * vec4(model_vertex_position, 1.0);
|
||||||
|
gl_PointSize = point_size / gl_Position.w;
|
||||||
|
|
||||||
|
clip_vertex_color = vec4(1);
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
clip_vertex_color.rgb *= model_vertex_l;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_RGB
|
||||||
|
clip_vertex_color.rgb *= model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_A
|
||||||
|
clip_vertex_color.a *= model_vertex_a;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef U_RGBA
|
||||||
|
clip_vertex_color *= color;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef LIGHTING
|
||||||
|
vec3 position = (model_matrix * vec4(model_vertex_position, 1.0)).xyz;
|
||||||
|
vec3 normal = normalize(mat3(model_matrix) * model_vertex_normal);
|
||||||
|
|
||||||
|
vec3 ambient = clip_vertex_color.rgb * ambient_filter * ambient_light_color;
|
||||||
|
|
||||||
|
float point_light_alignment = max(dot(normal, point_light_direction), 0.0);
|
||||||
|
vec3 diffuse = clip_vertex_color.rgb * diffuse_filter * point_light_color * point_light_alignment;
|
||||||
|
|
||||||
|
vec3 reflection_dir = reflect(-point_light_direction, normal);
|
||||||
|
vec3 view_dir = normalize(position - view_pos);
|
||||||
|
float specular_strength = pow(max(dot(view_dir, reflection_dir), 0.0), shininess);
|
||||||
|
vec3 specular = specular_filter * point_light_color * specular_strength;
|
||||||
|
|
||||||
|
clip_vertex_color.rgb *= ambient + diffuse + specular;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
95
shaders/vertex_point_cloud.glsl
Normal file
95
shaders/vertex_point_cloud.glsl
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
#pragma STAGE: VERTEX
|
||||||
|
#pragma GEOMETRY: POINT_CLOUD
|
||||||
|
#pragma FEATURES: SQUARE V_L V_RGB V_A LIGHTING U_RGBA RAINBOW
|
||||||
|
#pragma FEATURE_TOGGLES: V_L V_RGB V_A LIGHTING U_RGBA RAINBOW
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
#ifdef V_RGB
|
||||||
|
#error Vertex luminance and vertex RGB are mutually exclusive
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Uniforms ]------------//
|
||||||
|
layout (location = 0) uniform mat4 mvp_matrix;
|
||||||
|
layout (location = 1) uniform float point_size;
|
||||||
|
#ifdef U_RGBA
|
||||||
|
layout (location = 2) uniform vec4 color;
|
||||||
|
#endif
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 3) uniform mat4 model_matrix;
|
||||||
|
layout (location = 4) uniform vec3 camera_position;
|
||||||
|
#endif
|
||||||
|
#ifdef RAINBOW
|
||||||
|
layout (location = 5) uniform float rainbow_offset_y;
|
||||||
|
layout (location = 6) uniform float rainbow_scale_y;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Inputs ]------------//
|
||||||
|
layout (location = 0) in vec3 model_vertex_position;
|
||||||
|
#ifdef LIGHTING
|
||||||
|
layout (location = 1) in vec3 model_vertex_normal;
|
||||||
|
#endif
|
||||||
|
#ifdef V_L
|
||||||
|
layout (location = 2) in float model_vertex_l;
|
||||||
|
#endif
|
||||||
|
#ifdef V_RGB
|
||||||
|
layout (location = 2) in vec3 model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
#ifdef V_A
|
||||||
|
layout (location = 3) in float model_vertex_a;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
//------------[ Outputs ]------------//
|
||||||
|
layout (location = 0) out vec4 clip_vertex_color;
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef RAINBOW
|
||||||
|
// taken from 'https://github.com/hughsk/glsl-hsv2rgb'
|
||||||
|
vec3 hue2rgb(float hue)
|
||||||
|
{
|
||||||
|
vec4 offsets = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
|
||||||
|
vec3 p = abs(fract(vec3(hue) + offsets.xyz) * 6.0 - offsets.www);
|
||||||
|
return clamp(p - offsets.xxx, 0.0, 1.0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
gl_Position = mvp_matrix * vec4(model_vertex_position, 1.0);
|
||||||
|
gl_PointSize = point_size / gl_Position.w;
|
||||||
|
|
||||||
|
clip_vertex_color = vec4(1);
|
||||||
|
|
||||||
|
#ifdef V_L
|
||||||
|
clip_vertex_color.rgb *= model_vertex_l;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_RGB
|
||||||
|
clip_vertex_color.rgb *= model_vertex_rgb;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef V_A
|
||||||
|
clip_vertex_color.a *= model_vertex_a;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef U_RGBA
|
||||||
|
clip_vertex_color *= color;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef LIGHTING
|
||||||
|
vec3 world_position = vec3(model_matrix * vec4(model_vertex_position, 1.0));
|
||||||
|
vec3 world_normal = normalize(mat3(model_matrix) * model_vertex_normal);
|
||||||
|
vec3 view_direction = normalize(camera_position - world_position);
|
||||||
|
clip_vertex_color.rgb *= max(dot(world_normal, view_direction), 0.0);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef RAINBOW
|
||||||
|
float rainbow_pos = rainbow_scale_y * (model_vertex_position.y + rainbow_offset_y);
|
||||||
|
clip_vertex_color.rgb *= hue2rgb(mod(rainbow_pos, 1.0f));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
@@ -52,7 +52,7 @@ std::error_code kitti_loader::load(
|
|||||||
dynamic_point_cloud_buffer& buffer,
|
dynamic_point_cloud_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool
|
bool
|
||||||
) {
|
) {
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ std::error_code kitti_pose_loader::load(
|
|||||||
dynamic_pose_buffer& buffer,
|
dynamic_pose_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic
|
bool pedantic
|
||||||
) {
|
) {
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ std::error_code obj_loader::load(
|
|||||||
dynamic_mesh_buffer& buffer,
|
dynamic_mesh_buffer& buffer,
|
||||||
const file_dir_list& paths,
|
const file_dir_list& paths,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic
|
bool pedantic
|
||||||
) {
|
) {
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
@@ -308,7 +308,7 @@ std::error_code obj_loader::parse_file(
|
|||||||
std::set<indexed_vertex_type>& vertex_ids,
|
std::set<indexed_vertex_type>& vertex_ids,
|
||||||
std::ifstream& in,
|
std::ifstream& in,
|
||||||
prefetch_lookup& id_lookup,
|
prefetch_lookup& id_lookup,
|
||||||
dynamic_data_store& store,
|
dynamic_shader_source_store& store,
|
||||||
bool pedantic
|
bool pedantic
|
||||||
) {
|
) {
|
||||||
using obj_loader_error::codes;
|
using obj_loader_error::codes;
|
||||||
|
|||||||
413
source/opengl/data_uploaders/shader_compiler.cpp
Normal file
413
source/opengl/data_uploaders/shader_compiler.cpp
Normal file
@@ -0,0 +1,413 @@
|
|||||||
|
#include "opengl/data_uploaders/shader_compiler.hpp"
|
||||||
|
|
||||||
|
#include <numeric>
|
||||||
|
#include <bits/ranges_algobase.h>
|
||||||
|
#include "util/logger.hpp"
|
||||||
|
|
||||||
|
void zgl::shader_program_compiler::tokenize_declarations(
|
||||||
|
std::string_view source_rest,
|
||||||
|
std::vector<std::string_view> tokens,
|
||||||
|
std::vector<std::size_t> declaration_token_counts,
|
||||||
|
std::span<std::size_t> declaration_type_indices
|
||||||
|
) {
|
||||||
|
tokens.clear();
|
||||||
|
declaration_token_counts.clear();
|
||||||
|
std::ranges::fill(declaration_type_indices, static_cast<std::size_t>(metadata_declaration_type::invalid));
|
||||||
|
|
||||||
|
constexpr auto pragma_prefix = std::string_view("\n#pragma ");
|
||||||
|
constexpr auto title_separator = ':';
|
||||||
|
constexpr auto token_separator = ' ';
|
||||||
|
|
||||||
|
auto offset = std::string_view::size_type{};
|
||||||
|
|
||||||
|
auto keyword = pragma_prefix;
|
||||||
|
|
||||||
|
while ((offset = source_rest.find(keyword)) != std::string_view::npos)
|
||||||
|
{
|
||||||
|
const auto current_token_count = tokens.size();
|
||||||
|
|
||||||
|
auto line_end = source_rest.find('\n', offset);
|
||||||
|
if (line_end == std::string_view::npos)
|
||||||
|
{
|
||||||
|
line_end = source_rest.length();
|
||||||
|
}
|
||||||
|
|
||||||
|
auto declaration = source_rest.substr(offset, line_end - offset);
|
||||||
|
|
||||||
|
if ((offset = declaration.find(title_separator)) == std::string_view::npos)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto title = declaration.substr(0, offset);
|
||||||
|
if (const auto it = declaration_lookup.find(title); it != declaration_lookup.end())
|
||||||
|
{
|
||||||
|
const auto declaration_type = static_cast<std::size_t>(it->second);
|
||||||
|
declaration_type_indices[declaration_type] = declaration_token_counts.size();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
declaration = declaration.substr(offset);
|
||||||
|
|
||||||
|
if (not declaration.empty() and declaration.front() == token_separator)
|
||||||
|
{
|
||||||
|
declaration = declaration.substr(sizeof(token_separator), declaration.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
while ((offset = declaration.find(token_separator)) != std::string_view::npos)
|
||||||
|
{
|
||||||
|
tokens.emplace_back(declaration.substr(0, offset));
|
||||||
|
declaration = declaration.substr(offset + sizeof(token_separator));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (not declaration.empty())
|
||||||
|
{
|
||||||
|
tokens.emplace_back(declaration);
|
||||||
|
}
|
||||||
|
|
||||||
|
declaration_token_counts.emplace_back(
|
||||||
|
tokens.size() - current_token_count
|
||||||
|
);
|
||||||
|
source_rest = source_rest.substr(line_end + sizeof('\n'));
|
||||||
|
keyword = pragma_prefix.substr(sizeof('\n'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool zgl::shader_program_compiler::parse_stage_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
) {
|
||||||
|
if (tokens.size() != 1)
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Invalid stage declaration: Expected exactly one token but got %.", tokens.size());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto token = tokens.front();
|
||||||
|
|
||||||
|
if (const auto it = stage_lookup.find(token); it != stage_lookup.end())
|
||||||
|
{
|
||||||
|
metadata.stage = it->second;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Invalid stage declaration: Unknown stage %.", token);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool zgl::shader_program_compiler::parse_geometry_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
) {
|
||||||
|
if (tokens.size() != 1)
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Invalid geometry declaration: Expected exactly one token but got %.", tokens.size());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto token = tokens.front();
|
||||||
|
|
||||||
|
if (const auto it = geometry_lookup.find(token); it != geometry_lookup.end())
|
||||||
|
{
|
||||||
|
metadata.geometry = it->second;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Invalid geometry declaration: Unknown geometry %.", token);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void zgl::shader_program_compiler::parse_feature_tokens(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
const ztu::string_lookup<T>& feature_lookup,
|
||||||
|
T& features
|
||||||
|
) {
|
||||||
|
features = {};
|
||||||
|
|
||||||
|
for (const auto token : tokens)
|
||||||
|
{
|
||||||
|
if (const auto it = feature_lookup.find(token); it != feature_lookup.end())
|
||||||
|
{
|
||||||
|
features |= it->second;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Ignoring unknown feature token %.", token);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool zgl::shader_program_compiler::parse_features_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
) {
|
||||||
|
switch (metadata.geometry)
|
||||||
|
{
|
||||||
|
case shader_program::geometries::mesh:
|
||||||
|
parse_feature_tokens(tokens, mesh_feature_lookup, metadata.features.mesh);
|
||||||
|
break;
|
||||||
|
case shader_program::geometries::point_cloud:
|
||||||
|
parse_feature_tokens(tokens, point_cloud_feature_lookup, metadata.features.point_cloud);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ztu::logger::warn("Internal error: Unknown geometry index %.", static_cast<int>(metadata.geometry));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool zgl::shader_program_compiler::parse_feature_toggles_declaration(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
shader_program::metadata_type& metadata
|
||||||
|
) {
|
||||||
|
switch (metadata.geometry)
|
||||||
|
{
|
||||||
|
case shader_program::geometries::mesh:
|
||||||
|
parse_feature_tokens(tokens, mesh_feature_lookup, metadata.feature_toggles.mesh);
|
||||||
|
break;
|
||||||
|
case shader_program::geometries::point_cloud:
|
||||||
|
parse_feature_tokens(tokens, point_cloud_feature_lookup, metadata.feature_toggles.point_cloud);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ztu::logger::warn("Internal error: Unknown geometry index %.", static_cast<int>(metadata.geometry));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<shader_program::metadata_type> zgl::shader_program_compiler::parse_metadata_from_tokens(
|
||||||
|
std::span<const std::string_view> tokens,
|
||||||
|
std::span<const std::size_t> declaration_token_counts,
|
||||||
|
std::span<const std::size_t> declaration_type_indices
|
||||||
|
) {
|
||||||
|
using enum metadata_declaration_type;
|
||||||
|
using namespace std::string_view_literals;
|
||||||
|
|
||||||
|
shader_program::metadata_type data;
|
||||||
|
|
||||||
|
for (const auto [ type, name, parser ] : {
|
||||||
|
std::make_tuple(stage, "stage"sv, &parse_stage_declaration),
|
||||||
|
std::make_tuple(geometry, "geometry"sv, &parse_geometry_declaration),
|
||||||
|
std::make_tuple(features, "features"sv, &parse_features_declaration),
|
||||||
|
std::make_tuple(feature_toggles, "feature_toggles"sv, &parse_feature_toggles_declaration)
|
||||||
|
}) {
|
||||||
|
const auto index = declaration_type_indices[static_cast<std::size_t>(type)];
|
||||||
|
|
||||||
|
if (index == static_cast<std::size_t>(invalid))
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Shader metadata error: Missing % declaration.", name);
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto token_offset = std::accumulate(
|
||||||
|
declaration_token_counts.begin(),
|
||||||
|
declaration_token_counts.begin() + index,
|
||||||
|
std::size_t{}
|
||||||
|
);
|
||||||
|
const auto token_count = declaration_token_counts[index];
|
||||||
|
|
||||||
|
if (not parser(tokens.subspan(token_offset, token_count), data))
|
||||||
|
{
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto zgl::shader_program_compiler::find_compatible_shader_source(
|
||||||
|
shader_program::metadata_type& requirements
|
||||||
|
) {
|
||||||
|
|
||||||
|
const auto lower_it = std::ranges::lower_bound(
|
||||||
|
shader_lookup,
|
||||||
|
requirements,
|
||||||
|
shader_program::metadata_type::feature_ignorant_less{},
|
||||||
|
&std::pair<shader_program::metadata_type, dynamic_shader_source_store::id_type>::first
|
||||||
|
);
|
||||||
|
|
||||||
|
if (lower_it == shader_lookup.end()) {
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto required_features = requirements.features.generic(requirements.geometry);
|
||||||
|
|
||||||
|
while (
|
||||||
|
lower_it->first.geometry == requirements.geometry and
|
||||||
|
lower_it->first.stage == requirements.stage
|
||||||
|
) {
|
||||||
|
const auto& data = lower_it->first;
|
||||||
|
const auto& [ features, feature_toggles ] = data.generic();
|
||||||
|
|
||||||
|
const auto missing_features = required_features & ~features;
|
||||||
|
const auto extra_features = ~required_features & features;
|
||||||
|
const auto untoggleable_extra_features = extra_features & ~feature_toggles;
|
||||||
|
|
||||||
|
if (missing_features == 0 and untoggleable_extra_features == 0)
|
||||||
|
{
|
||||||
|
const auto to_be_toggled = required_features & feature_toggles;
|
||||||
|
requirements.feature_toggles.from_generic(requirements.geometry, to_be_toggled);
|
||||||
|
|
||||||
|
return lower_it->second;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::nullopt;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void add_required_feature_defines(
|
||||||
|
T toggle_flags,
|
||||||
|
std::span<const std::string> defines,
|
||||||
|
std::vector<const char*>& shader_strings
|
||||||
|
) {
|
||||||
|
auto index = std::size_t{};
|
||||||
|
while (toggle_flags != T{})
|
||||||
|
{
|
||||||
|
if ((toggle_flags & T{ 1 }) != T{})
|
||||||
|
{
|
||||||
|
shader_strings.push_back(defines[index].c_str());
|
||||||
|
}
|
||||||
|
toggle_flags >>= 1;
|
||||||
|
++index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void zgl::shader_program_compiler::compile_shaders(
|
||||||
|
const dynamic_shader_source_store& shader_sources,
|
||||||
|
std::span<const shader_program::metadata_type> requirements_list,
|
||||||
|
std::vector<shader_handle>& shader_handles
|
||||||
|
) {
|
||||||
|
|
||||||
|
static constexpr auto max_shader_strings = std::max(
|
||||||
|
mesh_feature_defines.size(),
|
||||||
|
point_cloud_feature_defines.size()
|
||||||
|
) + 1;
|
||||||
|
|
||||||
|
std::vector<const char*> shader_strings;
|
||||||
|
shader_strings.reserve(max_shader_strings);
|
||||||
|
|
||||||
|
|
||||||
|
for (auto requirements : requirements_list)
|
||||||
|
{
|
||||||
|
auto shader_id = GLuint{};
|
||||||
|
|
||||||
|
const auto source_id = find_compatible_shader_source(requirements);
|
||||||
|
if (not source_id)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto [ shader_source_it, source_found ] = shader_sources.find(*source_id);
|
||||||
|
if (not source_found)
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Missing shader source with id %.", *source_id);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto& shader_source = *shader_source_it;
|
||||||
|
|
||||||
|
if (shader_source.source.empty() and requirements.stage == shader_program::stages::geometry)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
shader_strings.clear();
|
||||||
|
|
||||||
|
switch (requirements.geometry) {
|
||||||
|
case shader_program::geometries::mesh:
|
||||||
|
add_required_feature_defines(requirements.feature_toggles.mesh, mesh_feature_defines, shader_strings);
|
||||||
|
break;
|
||||||
|
case shader_program::geometries::point_cloud:
|
||||||
|
add_required_feature_defines(requirements.feature_toggles.point_cloud, point_cloud_feature_defines, shader_strings);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
|
shader_strings.push_back(shader_source.source.data());
|
||||||
|
|
||||||
|
shader_id = glCreateShader(static_cast<GLenum>(requirements.stage));
|
||||||
|
|
||||||
|
glShaderSource(shader_id, shader_strings.size(), shader_strings.data(), nullptr);
|
||||||
|
glCompileShader(shader_id);
|
||||||
|
|
||||||
|
GLint success;
|
||||||
|
glGetShaderiv(shader_id, GL_COMPILE_STATUS, &success);
|
||||||
|
|
||||||
|
if (not success)
|
||||||
|
{
|
||||||
|
GLint log_length{};
|
||||||
|
glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH, &log_length);
|
||||||
|
|
||||||
|
auto log = std::string(log_length, ' ');
|
||||||
|
glGetShaderInfoLog(shader_id, log_length, nullptr, log.data());
|
||||||
|
|
||||||
|
ztu::logger::error("Error while compiling shader:\n%", log);
|
||||||
|
|
||||||
|
glDeleteShader(shader_id);
|
||||||
|
shader_id = GLuint{};
|
||||||
|
}
|
||||||
|
|
||||||
|
shader_handles.emplace_back(shader_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void zgl::shader_program_compiler::register_shader_sources(
|
||||||
|
const dynamic_shader_source_store& shader_sources
|
||||||
|
) {
|
||||||
|
std::vector<std::string_view> tokens;
|
||||||
|
std::vector<std::size_t> declaration_token_counts;
|
||||||
|
std::array<std::size_t, 4> declaration_type_indices;
|
||||||
|
|
||||||
|
tokens.reserve(32);
|
||||||
|
declaration_token_counts.reserve(4);
|
||||||
|
|
||||||
|
for (const auto& [ id, shader_source ] : shader_sources)
|
||||||
|
{
|
||||||
|
tokenize_declarations(
|
||||||
|
shader_source,
|
||||||
|
tokens,
|
||||||
|
declaration_token_counts,
|
||||||
|
declaration_type_indices
|
||||||
|
);
|
||||||
|
|
||||||
|
const auto metadata = parse_metadata_from_tokens(
|
||||||
|
tokens,
|
||||||
|
declaration_token_counts,
|
||||||
|
declaration_type_indices
|
||||||
|
);
|
||||||
|
|
||||||
|
if (not metadata)
|
||||||
|
{
|
||||||
|
ztu::logger::warn("Ignoring shader % as it contains malformed metadata.", id);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sorted insert should be faster than std::sort and std::unique
|
||||||
|
// for small numbers of elements and high numbers of duplicates.
|
||||||
|
const auto it = std::ranges::upper_bound(
|
||||||
|
shader_lookup,
|
||||||
|
*metadata,
|
||||||
|
shader_program::metadata_type::feature_count_less{},
|
||||||
|
&std::pair<shader_program::metadata_type, dynamic_shader_source_store::id_type>::first
|
||||||
|
);
|
||||||
|
|
||||||
|
if (it != shader_lookup.end() and it->first == *metadata)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
shader_lookup.emplace(it, *metadata, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user