Render2 Static Class

Fix some Typenames
Add Sound to RD7 Namespace
Add Line to Render2
Fix scrollbar dragging

.clang-format

@@ -0,0 +1,259 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments:
+  Kind:            Always
+  OverEmptyLines:  0
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterExternBlock: false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAfterAttributes: Never
+BreakAfterJavaFieldAnnotations: false
+BreakArrays:     true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^<.*'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentRequiresClause: true
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertNewlineAtEOF: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: NextLine
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+PPIndentWidth:   -1
+QualifierAlignment: Leave
+RawStringFormats:
+  - Language:        Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+  - Language:        TextProto
+    Delimiters:
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions:
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
+    CanonicalDelimiter: pb
+    BasedOnStyle:    google
+ReferenceAlignment: Pointer
+ReflowComments:  true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Auto
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+...
+

.github/workflows/Docs.yml

@@ -1,50 +0,0 @@
-name: 📄
-
-on:
-  push:
-    branches: [ "!*" ]
-  pull_request:
-    branches: [ "*" ]
-
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: branch
-      - name: Display branch name
-        shell: bash
-        run: echo ${{ steps.branch.outputs.branch }}
-      # Runs a single command using the runners shell
-      - name: Run a one-line script
-        run: |
-          git config --global user.email "tobid7@outlook.de"
-          git config --global user.name "Tobi-D7"
-          sudo apt-get install doxygen cmake -y
-          doxygen
-          echo done
-          ls -r
-          cd ..
-          git clone --depth 1 https://${{ secrets.TOKEN }}@github.com/NPI-D7/RenderD7.git RD7 -b gh-pages
-          
-          mv -v RenderD7/doc/html/* RD7/
-          #rm -r doc
-          cd RD7
-          
-          echo tobid7
-          git stage *
-          
-          echo staged
-          git commit -m "Documentation1"
-          git tag doc
-          echo commited
-          git push origin gh-pages
-          echo pushed

.github/workflows/Update extlibs.yml

@@ -1,50 +0,0 @@
-name: Extlibs
-
-on:
-  push:
-    branches: [ '!*' ]
-  pull_request:
-    branches: [ '!*' ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - name: update
-        run: |
-          #gl
-          cd ..
-          git clone https://github.com/lua/lua.git
-          cd RenderD7
-          mkdir -p extlibs/
-          mkdir -p extlibs/lua/
-          cp -r ../lua/*.c extlibs/lua/
-          cp -r ../lua/*.h extlibs/lua/
-          cp -r ../lua/*.md extlibs/lua/
-          #RenderD7
-          cd ..
-          git clone https://github.com/NPI-D7/RenderD7.git
-          cd lp-next-ctr
-          mkdir -p extlibs/
-          rm -r extlibs/RenderD7
-          mkdir -p extlibs/RenderD7/
-          cp -r ../RenderD7/*.c* extlibs/RenderD7/
-          cp -r ../RenderD7/*.h* extlibs/RenderD7/
-          cp -r ../RenderD7/*.md extlibs/RenderD7/
-          #config
-          git config --global user.email "tobid7@outlook.de"
-          git config --global user.name "Tobi-D7"
-          #commit
-          git stage *
-          git commit -m "update extlibs"
-          git push origin main

.gitignore

@@ -1,4 +1,11 @@
-release/
-debug/
-lib/
-*.bz2
+*.bz2
+*.DS_Store*
+.cache/
+compile_commands.json
+
+# DOCS
+docs/*
+!docs/javascripts
+!docs/overrides
+!docs/stylesheets
+site/*

.vscode/c_cpp_properties.json

@@ -1,18 +1,18 @@
-{
-    "configurations": [
-        {
-            "name": "3DS | Windows",
-            "includePath": [
-                "${workspaceFolder}/**",
-                "C:/devkitpro/libctru/include/**",
-                "C:/devkitpro/devkitARM/include/**",
-                "C:/devkitpro/devkitARM/arm-none-eabi/include/**",
-                "C:/devkitpro/portlibs/3ds/include/**",
-                "/opt/devkitpro/libctru/include/**",
-                "/opt/devkitpro/portlibs/**"
-                
-            ]
-        }
-    ],
-    "version": 4
-}
+{
+    "configurations": [
+        {
+            "name": "3DS | Windows",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "C:/devkitpro/libctru/include/**",
+                "C:/devkitpro/devkitARM/include/**",
+                "C:/devkitpro/devkitARM/arm-none-eabi/include/**",
+                "C:/devkitpro/portlibs/3ds/include/**",
+                "/opt/devkitpro/libctru/include/**",
+                "/opt/devkitpro/portlibs/**"
+                
+            ]
+        }
+    ],
+    "version": 4
+} 

.vscode/launch.json

@@ -0,0 +1,121 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/rd7tf/rd7tf.elf",
+            "targetArchitecture": "arm",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            ///  LINUX
+            //"miDebuggerPath": "/opt/devkitPro/devkitARM/bin/arm-none-eabi-gdb",
+            /// WINDOWS
+            "miDebuggerPath": "C:/devkitPro/devkitARM/bin/arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "192.168.2.220:4003",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/rd7tf/rd7tf.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }, 
+        {
+            "name": "(gdb-emu) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/rd7tf/rd7tf.elf",
+            "targetArchitecture": "arm",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            ///  LINUX
+            //"miDebuggerPath": "/opt/devkitPro/devkitARM/bin/arm-none-eabi-gdb",
+            /// WINDOWS
+            "miDebuggerPath": "C:/devkitPro/devkitARM/bin/arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "localhost:4003",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/rd7tf/rd7tf.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "(gdb-emu) lua",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/rd7le/rd7le.elf",
+            "targetArchitecture": "arm",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\devkitPro\\devkitARM\\bin\\arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "localhost:4003",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/rd7le/rd7le.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "(gdb) lua",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/rd7le/rd7le.elf",
+            "targetArchitecture": "arm",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\devkitPro\\devkitARM\\bin\\arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "192.168.2.220:4003",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/rd7le/rd7le.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "(gdb) testgame",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/testgame/testgame.elf",
+            "targetArchitecture": "arm",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\devkitPro\\devkitARM\\bin\\arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "localhost:4003",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/testgame/testgame.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -1,102 +1,118 @@
-{
-    "files.associations": {
-        "array": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "iterator": "cpp",
-        "memory": "cpp",
-        "numeric": "cpp",
-        "type_traits": "cpp",
-        "fstream": "cpp",
-        "initializer_list": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "new": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "typeinfo": "cpp",
-        "utility": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "chrono": "cpp",
-        "codecvt": "cpp",
-        "condition_variable": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "deque": "cpp",
-        "forward_list": "cpp",
-        "map": "cpp",
-        "iomanip": "cpp",
-        "memory_resource": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "shared_mutex": "cpp",
-        "valarray": "cpp",
-        "random": "cpp",
-        "cuchar": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "numbers": "cpp",
-        "filesystem": "cpp",
-        "xstring": "cpp",
-        "charconv": "cpp",
-        "format": "cpp",
-        "ios": "cpp",
-        "list": "cpp",
-        "locale": "cpp",
-        "mutex": "cpp",
-        "stack": "cpp",
-        "stop_token": "cpp",
-        "thread": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "xlocinfo": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp",
-        "queue": "cpp",
-        "semaphore": "cpp",
-        "hash_map": "cpp",
-        "set": "cpp",
-        "unordered_set": "cpp",
-        "source_location": "cpp",
-        "future": "cpp",
-        "cfenv": "cpp",
-        "cinttypes": "cpp",
-        "typeindex": "cpp",
-        "variant": "cpp"
-    }
+{
+    "files.associations": {
+        "array": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "numeric": "cpp",
+        "type_traits": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "typeinfo": "cpp",
+        "utility": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "chrono": "cpp",
+        "codecvt": "cpp",
+        "condition_variable": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "map": "cpp",
+        "iomanip": "cpp",
+        "memory_resource": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "shared_mutex": "cpp",
+        "valarray": "cpp",
+        "random": "cpp",
+        "cuchar": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "numbers": "cpp",
+        "filesystem": "cpp",
+        "xstring": "cpp",
+        "charconv": "cpp",
+        "format": "cpp",
+        "ios": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "mutex": "cpp",
+        "stack": "cpp",
+        "stop_token": "cpp",
+        "thread": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp",
+        "queue": "cpp",
+        "semaphore": "cpp",
+        "hash_map": "cpp",
+        "set": "cpp",
+        "unordered_set": "cpp",
+        "source_location": "cpp",
+        "future": "cpp",
+        "cfenv": "cpp",
+        "cinttypes": "cpp",
+        "typeindex": "cpp",
+        "variant": "cpp",
+        "ranges": "cpp",
+        "span": "cpp",
+        "coroutine": "cpp",
+        "__bit_reference": "cpp",
+        "__config": "cpp",
+        "__debug": "cpp",
+        "__errc": "cpp",
+        "__hash_table": "cpp",
+        "__locale": "cpp",
+        "__mutex_base": "cpp",
+        "__node_handle": "cpp",
+        "__split_buffer": "cpp",
+        "__threading_support": "cpp",
+        "__tree": "cpp",
+        "__verbose_abort": "cpp",
+        "complex": "cpp"
+    }
 }

.vscode/tasks.json

@@ -0,0 +1,37 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build",
+            "command": "make",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}/rd7tf/"
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new",
+                "focus": true
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Format",
+            "command": "python ${workspaceFolder}/clang-format.py",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}/"
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new",
+                "focus": true
+            },
+            "problemMatcher": []
+        }
+    ]
+}

BuildAndInstall.sh

@@ -1,4 +0,0 @@
-export DEVKITARM=/opt/devkitpro/devkitARM/
-export DEVKITPRO=/opt/devkitpro/
-make -j12
-make install

CHANGELOG.md

@@ -0,0 +1,112 @@
+# RenderD7 Changelog
+## 0.9.5
+- Remove Npi Intro and NVID Api
+- Replace Toasts System with Message 
+- Added GetTime
+- Move from Draw to Render2 Api
+- Implement RD7Color and R7Vec2
+- Add new Features to Color::RGBA
+- Cleanup Code
+- Added RenderD7 Keyboard (Overlay)
+- Added Ftrace Overlay
+- Moved MetrikOVL into an Overlay
+- Removed Old Font/Text Handlers
+- Added UI7 (New UI Api)
+- Remove Old UI Api
+- Rewrite of RenderD7::Image
+- Internal Debugger/Database (IDB)
+- Removed BitmapPrinter
+- Added nimg and swr(render2nimg | SoftwareRender)
+- Removed Old Error/Message Handler
+- GetTextSize (extra buffer) + New TextShorter
+- Require specific FLAG for MemTrack
+- Replace all lodepng usage by stb_image
+- Move Asset Generator into single python script
+- Remove INI reader
+- Python based clangformat script
+- Move some Init code into functions to not use twice
+- Added Font class
+- Add LinearAllocator (for std)
+- Fix Crash in FilsSystem
+- Implement basic Theme System
+- Remove 0.9.4 Security
+- Tasks now based on std functional/thread
+- Add Network Support (Download Files, APi Requests)
+- Remove RD7TF
+- Add Cia Installer
+- Move from Init bool values to flags
+## 0.9.4
+- Implement new Security System To prevent from crashes
+- Implement Functiontrace for better Timing Tests
+- Implement MemAlloc Tracker (only size)
+- Add some new Overlays (not functional yet)
+- Complete Rewrite of Overlay System
+- Fixed the FrameEnd Crash
+- New System to get Hardware Info
+- Removed RenderD7 Super Reselution (800px mode)
+## 0.9.3
+- Completly Documented Everything
+- Fix typo in Sprite::getHeight
+- Remove Deprecated/Useless Stuff
+## 0.9.2
+- Add Nvid Support(v0.0.1)
+- Add Basic RenderD7 Splash
+- Faster Graphics Init
+- Fade Effects
+- Fix Changelog Screen 
+## 0.9.1
+- Fix Critical bug in Spritesheet animations
+- Fix RenderD7::Color::Hex (Major performance tweak)
+## 0.9.0
+- Remove Stupid try of Console
+- Add Services list 
+- Clean up Code
+- Added Minimal Init for hax2.x
+## 0.8.5
+- Fix Deltatime
+## 0.8.4
+- A lot of Fixes 
+- New Features for BitmapPrinter
+## 0.8.3
+- Added Overlaycount to Info
+- Addet ResultDecoder for errors
+## 0.8.2
+- Fix a lot of Stuff
+- Use c++17 std::filesystem for RenderD7::Filesystem
+## 0.8.1
+- Add abillity to Get Stdout as string to render it to the screen.
+## 0.8.0
+- Implement BitmapPrinter
+## 0.7.3
+- Implement Over Render Overlay Framework
+## 0.7.2
+- Implement MT to csv file saving
+- Add RGB2HEX
+## 0.7.1
+- Add the New Overlay Handler. Its Just in code and does nothing yet
+## 0.7.0
+- Made Big Progress In the MT Ovl but it still crashes On a 2nd C3D_FrameEnd                                                            \
+- Implement 800px but doesn't work that good
+## 0.6.2
+- Fix Crash when exiting through Home Menu.
+## 0.6.10
+- Rewrite Threadsystem
+- Improve framerate
+## 0.6.02
+- Fix Code in lang.hpp
+- Add Draw Text Left Function (Right since 0.7.0)
+- Add changelog
+## 0.6.01
+- Add Threading system
+## 0.6.0
+- Better Scene Management
+## 0.5.0
+- Fixed some Bugs!
+## 0.4.0 
+- Trying to fix Filesystem and Bugs
+## 0.3.0
+- Recreate D7-Core into RenderD7
+## 0.2.0
+- Trying to create Animations of Images instead of Sheets
+## 0.1.0
+- Inital Release of D7-Core sprite animation plugin

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2024 tobid7
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -1,205 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
-
-include $(DEVKITARM)/3ds_rules
-
-export renderd7_MAJOR	:= 0
-export renderd7_MINOR	:= 9
-export renderd7_PATCH	:= 3
-
-VERSION	:=	$(renderd7_MAJOR).$(renderd7_MINOR).$(renderd7_PATCH)
-
-# If on a tagged commit, use the tag instead of the commit
-ifneq ($(shell echo $(shell git tag -l --points-at HEAD) | head -c 1),)
-GIT_VER := $(shell git tag -l --points-at HEAD)
-else
-GIT_VER := $(shell git rev-parse --short HEAD)
-endif
-
-TIME_TIME := $(shell date --iso=seconds)
-
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-#---------------------------------------------------------------------------------
-TARGET		:=	renderd7
-SOURCES		:=	source external/source
-DATA		:=	data
-INCLUDES	:=	include
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
-
-CFLAGS	:=	-g -Wall -Werror -mword-relocations -save-temps\
-			-DV_STRING=\"$(GIT_VER)\" \
-			-DV_TIME=\"$(TIME_TIME)\" \
-			-ffunction-sections -fdata-sections \
-			$(ARCH) $(BUILD_CFLAGS)
-
-CFLAGS	+=	$(INCLUDE) -D__3DS__ -D_GNU_SOURCE=1
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++20
-
-ASFLAGS	:=	-g $(ARCH) $(DEFINES)
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(CTRULIB)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-PICAFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica)))
-SHLISTFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_SOURCES 	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES)) \
-			$(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o)
-
-export OFILES	:=	$(OFILES_BIN) $(OFILES_SOURCES)
-
-export HFILES	:=	$(PICAFILES:.v.pica=_shbin.h) $(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I.
-
-.PHONY: clean all doc
-
-#---------------------------------------------------------------------------------
-all: lib/librenderd7.a lib/librenderd7d.a
-
-doc:
-	@doxygen Doxyfile
-
-dist-bin: all
-	@tar --exclude=*~ -cjf $(TARGET)-$(VERSION).tar.bz2 include lib
-
-dist-src:
-	@tar --exclude=*~ -cjf $(TARGET)-src-$(VERSION).tar.bz2 include $(SOURCES) Makefile
-
-dist: dist-src dist-bin
-
-install: dist-bin
-	mkdir -p $(DEPSDIR)$(DEVKITPRO)/libctru
-	bzip2 -cd $(TARGET)-$(VERSION).tar.bz2 | tar -xf - -C $(DEPSDIR)$(DEVKITPRO)/libctru
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-
-release:
-	@[ -d $@ ] || mkdir -p $@
-
-debug:
-	@[ -d $@ ] || mkdir -p $@
-
-
-lib/librenderd7.a : lib release $(SOURCES) $(INCLUDES)
-	@$(MAKE) BUILD=release OUTPUT=$(CURDIR)/$@ \
-	BUILD_CFLAGS="-DNDEBUG=1 -O2 -fomit-frame-pointer" \
-	DEPSDIR=$(CURDIR)/release \
-	--no-print-directory -C release \
-	-f $(CURDIR)/Makefile
-
-lib/librenderd7d.a : lib debug $(SOURCES) $(INCLUDES)
-	@$(MAKE) BUILD=debug OUTPUT=$(CURDIR)/$@ \
-	BUILD_CFLAGS="-DDEBUG=1 -Og" \
-	DEPSDIR=$(CURDIR)/debug \
-	--no-print-directory -C debug \
-	-f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr release debug lib includes
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT)	:	$(OFILES)
-
-$(OFILES_SOURCES) : $(HFILES)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------
-# rules for assembling GPU shaders
-#---------------------------------------------------------------------------------
-define shader-as
-	$(eval CURBIN := $*.shbin)
-	$(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d)
-	echo "$(CURBIN).o: $< $1" > $(DEPSFILE)
-	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
-	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h
-	echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h
-	picasso -o $(CURBIN) $1
-	bin2s $(CURBIN) | $(AS) -o $*.shbin.o
-endef
-
-%.shbin.o %_shbin.h : %.v.pica %.g.pica
-	@echo $(notdir $^)
-	@$(call shader-as,$^)
-
-%.shbin.o %_shbin.h : %.v.pica
-	@echo $(notdir $<)
-	@$(call shader-as,$<)
-
-%.shbin.o %_shbin.h : %.shlist
-	@echo $(notdir $<)
-	@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file)))
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------

README.md

@@ -1,24 +1,61 @@
-# RenderD7 <img alt="LOGO" src="https://github.com/NPI-D7/RenderD7/blob/main/logo.png" height="90">
-RenderD7 is now LibRenderD7.
-### Installation (Ubuntu)
-first run this
-`sudo su`
-then this
-```
-curl -L https://github.com/NPI-D7/RenderD7/releases/download/v0.8.0-pre1/renderd7-0.8.0.tar.bz2 -o renderd7-0.8.0.tar.bz2
-mkdir -p /opt/devkitpro/libctru
-bzip2 -cd renderd7-0.8.0.tar.bz2 | tar -xf - -C /opt/devkitpro/libctru
-```
-Make sure that `-lrenderd7` is before `-lcitro2d`, `-lcitro3d`, `-lctru`.
-
-# RenderD7 (https://npi-d7.github.io/RenderD7/)
-Simple and Easey to use UI and Graphics helper.
-Create DOCS
-
-# Credits
-- NPI-D7
-  - Tobi-D7 Main Dev
-
-Some Icons are From
-https://icons8.de/
-See Subfolder Readmes
+# <img alt="LOGO" src="https://dev.npid7.de/tobid7/RenderD7/raw/branch/main/logo.png" height="90">
+# RenderD7 as Submodule (0.9.5+)
+To use RenderD7 just use this command: `git submodule add https://github.com/NPI-D7/RenderD7` and add `-b v0.9.5` for example for a specific version.
+
+
+And in Your Project Makefile add this
+```
+# Make Sure to Change this paths if your Submodule
+# is located somewhere else
+RENDERD7_SRC := RenderD7/source RenderD7/external
+RENDERD7_INC := RenderD7/include
+# Libraries used for RenderD7
+# if you already use -lm, -lctru etc place a # before -lm
+RENDERD7_LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -lz -lm -lcitro2dd -lcitro3d -lctru
+```
+Now you need to add it to your sources and includes
+```
+SOURCES		:=	source $(RENDERD7_SRC)
+INCLUDES	:=	source $(RENDERD7_INC)
+```
+
+Example from rd7tf
+### Installation (0.8.0-0.9.4) (OUTDATED)
+Download a Package From Releses Page
+`https://github.com/NPI-D7/RenderD7/releases/download/v0.9.4/renderd7.tar.bz2 -o renderd7.tar.bz2`
+Then Extract it to your Libraries Path
+`bzip2 -cd renderd7.tar.bz2 | tar -xf - -C path_to_your_libs`
+Finally put `-lrenderd7` to the First Place and add the path_to_your_libs
+```
+LIBS	:= -lrenderd7 -lcurl -lstdc++ -lm -lcitro2d -lcitro3d -lctru
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:= $(PORTLIBS) $(CTRULIB) ../path_to_your_libs
+```
+Make sure that `-lrenderd7` is before `-lcitro2d`, `-lcitro3d`, `-lctru`.
+Here an example tree
+```
+Example-App
+├── gfx
+├── libs
+│   ├── include
+│   │   ├── rd7.hpp
+│   │   └── renderd7
+│   └── lib
+│       ├── librenderd7.a
+│       └── librenderd7d.a
+├── Makefile
+├── romfs
+│   └── gfx
+└── src
+    └── main.cpp
+```
+# Credits
+- NPI-D7
+  - Tobi-D7 Main Dev
+
+Some Icons are From
+https://icons8.de/
+See Subfolder Readmes

assets/build_assets.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-echo "Create Directorys"
-mkdir -p build
-mkdir -p code
-
-echo "Generating Spritesheets"
-cd resources
-
-for file in *.t3s
-do
-    filename=$(basename "$file" .t3s).t3x
-    tex3ds -o "../build/$filename" -i "${file}"
-done
-
-echo "Converting Spritesheets into C++ Code"
-cd ../code
-
-for file in ../build/*.t3x
-do
-    name="${file##*/}"
-    name="${name%.*}"
-    ../../tools/bin/file2array "${file}" "${name}"
-done
-
-echo "Convert Npi-Intro to C++ Code"
-../../tools/bin/file2array ../splash/npi_intro.nvid npi_intro
-
-echo "Fix The Output of file2array"
-for file in ./*.cpp
-do
-    ../../tools/bin/rd7f2afix "${file}" "renderd7"
-done
-echo "Finished!"

assets/clear_assets.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo "Deleting Directorys"
-rm -rf build
-rm -rf code
-
-echo "Finished!"

assets/resources/battery/README.md

@@ -1,2 +0,0 @@
-# Source
-https://icons8.de/

assets/resources/battery_icons.t3s

@@ -1,11 +0,0 @@
---atlas -f rgba -z auto
-
-battery/battery_full.png
-battery/battery_nearfull.png
-battery/battery_half.png
-battery/battery_low.png
-battery/battery_verylow.png
-battery/battery_warning.png
-battery/battery_charging.png
-battery/battery_empty.png
-battery/battery_dead.png

assets/resources/renderd7_logo.t3s

@@ -1,3 +1,3 @@
---atlas -f rgba -z auto
-
+--atlas -f rgba -z auto
+
 renderd7_logo/renderd7_logo.png

assets/resources/ui_elements.t3s

@@ -1,19 +0,0 @@
---atlas -f rgba -z auto
-
-ui_elements/high_volume.png
-ui_elements/mid_volume.png
-ui_elements/low_volume.png
-ui_elements/speaker_v1.png
-ui_elements/no_sound.png
-ui_elements/speaker.png
-
-ui_elements/wifi_connected.png
-ui_elements/wifi_disconnected.png
-ui_elements/wifi_off.png
-
-ui_elements/good_connection.png
-ui_elements/mid_connection.png
-ui_elements/bad_connection.png
-ui_elements/no_connection.png
-
-ui_elements/headphones.png

assets/resources/ui_elements/README.md

@@ -1,2 +0,0 @@
-# Source
-https://icons8.de/

cformat.sh

@@ -1,7 +0,0 @@
-
-find . -type f \( -name '*.h' -o -name '*.hpp' -o -name '*.hh' -o -name '*.ino' -o -name '*.cpp' -o -name '*.c' -o -name '*.cxx' -o -name '*.inl' \) -and -not -path './build/*' -not -path './base/external/*' -not -path './DPP/*' | while read file; do
-  if [[ "$file" != *"json.hpp" ]]; then
-    echo "Formatting $file..."
-    clang-format -i --style=LLVM $file
-  fi
-done

clang-format.py

@@ -0,0 +1,27 @@
+import subprocess
+import glob
+from pathlib import Path
+# Format script
+
+def fmt_file(path):
+        if Path(path).is_dir():
+             return # Skip
+        try:
+            subprocess.run(['clang-format', '-i', path, '--style=Google'], check=True)
+        except subprocess.CalledProcessError as e:
+            print('Error for ' + Path(path).stem + ': ' + e)
+
+def fmt_dir(path):
+    sources = glob.glob(path+'/*')
+    for file in sources:
+        fmt_file(file)
+
+print('Formatting...')
+fmt_dir('source')
+fmt_dir('include')
+fmt_dir('include/renderd7')
+
+# Format LE and TF as well
+fmt_dir('rd7tf/source')
+#fmt_dir('rd7le/source')
+print('Done')

docs/javascripts/mathjax.js

@@ -0,0 +1,18 @@
+<div class="md-copyright">
+  {% if config.copyright %}
+    <div class="md-copyright__highlight">
+      {{ config.copyright }}
+    </div>
+  {% endif %}
+  {% if not config.extra.generator == false %}
+    Made with
+    <a href="https://doxide.org" target="_blank" rel="noopener">
+      Doxide
+    </a>
+    and
+    <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
+      Material for MkDocs
+    </a>
+  {% endif %}
+</div>
+

docs/overrides/partials/copyright.html

@@ -0,0 +1,18 @@
+<div class="md-copyright">
+  {% if config.copyright %}
+    <div class="md-copyright__highlight">
+      {{ config.copyright }}
+    </div>
+  {% endif %}
+  {% if not config.extra.generator == false %}
+    Made with
+    <a href="https://doxide.org" target="_blank" rel="noopener">
+      Doxide
+    </a>
+    and
+    <a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
+      Material for MkDocs
+    </a>
+  {% endif %}
+</div>
+

docs/stylesheets/doxide.css

@@ -0,0 +1,49 @@
+:root {
+  --md-admonition-icon--variable: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.41 3c1.39 2.71 1.94 5.84 1.59 9-.2 3.16-1.3 6.29-3.17 9l-1.53-1c1.61-2.43 2.55-5.2 2.7-8 .34-2.8-.11-5.57-1.3-8l1.71-1M5.17 3 6.7 4C5.09 6.43 4.15 9.2 4 12c-.34 2.8.12 5.57 1.3 8l-1.69 1c-1.4-2.71-1.96-5.83-1.61-9 .2-3.16 1.3-6.29 3.17-9m6.91 7.68 2.32-3.23h2.53l-3.78 5 2.2 4.92h-2.26L11.71 14l-2.43 3.33H6.76l3.9-5.12-2.13-4.76h2.27l1.28 3.23Z"/></svg>');
+  --md-admonition-icon--function: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.6 5.29c-1.1-.1-2.07.71-2.17 1.82L13.18 10H16v2h-3l-.44 5.07a3.986 3.986 0 0 1-4.33 3.63 4.007 4.007 0 0 1-3.06-1.87l1.5-1.5c.24.74.9 1.31 1.73 1.38 1.1.1 2.07-.71 2.17-1.82L11 12H8v-2h3.17l.27-3.07c.19-2.2 2.13-3.83 4.33-3.63 1.31.11 2.41.84 3.06 1.87l-1.5 1.5c-.24-.74-.9-1.31-1.73-1.38Z"/></svg>');
+  --md-admonition-icon--concept: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3.75 3.5a.25.25 0 0 0-.25.25v2.062a.75.75 0 1 1-1.5 0V3.75C2 2.783 2.783 2 3.75 2h2.062a.75.75 0 1 1 0 1.5Zm13.688-.75a.75.75 0 0 1 .75-.75h2.062c.966 0 1.75.783 1.75 1.75v2.062a.75.75 0 1 1-1.5 0V3.75a.25.25 0 0 0-.25-.25h-2.062a.75.75 0 0 1-.75-.75ZM2.75 17.438a.75.75 0 0 1 .75.75v2.062c0 .138.112.25.25.25h2.062a.75.75 0 1 1 0 1.5H3.75A1.75 1.75 0 0 1 2 20.25v-2.062a.75.75 0 0 1 .75-.75Zm18.5 0a.75.75 0 0 1 .75.75v2.062A1.75 1.75 0 0 1 20.25 22h-2.062a.75.75 0 1 1 0-1.5h2.062a.25.25 0 0 0 .25-.25v-2.062a.75.75 0 0 1 .75-.75Zm-18.5-8.25a.75.75 0 0 1 .75.75v4.124a.75.75 0 1 1-1.5 0V9.938a.75.75 0 0 1 .75-.75ZM9.188 2.75a.75.75 0 0 1 .75-.75h4.124a.75.75 0 1 1 0 1.5H9.938a.75.75 0 0 1-.75-.75Zm0 18.5a.75.75 0 0 1 .75-.75h4.124a.75.75 0 1 1 0 1.5H9.938a.75.75 0 0 1-.75-.75ZM21.25 9.188a.75.75 0 0 1 .75.75v4.124a.75.75 0 1 1-1.5 0V9.938a.75.75 0 0 1 .75-.75ZM3.75 8.25a.75.75 0 0 1 .75-.75h2a.75.75 0 0 1 0 1.5h-2a.75.75 0 0 1-.75-.75Zm5.5 0A.75.75 0 0 1 10 7.5h2A.75.75 0 0 1 12 9h-2a.75.75 0 0 1-.75-.75Zm-1-4.5A.75.75 0 0 1 9 4.5v2a.75.75 0 0 1-1.5 0v-2a.75.75 0 0 1 .75-.75Zm0 5.5A.75.75 0 0 1 9 10v2a.75.75 0 0 1-1.5 0v-2a.75.75 0 0 1 .75-.75Zm0 4.75a.75.75 0 0 1 .75.75v4a.75.75 0 0 1-1.5 0v-4a.75.75 0 0 1 .75-.75ZM14 8.25a.75.75 0 0 1 .75-.75h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1-.75-.75Z"/></svg>');
+  --md-admonition-icon--macro: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m5.41 21 .71-4h-4l.35-2h4l1.06-6h-4l.35-2h4l.71-4h2l-.71 4h6l.71-4h2l-.71 4h4l-.35 2h-4l-1.06 6h4l-.35 2h-4l-.71 4h-2l.71-4h-6l-.71 4h-2M9.53 9l-1.06 6h6l1.06-6h-6Z"/></svg>');
+}
+
+.md-typeset .admonition.variable, .md-typeset details.variable,
+.md-typeset .admonition.function, .md-typeset details.function,
+.md-typeset .admonition.concept, .md-typeset details.concept,
+.md-typeset .admonition.macro, .md-typeset details.macro {
+  border-color: var(--md-default-fg-color--lighter);
+}
+
+.md-typeset .variable > .admonition-title, .md-typeset .variable > summary,
+.md-typeset .function > .admonition-title, .md-typeset .function > summary,
+.md-typeset .concept > .admonition-title, .md-typeset .concept > summary,
+.md-typeset .macro > .admonition-title, .md-typeset .macro > summary {
+  background-color: var(--md-default-bg-color);
+}
+
+.md-typeset .variable > .admonition-title::before,
+.md-typeset .variable > summary::before {
+  background-color: var(--md-default-fg-color--light);
+  -webkit-mask-image: var(--md-admonition-icon--variable);
+          mask-image: var(--md-admonition-icon--variable);
+}
+
+.md-typeset .function > .admonition-title::before,
+.md-typeset .function > summary::before {
+  background-color: var(--md-default-fg-color--light);
+  -webkit-mask-image: var(--md-admonition-icon--function);
+          mask-image: var(--md-admonition-icon--function);
+}
+
+.md-typeset .concept > .admonition-title::before,
+.md-typeset .concept > summary::before {
+  background-color: var(--md-default-fg-color--light);
+  -webkit-mask-image: var(--md-admonition-icon--concept);
+          mask-image: var(--md-admonition-icon--concept);
+}
+
+.md-typeset .macro > .admonition-title::before,
+.md-typeset .macro > summary::before {
+  background-color: var(--md-default-fg-color--light);
+  -webkit-mask-image: var(--md-admonition-icon--macro);
+          mask-image: var(--md-admonition-icon--macro);
+}
+

docsn.css

@@ -1,638 +0,0 @@
-/* This doxygen theme is free to use. If you like this, please Star https://github.com/kcwongjoe/doxygen_theme_flat_design */
-
-/* Color Pattern. You can change this pattern to design your theme. */
-
-:root {
-    /* Content */
-    --bgcolor: #ffffff;
-    --bgfont: #303030;
-    --bgfont2: #f3c60a;
-    --bgfont-hover: #f3c60a;
-    --bgfont-hover-text-decoration: none;
-    --bgborder: #7d7d7d;
-    --bgborder2: #f6f6f6;
-    /* Main Header */
-    --bg1color: #303030;
-    --bg1font: #ffffff;
-    --bg1font2: #f3c60a;
-    /* Second header */
-    --bg2color: #E2E2E2;
-    --bg2font: #7D7D7D;
-    --bg2-hover-bg: #ffffff;
-    --bg2-hover-font: #303030;
-    --bg2-hover-topborder: #f3c60a;
-    /* Third header */
-    --bg3color: #f6f6f6;
-    --bg3font: #303030;
-    --bg3font2: #7D7D7D;
-    /* Code */
-    --code-bg: #f6f6f6;
-    --code-comment: #7D7D7D;
-    --code-keyword: #d73a49;
-    --code-preprocessor: #d73a49;
-    --code-keywordtype: #d73a49;
-    --code-text: #303030;
-    --code-code: #6f42c1;
-    --code-line: #7D7D7D;
-    --code-line-bg: #D8D8D8;
-    /* Namespace List, Class List icon */
-    --icon-bg: #303030;
-    --icon-font: #f3c60a;
-    /* Class Index */
-    --qindex-menu-bg: #303030;
-    --qindex-menu-font: #ffffff;
-    --qindex-menu-font-hover: #f3c60a;
-    --qindex-icon-bg: #f3c60a;
-    --qindex-icon-font: #303030;
-    /* Member table */
-    --mem-title-bg: #303030;
-    --mem-title-font: #ffffff;
-    --mem-subtitle-bg: #f3c60a;
-    --mem-subtitle-font: #303030;
-    --mem-subtitle-font-hover: #303030;
-    --mem-content-bg: #ffffff;
-    --mem-content-font: #303030;
-    --mem-content-border: #f6f6f6;
-    /* Nav Tree */
-    --nav-tree-bg: #E2E2E2;
-    --nav-tree-bg-hover: #ffffff;
-    --nav-tree-font: #7D7D7D;
-    --nav-tree-font-hover: #303030;
-    --nav-tree-bg-selected: #f3c60a;
-    --nav-tree-font-selected: #303030;
-}
-
-body, table, div, p, dl {
-    color: var(--bgfont);
-    background-color: var(--bgcolor);
-    line-height: 150%;
-    font: 14px/22px, Roboto, Arial;
-}
-
-div.contents {
-    margin: 20px 40px;
-}
-
-div.contents ul {
-    line-height: 200%;
-}
-
-/***********************************/
-
-/********** Project header *********/
-
-/***********************************/
-
-#titlearea {
-    border-bottom: none;
-    padding-bottom: 20px;
-    padding-top: 20px;
-}
-
-#titlearea, #titlearea * {
-    color: var(--bg1font);
-    background-color: var(--bg1color);
-}
-
-#projectname {
-    padding: 0px 40px !important;
-}
-
-#projectbrief {
-    padding: 0px 40px !important;
-}
-
-#projectalign {
-    padding: 0px !important;
-}
-
-/***********************************/
-
-/************ Main Menu ************/
-
-/***********************************/
-
-/* Margin */
-
-#main-menu {
-    padding: 0px 30px;
-}
-
-#main-menu a, #main-menu a:hover {
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-
-/* Menu button */
-
-#main-menu li a {
-    background-image: none;
-    font-family: Arial;
-    text-transform: uppercase;
-    text-shadow: none;
-    font-size: 14px;
-    font-weight: 700;
-}
-
-#main-menu, #main-menu>li>a {
-    background-image: none;
-    background-color: var(--bg2color);
-    color: var(--bg2font);
-    transition: 0.2s;
-}
-
-/* hover Effect */
-
-#main-menu>li {
-    border-top: 5px solid var(--bg2color);
-}
-
-#main-menu>li:hover {
-    color: var(--bg2-hover-font);
-    background-color: var(--bg2-hover-bg);
-    border-top: 5px solid var(--bg2-hover-topborder);
-}
-
-#main-menu>li:hover, #main-menu>li>a:hover, #main-menu>li>a.highlighted {
-    color: var(--bg2-hover-font);
-    background-color: var(--bg2-hover-bg);
-}
-
-/* Search Bar */
-
-#MSearchBox {
-    border-radius: 0;
-    box-shadow: none;
-}
-
-#MSearchBox>span {
-    margin: 10px;
-}
-
-#main-menu>li:last-child {
-    padding: 25px 0px;
-}
-
-/* Reset search hover color*/
-
-#main-menu>li:last-child:hover {
-    color: var(--bg2font);
-    background-color: var(--bg2color);
-    border-top: 5px solid var(--bg2color);
-}
-
-#MSearchResultsWindow {
-    border: 1px solid var(--bg3font2);
-    background-color: var(--bg3color);
-    padding: 10px;
-}
-
-body.SRPage, body.SRPage * {
-    font-family: Arial;
-}
-
-/* Sub Menu  */
-
-#main-menu>li ul {
-    transition: max-height 0.2s ease-in-out;
-    padding: 0px;
-    border-radius: 0px !important;
-}
-
-#main-menu>li ul:before, #main-menu>li ul:after {
-    border-width: 0px;
-}
-
-#main-menu>li>ul li a, #main-menu>li>ul li {
-    background-color: var(--bgcolor);
-    color: var(--bgfont);
-    background-image: none;
-}
-
-#main-menu>li>ul li a:hover, #main-menu>li>ul li:hover {
-    background-color: var(--bgfont2);
-    color: var(--bgfont);
-}
-
-/***********************************/
-
-/************** Header *************/
-
-/***********************************/
-
-div.headertitle {
-    padding: 5px 40px;
-}
-
-div.header, div.header * {
-    color: var(--bg3font);
-    background-color: var(--bg3color);
-    border-bottom: none;
-}
-
-div.summary {
-    padding-right: 40px;
-}
-
-/***********************************/
-
-/************** Link *************/
-
-/***********************************/
-
-a, a:visited, a:active, .contents a:visited, body.SRPage a, body.SRPage a:visited, body.SRPage a:active {
-    color: var(--bgfont);
-    text-decoration: none;
-}
-
-a:hover, .contents a:hover, body.SRPage a:hover {
-    color: var(--bgfont-hover);
-    text-decoration: var(--bgfont-hover-text-decoration);
-}
-
-/***********************************/
-
-/************ Nav-path ************/
-
-/***********************************/
-
-#nav-path, #nav-path ul {
-    background-image: none;
-}
-
-#nav-path ul {
-    padding: 5px 30px;
-}
-
-#nav-path, #nav-path * {
-    color: var(--bg3font2);
-    background-color: var(--bg3color);
-    border: none;
-    font-family: Arial;
-}
-
-li.navelem {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnN2Z2pzPSJodHRwOi8vc3ZnanMuY29tL3N2Z2pzIiB3aWR0aD0iNTEyIiBoZWlnaHQ9IjUxMiIgeD0iMCIgeT0iMCIgdmlld0JveD0iMCAwIDI5Mi4zNTkgMjkyLjM1OSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNTEyIDUxMiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgY2xhc3M9IiI+PGc+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+Cgk8cGF0aCBkPSJNMjIyLjk3OSwxMzMuMzMxTDk1LjA3Myw1LjQyNEM5MS40NTYsMS44MDcsODcuMTc4LDAsODIuMjI2LDBjLTQuOTUyLDAtOS4yMzMsMS44MDctMTIuODUsNS40MjQgICBjLTMuNjE3LDMuNjE3LTUuNDI0LDcuODk4LTUuNDI0LDEyLjg0N3YyNTUuODEzYzAsNC45NDgsMS44MDcsOS4yMzIsNS40MjQsMTIuODQ3YzMuNjIxLDMuNjE3LDcuOTAyLDUuNDI4LDEyLjg1LDUuNDI4ICAgYzQuOTQ5LDAsOS4yMy0xLjgxMSwxMi44NDctNS40MjhsMTI3LjkwNi0xMjcuOTA3YzMuNjE0LTMuNjEzLDUuNDI4LTcuODk3LDUuNDI4LTEyLjg0NyAgIEMyMjguNDA3LDE0MS4yMjksMjI2LjU5NCwxMzYuOTQ4LDIyMi45NzksMTMzLjMzMXoiIGZpbGw9IiM3ZDdkN2QiIGRhdGEtb3JpZ2luYWw9IiMwMDAwMDAiIHN0eWxlPSIiIGNsYXNzPSIiPjwvcGF0aD4KPC9nPgo8ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8L2c+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjwvZz4KPGcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPC9nPgo8ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8L2c+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjwvZz4KPGcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPC9nPgo8ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8L2c+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjwvZz4KPGcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPC9nPgo8ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8L2c+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjwvZz4KPGcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPC9nPgo8ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8L2c+CjxnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjwvZz4KPGcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPC9nPgo8L2c+PC9zdmc+);
-    background-size: 9px;
-}
-
-li.navelem a {
-    margin-right: 20px;
-}
-
-/***********************************/
-
-/*************** mem ***************/
-
-/***********************************/
-
-.memtitle {
-    padding: 15px;
-    margin-top: 30px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-}
-
-.memtitle, .memtitle *, .memtitle a:visited {
-    border: none;
-    background-image: none;
-    color: var(--mem-title-font);
-    background-color: var(--mem-title-bg);
-}
-
-.memproto {
-    padding: 10px;
-    text-shadow: none;
-    padding: 20px;
-    border-top-right-radius: 0px;
-    -moz-border-radius-topright: 0px;
-    -webkit-border-top-right-radius: 0px;
-}
-
-.memproto, .memproto *, .memproto a:visited {
-    border: none;
-    background-image: none;
-    background-color: var(--mem-subtitle-bg);
-    color: var(--mem-subtitle-font);
-    font-size: inherit;
-    line-height: 100%
-}
-
-.memproto a:hover {
-    color: var(--mem-subtitle-font-hover);
-}
-
-.memdoc {
-    border-bottom: 1px solid var(--mem-content-border);
-    border-left: 1px solid var(--mem-content-border);
-    border-right: 1px solid var(--mem-content-border);
-    background-color: var(--mem-content-bg);
-    color: var(--mem-content-font);
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-    -moz-border-radius-bottomleft: 0px;
-    -moz-border-radius-bottomright: 0px;
-    -webkit-border-bottom-left-radius: 0px;
-    -webkit-border-bottom-right-radius: 0px;
-}
-
-.memdoc p, .memdoc dt {
-    padding: 0px 20px;
-}
-
-/***********************************/
-
-/************* Contents ************/
-
-/***********************************/
-
-a.anchor {
-    padding-top: 20px;
-}
-
-/***********************************/
-
-/************* fragment ************/
-
-/***********************************/
-
-h2.groupheader {
-    color: #303030;
-    font-size: 200%;
-    font-weight: bold;
-    border-bottom: none;
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-div.fragment, pre.fragment {
-    border: none;
-    padding: 20px;
-    margin: none;
-    background-color: var(--code-bg);
-}
-
-div.line {
-    background-color: var(--code-bg);
-}
-
-span.comment {
-    color: var(--code-comment);
-}
-
-span.keyword {
-    color: var(--code-keyword);
-}
-
-span.preprocessor {
-    color: var(--code-preprocessor);
-}
-
-span.keywordtype {
-    color: var(--code-keywordtype);
-}
-
-span.mlabel {
-    background-color: var(--code-text);
-    color: var(--code-bg);
-    border-top: none;
-    border-left: none;
-    border-right: none;
-    border-bottom: none;
-    padding: 10px;
-    border-radius: 0px;
-}
-
-a.code {
-    color: var(--code-code);
-}
-
-span.lineno, span.lineno>* {
-    color: var(--code-line);
-    border-right: none;
-    background-color: var(--code-bg);
-}
-
-span.lineno a {
-    background-color: var(--code-line-bg);
-}
-
-span.lineno a:hover {
-    color: var(--bg3font);
-    background-color: var(--code-line-bg);
-}
-
-/***********************************/
-
-/************* directory ***********/
-
-/***********************************/
-
-.directory tr.even {
-    background-color: inherit;
-}
-
-.iconfclosed {
-    background-image: url(closed-folder.png);
-    margin-right: 10px;
-}
-
-.iconfopen {
-    background-image: url(opened-folder.png);
-    margin-right: 10px;
-}
-
-.icondoc {
-    background-image: url(document.png);
-    margin-right: 10px;
-}
-
-.arrow {
-    color: #7d7d7d;
-}
-
-.icona {
-    vertical-align: middle;
-    margin-right: 5px;
-}
-
-.icon {
-    background-color: var(--icon-bg);
-    color: var(--icon-font);
-    display: table-cell;
-    vertical-align: middle;
-    height: 20px;
-    width: 20px;
-}
-
-div.ah {
-    background-color: var(--qindex-icon-bg);
-    color: var(--qindex-icon-font);
-    text-align: center;
-    background-image: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
-    -webkit-border-radius: 0px;
-    border-radius: 0px;
-    border: none;
-}
-
-div.qindex {
-    background-color: var(--qindex-menu-bg);
-    border: none;
-    padding: 20px;
-}
-
-a.qindex {
-    color: var(--qindex-menu-font);
-    font-weight: normal;
-    font-size: 20px;
-}
-
-a:hover.qindex {
-    color: var(--qindex-menu-font-hover);
-}
-
-a:visited.qindex {
-    color: var(--qindex-menu-font);
-}
-
-table.classindex {
-    margin-top: 30px;
-    margin-bottom: 30px;
-}
-
-table.classindex a.el {
-    font-weight: normal;
-}
-
-/***********************************/
-
-/************** footer *************/
-
-/***********************************/
-
-div.directory {
-    border-top: 1px solid var(--bgborder);
-    border-bottom: none;
-    margin: 20px 0px;
-}
-
-div.directory a.el {
-    font-weight: normal;
-}
-
-div.directory>table {
-    margin: 20px 0px;
-}
-
-hr.footer {
-    border: none;
-}
-
-.contents>hr {
-    border-top: 0px;
-}
-
-/***********************************/
-
-/*********** memberdecls ***********/
-
-/***********************************/
-
-.memItemLeft, .memItemRight {
-    padding: 15px 30px;
-    background-color: inherit;
-}
-
-.mdescRight {
-    padding: 0px 30px 10px 30px;
-}
-
-.memberdecls * {
-    background-color: inherit;
-}
-
-.memSeparator {
-    border-bottom: 1px solid var(--bgborder2);
-}
-
-.memTemplParams {
-    color: var(--bgfont);
-}
-
-/***********************************/
-
-/*********** nav-tree ***********/
-
-/***********************************/
-
-#nav-tree-contents {
-    background-color: var(--nav-tree-bg);
-    margin: 0px;
-}
-
-#side-nav, #nav-tree {
-    background-image: none;
-    background-color: var(--nav-tree-bg);
-}
-
-#nav-tree .item {
-    background-color: var(--nav-tree-bg);
-    font-family: Arial;
-    text-transform: uppercase;
-    text-shadow: none;
-    font-size: 14px;
-    font-weight: 700;
-    padding: 10px;
-    color: var(--nav-tree-font);
-}
-
-#nav-tree .arrow {
-    color: var(--nav-tree-font);
-}
-
-#nav-tree .selected {
-    background-image: none;
-    background-color: var(--nav-tree-bg-selected);
-}
-
-#nav-tree .selected a {
-    color: var(--nav-tree-font-selected);
-}
-
-#nav-tree .item:hover {
-    background-color: var(--nav-tree-bg-hover);
-    color: var(--nav-tree-font-hover);
-}
-
-#nav-tree .item a:hover {
-    color: var(--nav-tree-font-hover);
-}
-
-#side-nav .ui-resizable-e {
-    background-image: none;
-    background-color: var(--nav-tree-bg);
-}
-
-#nav-sync {
-    background-color: transparent;
-}
-
-#nav-sync>img {
-    content: url(off_sync.png);
-}
-
-#nav-sync.sync>img {
-    content: url(on_sync.png);
-}
-
-/***********************************/
-
-/*********** Plant UML ***********/
-
-/***********************************/
-
-.plantumlgraph > img {
-    width: 80%;
-}

doxide.yaml

@@ -0,0 +1,9 @@
+title: RenderD7
+description: 
+files:
+  - "include/*.hpp"
+  - "include/renderd7/*.hpp"
+  - "include/renderd7/music/*.hpp"
+  - "include/*.h"
+  - "include/renderd7/*.h"
+  - "include/renderd7/music/*.h"

generate_assets.py

@@ -0,0 +1,63 @@
+import os
+import glob
+import shutil
+from pathlib import Path
+
+# Simple Script to generate/update Assets
+
+def file2array(path, custom_incluse_path):
+    print(path)
+    cip = len(custom_incluse_path)
+    sip = ''
+    if cip > 0:
+        sip = custom_incluse_path
+    name = Path(path).stem
+    filei = open(path, 'rb')
+    buf = filei.read()
+    filei.close()
+    fs = open(name + '.cpp', 'w')
+    fs.write("// THIS FILE WAS GENERATED BY generate_assets.py!!!\n\n")
+    fs.write('#include <'+ sip + name + '.hpp>\n\n')
+    fs.write('// clang-format off\n')
+    fs.write('unsigned char ' + name + '[] = {\n')
+    for byte in buf:
+        fs.write(hex(byte) + ', ')
+    fs.write('\n};\n')
+    fs.write('// clang-format on\n')
+    fs.write('size_t ' + name + '_size = ' + hex(len(buf)) + ';')
+    fs.close()
+    fh = open(name + '.hpp', 'w')
+    fh.write("// THIS FILE WAS GENERATED BY generate_assets.py!!!\n\n")
+    fh.write('#pragma once\n\n')
+    fh.write('#include <cstddef>\n\n')
+    fh.write('extern unsigned char ' + name + '[];\n')
+    fh.write('extern size_t ' + name + '_size;')
+    fh.close()
+
+def tex3ds_build(path):
+    p = os.path.dirname(path)
+    n = Path(path).stem
+    os.system('tex3ds -o ' + p + '/' + n + '.t3x -i ' + path)
+
+def cleanup():
+    t3x = glob.glob('assets/resources/*.t3x')
+    for f in t3x:
+        os.remove(f)
+
+def install_code(what, where):
+    if Path(what).is_dir:
+        os.error('Must be a file!!!')
+    shutil.move(what, where + Path(what).name)
+
+print("Generating...")
+t3xtg = glob.glob('assets/resources/*.t3s')
+for object in t3xtg:
+    name = Path(object).stem
+    bp = os.path.dirname(object)
+    tex3ds_build(object)
+    file2array(bp + '/' + name + '.t3x', 'renderd7/')
+    install_code(name + '.cpp', 'source/')
+    install_code(name + '.hpp', 'include/renderd7/')
+
+cleanup()
+print("Done")

include/rd7.hpp

@@ -1,5 +1,19 @@
-#pragma once
-
-#include <renderd7/StealConsole.hpp>
-#include <renderd7/bmp.hpp>
-#include <renderd7/renderd7.hpp>
+#pragma once
+
+#include <renderd7/Allocator.hpp>
+#include <renderd7/Error.hpp>
+#include <renderd7/FileSystem.hpp>
+#include <renderd7/Hid.hpp>
+#include <renderd7/Image.hpp>
+#include <renderd7/Installer.hpp>
+#include <renderd7/Message.hpp>
+#include <renderd7/Net.hpp>
+#include <renderd7/Overlays.hpp>
+#include <renderd7/Sound.hpp>
+#include <renderd7/Timer.hpp>
+#include <renderd7/UI7.hpp>
+#include <renderd7/global_db.hpp>
+#include <renderd7/renderd7.hpp>
+#include <renderd7/swr.hpp>
+
+namespace RD7 = RenderD7;

include/renderd7/Allocator.hpp

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <3ds.h>
+
+#include <memory>
+#include <renderd7/Error.hpp>
+
+// Write own LinearAllocator for learning
+
+namespace RenderD7 {
+template <typename T>
+class LinearAllocator : public std::allocator<T> {
+ public:
+  typedef size_t size_type;
+  typedef T* pointer;
+  typedef const T* const_pointer;
+
+  template <typename T1>
+  struct rebind {
+    typedef LinearAllocator<T1> other;
+  };
+
+  pointer allocate(size_type n, const void* hint = nullptr) {
+    if (n > this->max_size()) {
+      RenderD7::Error(
+          "Linear Allocator: \nBad Alloc -> size is larger than free space!");
+      return nullptr;
+    }
+    return (pointer)linearAlloc(n * sizeof(T));
+  }
+
+  void deallocate(pointer p, size_type) { linearFree((void*)p); }
+
+  size_type max_size() { return linearSpaceFree(); }
+
+  LinearAllocator() throw() {}
+  LinearAllocator(const LinearAllocator<T>& a) throw() : std::allocator<T>(a) {}
+  ~LinearAllocator() throw() {}
+};
+}  // namespace RenderD7

include/renderd7/BitmapPrinter.hpp

@@ -1,219 +0,0 @@
-#pragma once
-#include <string>
-#include <vector>
-
-#include <renderd7/bmp.hpp>
-#include <renderd7/bmpconverter.hpp>
-
-#include <renderd7/Image.hpp>
-
-#include <renderd7/Screen.hpp>
-#include <renderd7/Time.hpp>
-
-#include <renderd7/Fonts/NFontApi.hpp>
-
-namespace RenderD7 {
-/// @brief Encoder
-enum Encoder {
-  BITMAP, ///< Encode Data to Bitmap
-  DIRECT, ///< Encode Direct to Framebuffer(No Decoder Required)
-  C3D     ///< Encode Directly to C3D_Tex (Just an Idea)
-};
-
-/// @brief Decoder
-enum Decoder {
-  BITMAP2C3D,    ///< Decode and Encode to C3D_Tex (Currently Fastest) (47,4ms)
-  BITMAP2PNG2C3D ///< Decode Bitmap end Convert to Png, then C3D (Very Slow)
-                 ///< (201,4ms)
-};
-
-/// @brief BitmapPrinetr Class
-class BitmapPrinter {
-public:
-  /// @brief Constructor
-  /// @param w Widrth
-  /// @param h Height
-  BitmapPrinter(int w, int h);
-  /// @brief Deconstructor
-  ~BitmapPrinter();
-  /// @brief Dexode Bitmap File
-  /// @param file path to File
-  /// @return success ?
-  bool DecodeFile(std::string file);
-
-  /// @brief Set the Decoder
-  /// @param deccc Decoder
-  void SetDecoder(Decoder deccc) { decc = deccc; }
-  /// @brief Draw a Pixel
-  /// @param x pos x
-  /// @param y pos y
-  /// @param b color blue
-  /// @param g color green
-  /// @param r color red
-  /// @param a color alpha
-  void DrawPixel(int x, int y, u8 b, u8 g, u8 r, u8 a);
-  /// @brief Draw Rectangle
-  /// @param x pos x
-  /// @param y pos y
-  /// @param w width
-  /// @param h height
-  /// @param line_w line width
-  /// @param b color blue
-  /// @param g color green
-  /// @param r color red
-  /// @param a colr alpha
-  void DrawRect(int x, int y, int w, int h, u8 line_w, u8 b, u8 g, u8 r, u8 a);
-  /// @brief Draw a Fillif Rectangle
-  /// @param x pos x
-  /// @param y pos y
-  /// @param w width
-  /// @param h height
-  /// @param b color blue
-  /// @param g color green
-  /// @param r color red
-  /// @param a color alpha
-  void DrawRectFilled(int x, int y, int w, int h, u8 b, u8 g, u8 r, u8 a);
-  /// @brief Draw Bitmap
-  /// @param x pos x
-  /// @param y pos y
-  /// @param map Bitmap to Print
-  void DrawBitmap(int x, int y, BMP map);
-  /// @brief Use Prebuild Bitmap
-  /// @param map bitmap
-  void UsePreMap(BMP map);
-  /// @brief Use Prebuild Printer Setup
-  /// @param printmap Printer
-  void UsePrePrintMap(BitmapPrinter printmap);
-  /// @brief Get Bitmap
-  /// @return Bitmap
-  BMP GetBitmap() { return bitmap; }
-  /// @brief Save to File
-  /// @param name Name/Path
-  void SaveBmp(std::string name);
-  /// @brief Save as Png
-  /// @param name Name/Path
-  void SavePng(std::string name);
-
-  /// @brief Setup Screen
-  /// @param target Screen
-  void CreateScreen(C3D_RenderTarget *target);
-  /// @brief Draw Directly to Screen With Framerate
-  /// @param framerate Framerate
-  /// @return
-  bool DrawScreenDirectF(int framerate);
-  /// @brief Draw Directly to Screen
-  /// @return
-  bool DrawScreenDirect();
-  /// @brief Render on Screen by Framerate
-  /// @param framerate Framerate
-  void DrawScreenF(int framerate);
-  /// @brief Draw to Screen
-  void DrawScreen();
-  /// @brief Update Image by Framerate
-  /// @param framerate Framerate
-  /// @return
-  bool UpdateScreenF(int framerate);
-  /// @brief Update Image
-  /// @return
-  bool UpdateScreen();
-  /// @brief Clear by Color
-  /// @param b color blue
-  /// @param g color green
-  /// @param r color red
-  /// @param a color alpha
-  void Clear(u8 b = 0, u8 g = 0, u8 r = 0, u8 a = 255);
-  /// @brief Clear Completly Blank
-  void ClearBlank();
-  /// @brief Get Rendered Image
-  /// @return Image
-  RenderD7::Image GetImage();
-  /// Test to Find out The Best Settings for BitmapPrinter
-  void Benchmark();
-  /// @brief Setup the Benchmark
-  /// \param framerate The Fps of the ScreenUpdates
-  void SetupBenchmark(int framerate);
-  /// @brief Check if Benchmark is Running
-  /// @return is running or not
-  bool IsBenchmarkRunning() { return this->benchmark; }
-
-  /// @brief Draw a Dubug Text
-  /// @param x pos x
-  /// @param y pos y
-  /// @param t_size Size of the Text
-  /// @param color Color of the Text
-  /// @param text String of the Text
-  void DrawDebugText(int x, int y, int t_size, u32 color, std::string text);
-  /// @brief Draw a Text width NFontApi (TTF)
-  /// @param x pos x
-  /// @param y pos y
-  /// @param t_size size of the Text
-  /// @param color Color of The Text
-  /// @param text String of The Text
-  /// @param font TTF Font
-  void DrawText(int x, int y, float t_size, u32 color, std::string text,
-                RenderD7::NFontApi font);
-
-private:
-  // funcs
-
-  /// @brief Decode 2 RenderD7::Image
-  /// @param deccc Decoder
-  /// @return
-  bool Decode(Decoder deccc);
-  /// @brief Draw Char Func
-  /// @param posX pos x
-  /// @param posY pos y
-  /// @param t_size size
-  /// @param color color
-  /// @param character char
-  void DrawDebugChar(u32 posX, u32 posY, int t_size, u32 color, char character);
-  /// @brief NFont Draw Char
-  /// @param posX pos x
-  /// @param posY pos y
-  /// @param t_size size
-  /// @param color color
-  /// @param character char
-  /// @param font ttf
-  void DrawChar(int posX, int posY, float t_size, u32 color, char character,
-                RenderD7::NFontApi font);
-  // parameter
-  int frame = 0;
-  RenderD7::Image renderframe;
-  bool isscreen = false;
-  C3D_RenderTarget *targetr;
-  BMP bitmap = BMP(
-      20, 20,
-      true); // Need to Set e Predefined Bitmap. If not the System will Crash.
-  BMP blank = BMP(
-      20, 20,
-      true); // Need to Set e Predefined Bitmap. If not the System will Crash.
-
-  ///////////////////////////////////////////////////////////////////////////////////////////////////
-  // Benchmark Stuff;
-  int testfpsd;
-  bool benchmark = false;
-  bool setupbenchmark;
-  float frametime = 0;
-  uint64_t lastTime = 0;
-  float dtt = 0.f;
-  float dtt2 = 0.f;
-  float dtt3 = 0.f;
-  float timer = 0;
-  float mhdtt = 0;
-  float mdtt2;
-  float mdtt3;
-
-  float fpsClock = 0.f;
-  int frameCounter = 0, fps = 0;
-
-  std::vector<float> hdttt;
-  std::vector<float> hdttt2;
-  std::vector<float> hdttt3;
-  std::vector<int> fpscountc;
-  int renderedframes = 0;
-  int testfps = 60;
-  Encoder encc = Encoder::BITMAP;
-  Decoder decc = Decoder::BITMAP2C3D;
-  ////////////////////////////////////////////////////////////////////////////////////////////////
-};
-} // namespace RenderD7

include/renderd7/Color.hpp

@@ -1,50 +1,204 @@
-#pragma once
-#include <cstring>
-#include <functional>
-#include <memory>
-#include <regex>
-#include <sstream>
-#include <string>
-#include <unistd.h>
-
-#define UNPACK_RGBA(col) (uint8_t)(col >> 24), (col >> 16), (col >> 8), (col)
-#define UNPACK_BGRA(col) (uint8_t)(col >> 8), (col >> 16), (col >> 24), (col)
-
-namespace RenderD7 {
-namespace Color {
-/// @brief RGBA Struct
-struct rgba {
-  /// @brief rgba Colors
-  uint8_t r, g, b, a;
-};
-/// @brief RGBA Class
-class RGBA {
-public:
-  /// @brief Construct
-  /// @param r
-  /// @param g
-  /// @param b
-  /// @param a
-  RGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
-      : m_r(r), m_g(g), m_b(b), m_a(a) {}
-  /// @brief Get as Uint32
-  /// @return color
-  uint32_t toRGBA() const {
-    return (m_r << 24) | (m_g << 16) | (m_b << 8) | m_a;
-  }
-
-  uint8_t m_r, m_g, m_b, m_a;
-};
-/// @brief Convert RGB to Hex
-/// @param r
-/// @param g
-/// @param b
-/// @return Hex-String
-std::string RGB2Hex(int r, int g, int b);
-/// @brief Hex to U32
-/// @param color
-/// @param a
-/// @return Color32
-uint32_t Hex(const std::string &color, uint8_t a = 255);
-} // namespace Color
-} // namespace RenderD7
+#pragma once
+#include <unistd.h>
+
+#include <cstring>
+#include <memory>
+#include <renderd7/smart_ctor.hpp>
+#include <string>
+#include <vector>
+
+#define UNPACK_RGBA(col) \
+  (unsigned char)(col >> 24), (col >> 16), (col >> 8), (col)
+#define UNPACK_BGRA(col) \
+  (unsigned char)(col >> 8), (col >> 16), (col >> 24), (col)
+
+inline unsigned int RGBA8(unsigned char r, unsigned char g, unsigned char b,
+                          unsigned char a = 255) {
+  return (r | g << 8 | b << 16 | a << 24);
+}
+
+typedef int RD7Color;
+
+// MultiColor (Less FunctionNameLen)
+
+struct Color2 {
+  unsigned int color0;
+  unsigned int color1;
+};
+
+struct Color3 {
+  unsigned int color0;
+  unsigned int color1;
+  unsigned int color2;
+};
+
+struct Color4 {
+  unsigned int color0;
+  unsigned int color1;
+  unsigned int color2;
+  unsigned int color3;
+};
+
+enum RD7Color_ {
+  RD7Color_Text,  ///< This Color Should always be used for Light Backgrounds
+  RD7Color_TextDisabled,  /// Text Disabled Color
+  RD7Color_Text2,         ///< And This want for Texts on Dark Backgrounds
+  RD7Color_Background,    ///< Your Bg Color
+  RD7Color_Header,    ///< Header Color (if the header is dark text2 is used)
+  RD7Color_Selector,  ///< Selector Color
+  RD7Color_SelectorFade,       ///< Selector FadingTo Color
+  RD7Color_List0,              ///< List Color1
+  RD7Color_List1,              ///< List Color2
+  RD7Color_MessageBackground,  ///< Message Background
+  RD7Color_Button,             ///< Button Color
+  RD7Color_ButtonHovered,      ///< Button Color if Hovered
+  RD7Color_ButtonDisabled,     ///< Button Color if disabled
+  RD7Color_ButtonActive,       ///< Button Colkor if Clicked
+  RD7Color_Checkmark,          ///< Checkbox Checkmark Color
+  RD7Color_FrameBg,            ///< Frame Background Color
+  RD7Color_FrameBgHovered,     ///< Frame Background Color if hovered
+  RD7Color_Progressbar,        ///< Progressbar Color
+  /// NON COLOR ///
+  RD7Color_Len,  ///< Used to define the lengh of this list
+};
+
+namespace RenderD7 {
+class Theme {
+ public:
+  Theme() = default;
+  ~Theme() = default;
+
+  void Load(const std::string &path);
+  void Default();
+  void Save(const std::string &path);
+
+  unsigned int Get(RD7Color clr);
+  void Set(RD7Color clr, unsigned int v);
+  void Swap(RD7Color a, RD7Color b);
+  bool Undo();
+  void UndoAll();
+  void TextBy(RD7Color bg);
+  RD7Color AutoText(RD7Color bg);
+  void ClearHistory() { changes.clear(); }
+
+  std::vector<unsigned int> &GetTableRef() { return clr_tab; }
+  // For Smart Pointer
+  RD7_SMART_CTOR(Theme);
+
+  // Loader method
+  void CopyOther(Theme::Ref theme);
+
+ private:
+  struct change {
+    change(RD7Color a, unsigned int f, unsigned int t)
+        : clr(a), from(f), to(t) {}
+    change(RD7Color a, RD7Color b, unsigned int f, unsigned int t)
+        : clr(a), clr2(b), from(f), to(t) {}
+    RD7Color clr;
+    RD7Color clr2 = 0;  // Used if Swap
+    unsigned int from;
+    unsigned int to;
+  };
+  // Use a vector for faster access
+  std::vector<unsigned int> clr_tab;
+  std::vector<change> changes;
+};
+
+Theme::Ref ThemeActive();
+/// @brief Change Theme Adress
+/// @param theme your adress
+void ThemeSet(Theme::Ref theme);
+namespace Color {
+/// @brief RGBA Class
+class RGBA {
+ public:
+  /// @brief Construct
+  /// @param r
+  /// @param g
+  /// @param b
+  /// @param a
+  RGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255)
+      : m_r(r), m_g(g), m_b(b), m_a(a) {}
+  /// @brief Construct
+  /// @param r
+  /// @param g
+  /// @param b
+  /// @param a
+  RGBA(float r, float g, float b, float a = 1.f)
+      : m_r(r * 255.f), m_g(g * 255.f), m_b(b * 255.f), m_a(a * 255.f) {}
+  RGBA(unsigned int in) {
+#define ISIMPLEUNPAK(x, y) (((x) >> y) & 0xFF)
+    m_r = ISIMPLEUNPAK(in, 0);
+    m_g = ISIMPLEUNPAK(in, 8);
+    m_b = ISIMPLEUNPAK(in, 16);
+    m_a = ISIMPLEUNPAK(in, 24);
+  }
+  RGBA(RD7Color in) {
+    if (!RenderD7::ThemeActive()) return;
+    unsigned int col = RenderD7::ThemeActive()->Get(in);
+    m_r = ISIMPLEUNPAK(col, 0);
+    m_g = ISIMPLEUNPAK(col, 8);
+    m_b = ISIMPLEUNPAK(col, 16);
+    m_a = ISIMPLEUNPAK(col, 24);
+  }
+  RGBA &changeR(unsigned char r) {
+    m_r = r;
+    return *this;
+  }
+  RGBA &changeG(unsigned char g) {
+    m_g = g;
+    return *this;
+  }
+  RGBA &changeB(unsigned char b) {
+    m_b = b;
+    return *this;
+  }
+  RGBA &changeA(unsigned char a) {
+    m_a = a;
+    return *this;
+  }
+
+  RGBA &fade_to(const RGBA &color, float p) {
+    m_a =
+        m_a + static_cast<unsigned char>((color.m_a - m_a) * ((p + 1.0f) / 2));
+    m_b =
+        m_b + static_cast<unsigned char>((color.m_b - m_b) * ((p + 1.0f) / 2));
+    m_g =
+        m_g + static_cast<unsigned char>((color.m_g - m_g) * ((p + 1.0f) / 2));
+    m_r =
+        m_r + static_cast<unsigned char>((color.m_r - m_r) * ((p + 1.0f) / 2));
+    return *this;
+  }
+
+  /// @brief Get as Uint32
+  /// @return color
+  unsigned int toRGBA() const { return RGBA8(m_r, m_g, m_b, m_a); }
+
+  // Just calculate the "lightness" f.e. to use Text or Text2
+  float luminance() const {
+    // For Reference https://en.wikipedia.org/wiki/HSL_and_HSV#Lightness
+    return (0.3 * (m_r / 255.f) + 0.59 * (m_g / 255.f) + 0.11 * (m_b / 255.f));
+  }
+
+  bool is_light() {
+    // Gives us the light or dark to not
+    // always use the below "if" statement
+    return (luminance() >= 0.5);
+  }
+
+  unsigned char m_r = 0, m_g = 0, m_b = 0, m_a = 0;
+};
+std::string RGBA2Hex(unsigned int c32);
+/// @brief Convert RGB to Hex
+/// @param r
+/// @param g
+/// @param b
+/// @return Hex-String
+std::string RGB2Hex(int r, int g, int b);
+/// @brief Hex to U32
+/// @param color
+/// @param a
+/// @return Color32
+unsigned int Hex(const std::string &color, unsigned char a = 255);
+}  // namespace Color
+}  // namespace RenderD7

include/renderd7/Draw.hpp

@@ -1,111 +0,0 @@
-#pragma once
-#include <3ds.h>
-#include <citro2d.h>
-#include <citro3d.h>
-#include <string>
-
-namespace RenderD7 {
-namespace Draw {
-/// @brief Draw Rectangle
-/// @param x Pos X
-/// @param y Pos Y
-/// @param w Width
-/// @param h Height
-/// @param color Color
-/// @return success ?
-bool Rect(float x, float y, float w, float h, u32 color);
-/// @brief Draw a not filled Rectangle
-/// @param p1x Pos X
-/// @param p1y Pos Y
-/// @param w Width
-/// @param h Height
-/// @param color Color
-/// @param scale Scale
-/// @return success ?
-bool NFRect(float p1x, float p1y, float w, float h, u32 color, float scale = 1);
-/// @brief Draw A Pixel
-/// @param x Pos X
-/// @param y Pos Y
-/// @param color Color
-/// @return success ?
-bool Px(float x, float y, u32 color);
-/// @brief Draw a Centered Text
-/// @param x Pos X
-/// @param y Pos Y
-/// @param size Scale of the Text
-/// @param color Color of The Text
-/// @param Text Striing to Display
-/// @param maxWidth Width to Calculate Centered Pos
-/// @param maxHeight Height to Calculate Centered Pos
-/// @param fnt Custom Font
-void TextCentered(float x, float y, float size, u32 color, std::string Text,
-                  int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-/// @brief Draw a Text
-/// @param x Pos X
-/// @param y Pos Y
-/// @param size Scale of the Text
-/// @param color Color of The Text
-/// @param Text Striing to Display
-/// @param maxWidth Width to Calculate Centered Pos
-/// @param maxHeight Height to Calculate Centered Pos
-/// @param fnt Custom Font
-void Text(float x, float y, float size, u32 color, std::string Text,
-          int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-/// @brief Draw a Text Set to the Right
-/// @param x Pos X
-/// @param y Pos Y
-/// @param size Scale of the Text
-/// @param color Color of The Text
-/// @param Text Striing to Display
-/// @param maxWidth Width to Calculate Centered Pos
-/// @param maxHeight Height to Calculate Centered Pos
-/// @param fnt Custom Font
-void TextRight(float x, float y, float size, u32 color, std::string Text,
-               int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-/// @brief Get Width of Text
-/// @param size Size of the Text
-/// @param Text String of The text
-/// @param fnt Custom Font
-/// @return The Size
-float GetTextWidth(float size, std::string Text, C2D_Font fnt = nullptr);
-/// @brief Get Text Size
-/// @param size Size of The Text
-/// @param width Width of the Text
-/// @param height Height of The Text
-/// @param Text String of Text
-/// @param fnt Custom Font
-void GetTextSize(float size, float *width, float *height, std::string Text,
-                 C2D_Font fnt = nullptr);
-/// @brief Get Height of the Text
-/// @param size Size of the Text
-/// @param Text String of the Text
-/// @param fnt Custom Font
-/// @return The Height
-float GetTextHeight(float size, std::string Text, C2D_Font fnt = nullptr);
-/// @brief Load A .bcfnt
-/// @param fnt Output Font
-/// @param Path path of The File
-/// @return Result Code
-Result LoadFont(C2D_Font &fnt, const char *Path = "");
-/// @brief Unload a Font
-/// @param fnt Font to Unload
-/// @return Result Code
-Result UnloadFont(C2D_Font &fnt);
-/// @brief Draw a Circle
-/// @param x Pos X
-/// @param y Pos Y
-/// @param radius Radius of the Circle
-/// @param color Color of the circle
-/// @return success ?
-bool Circle(float x, float y, float radius, u32 color);
-/// @brief Draw A Citro2D Image
-/// @param img Image to Draw
-/// @param x Pos X
-/// @param y Pos Y
-/// @param scaleX Scale of X-Axis
-/// @param scaleY Scale of Y-Axis
-/// @return success ?
-bool Image(C2D_Image img, float x, float y, float scaleX = 1.0f,
-           float scaleY = 1.0f);
-} // namespace Draw
-} // namespace RenderD7

include/renderd7/Error.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <string>
+
+namespace RenderD7 {
+void Error(const std::string& msg);
+inline void InlineError(const std::string& msg) {
+  std::string location = __FILE__ + std::string(":") + std::to_string(__LINE__);
+  Error("Error: \n" + location + "\n" + msg);
+}
+inline void InlineAssert(bool v, const std::string& msg) {
+  if (v == false) {
+    std::string location =
+        __FILE__ + std::string(":") + std::to_string(__LINE__);
+    Error("Assert Failed:\n" + location + "\n" + msg);
+  }
+}
+}  // namespace RenderD7

include/renderd7/FileSystem.hpp

@@ -1,23 +1,24 @@
-// FileSystem based on libphyfs based on
-// https://github.com/TurtleP/3ds-examples/blob/fs/physfs/fs/physfs/include/filesystem.h
-#pragma once
-#include <string>
-#include <vector>
-
-namespace RenderD7 {
-namespace FileSystem {
-/// @brief A Directory Entry
-struct Entry {
-  /// @brief Patf of The Entry
-  std::string path;
-  /// @brief Name of The Entry
-  std::string name;
-  /// @brief Directory or File
-  bool dir = false;
-};
-/// @brief Gets All Entrys of A Directory into a Vector
-/// @param path The Path of the Directory
-/// @return The Vector of found Entrys
-std::vector<RenderD7::FileSystem::Entry> GetDirContent(std::string path);
-} // namespace FileSystem
-} // namespace RenderD7
+#pragma once
+#include <string>
+#include <vector>
+
+namespace RenderD7 {
+namespace FileSystem {
+/// @brief A Directory Entry
+struct Entry {
+  /// @brief Patf of The Entry
+  std::string path;
+  /// @brief Name of The Entry
+  std::string name;
+  /// @brief Directory or File
+  bool dir = false;
+};
+/// @brief Gets All Entrys of A Directory into a Vector
+/// @param path The Path of the Directory
+/// @return The Vector of found Entrys
+std::vector<RenderD7::FileSystem::Entry> GetDirContent(std::string path);
+std::string GetParentPath(std::string path, std::string mount_point);
+std::vector<Entry> GetDirContentsExt(
+    std::string &path, const std::vector<std::string> &extensions);
+}  // namespace FileSystem
+}  // namespace RenderD7

include/renderd7/Font.hpp

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <citro2d.h>
+
+#include <fstream>
+#include <memory>
+#include <renderd7/Error.hpp>
+#include <renderd7/smart_ctor.hpp>
+
+namespace RenderD7 {
+class Font {
+ public:
+  Font() = default;
+  Font(const std::string& path) { Load(path); };
+  ~Font() { Unload(); }
+  RD7_SMART_CTOR(Font)
+
+  void Load(const std::string& path) {
+    std::ifstream ft(path, std::ios::in | std::ios::binary);
+    bool io = ft.is_open();
+    ft.close();
+    RenderD7::InlineAssert(io, "File not Found!");
+    fnt = C2D_FontLoad(path.c_str());
+    RenderD7::InlineAssert(fnt, "Font could not be loaded!");
+  }
+  C2D_Font Ptr() { return fnt; }
+  void Unload() {
+    if (!fnt) return;
+    C2D_FontFree(fnt);
+    fnt = nullptr;
+  }
+
+ private:
+  C2D_Font fnt = nullptr;
+};
+}  // namespace RenderD7

include/renderd7/Fonts/NFontApi.hpp

@@ -1,142 +0,0 @@
-#pragma once
-#include <bitset>
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <renderd7/external/stb_truetype.h>
-
-#define MAXUNICODE 0x10FFFF
-
-namespace RenderD7 {
-inline int utf8_decode(const char *o) {
-  static const unsigned int limits[] = {0xFF, 0x7F, 0x7FF, 0xFFFF};
-  const unsigned char *s = (const unsigned char *)o;
-  unsigned int c = s[0];
-  unsigned int res = 0; /* final result */
-  if (c < 0x80)         /* ascii? */
-    res = c;
-  else {
-    int count = 0;             /* to count number of continuation bytes */
-    while (c & 0x40) {         /* still have continuation bytes? */
-      int cc = s[++count];     /* read next byte */
-      if ((cc & 0xC0) != 0x80) /* not a continuation byte? */
-        return -1;             /* invalid byte sequence */
-      res = (res << 6) | (cc & 0x3F); /* add lower 6 bits from cont. byte */
-      c <<= 1;                        /* to test next bit */
-    }
-    res |= ((c & 0x7F) << (count * 5)); /* add first byte */
-    if (count > 3 || res > MAXUNICODE || res <= limits[count])
-      return -1; /* invalid byte sequence */
-    s += count;  /* skip continuation bytes read */
-  }
-  return res;
-}
-
-inline std::string IntToUtf8(int convertval) {
-
-  // We only care about plane 1 right now,
-  // but know that we have other options (0x10FFFF)
-  // Technically UTF-8 is "limited" to 4 bytes, so it's not
-  // Like it matters much anyways these days
-
-  if (convertval == 0)
-    return " ";
-  if ((convertval <= 0x7F) && (convertval > 0x00)) {
-
-    std::string out(".");
-
-    std::bitset<8> x(convertval);
-
-    unsigned long l = x.to_ulong();
-    unsigned char c = static_cast<unsigned char>(l);
-    out[0] = c;
-
-    return out;
-
-  } else if ((convertval >= 0x80) && (convertval <= 0x07FF)) {
-
-    std::string out("..");
-
-    int firstShift = (convertval >> 0x06) ^ 0xC0;
-    int secondShift = ((convertval ^ 0xFFC0) | 0x80) & ~0x40;
-
-    std::bitset<8> first(firstShift);
-    std::bitset<8> last(secondShift);
-
-    unsigned long l = first.to_ulong();
-    unsigned char c = static_cast<unsigned char>(l);
-    out[0] = c;
-
-    unsigned long ltwo = last.to_ulong();
-    unsigned char ctwo = static_cast<unsigned char>(ltwo);
-    out[1] = ctwo;
-
-    return out;
-
-  } else if ((convertval >= 0x0800) && (convertval <= 0xFFFF)) {
-
-    std::string out("...");
-
-    int firstShift = ((convertval ^ 0xFC0FFF) >> 0x0C) | 0xE0;
-    int secondShift = (((convertval ^ 0xFFF03F) >> 0x06) | 0x80) & ~0x40;
-    int thirdShift = ((convertval ^ 0xFFFC0) | 0x80) & ~0x40;
-
-    std::bitset<8> first(firstShift);
-    std::bitset<8> second(secondShift);
-    std::bitset<8> third(thirdShift);
-
-    unsigned long lone = first.to_ulong();
-    unsigned char cone = static_cast<unsigned char>(lone);
-    out[0] = cone;
-
-    unsigned long ltwo = second.to_ulong();
-    unsigned char ctwo = static_cast<unsigned char>(ltwo);
-    out[1] = ctwo;
-
-    unsigned long lthree = third.to_ulong();
-    unsigned char cthree = static_cast<unsigned char>(lthree);
-    out[2] = cthree;
-
-    return out;
-
-  } else {
-    return " ";
-  }
-}
-#define I2U82I(val) RenderD7::utf8_decode(RenderD7::IntToUtf8(val).c_str())
-
-class NFontApi {
-public:
-  NFontApi();
-  ~NFontApi();
-  void LoadTTF(std::string path);
-  unsigned char *GetGlyphBitmap(char glyph);
-  std::string GetStatus() { return status; }
-  float GetScale() { return scale; }
-  int GetGlyphWidth(char glyph);
-  int GetGlyphHeight(char glyph);
-  int GetLineHeight() { return l_h; }
-  int GetBaseHeight() { return height; }
-
-private:
-  std::string status;
-
-  int height;
-
-  float scale;
-  int b_w;
-  int b_h;
-  int l_h;
-
-  int w;
-  int h;
-
-  int x0, y0, x1, y1;
-  int ascent, baseline, decent, linegap;
-
-  int linespace;
-
-  stbtt_fontinfo font;
-};
-} // namespace RenderD7

include/renderd7/FunctionTrace.hpp

@@ -0,0 +1,76 @@
+#pragma once
+// Base includes
+#include <functional>
+#include <map>
+#include <string>
+
+// 3ds does not support std::chrono
+#include <3ds.h>
+
+/// @brief 3ds System Ticks per milli second
+#define TICKS_PER_MSEC 268111.856
+
+#define f2s(x_) #x_
+#define scomb(x1, x2) std::string(x1 + x2)
+
+namespace RenderD7 {
+namespace Ftrace {
+/// @brief Result of FTrace
+struct FTRes {
+  std::string group;      ///< Group of the Trace
+  std::string func_name;  ///< Function Name
+
+  uint64_t time_start;  ///< when started
+  uint64_t time_end;    ///< when stopped
+  float time_of;        ///< stop - start (how long)
+  float time_ofm;       ///< max time off
+  bool is_ovl;          ///< is displayed in overlay?
+};
+
+/// @brief Map of Traces
+extern std::map<std::string, RenderD7::Ftrace::FTRes> rd7_traces;
+
+/// @brief Set a Start TracePoint
+/// @param group Set a Group Name
+/// @param func_name Set a Function Name
+inline void Beg(const std::string& group, const std::string& func_name) {
+  std::string trace_id = scomb(group, func_name);
+  auto& trace = rd7_traces[trace_id];
+  trace.group = group;
+  trace.func_name = func_name;
+  trace.time_start = svcGetSystemTick();
+}
+/// @brief Set an End TracePoint
+/// @param group Set a Group Name
+/// @param func_name Set a Function Name
+inline void End(const std::string& group, const std::string& func_name) {
+  std::string trace_id = scomb(group, func_name);
+  auto& trace = rd7_traces[trace_id];
+  trace.time_end = svcGetSystemTick();
+  if (trace.time_of > trace.time_ofm) trace.time_ofm = trace.time_of;
+  trace.time_of =
+      static_cast<float>(trace.time_end - trace.time_start) / TICKS_PER_MSEC;
+}
+/// @brief Trace a function execution
+/// @param group Set a Group Name
+/// @param name Set a Function Name
+inline void Func(const std::string& group, const std::string& name,
+                 std::function<void()> fun) {
+  if (!fun) return;
+  Beg(group, name);
+  fun();
+  End(group, name);
+}
+
+/// @brief This Starts an Ftrace and
+/// end ist when going out of scope
+struct ScopedTrace {
+  ScopedTrace(std::string g, std::string n) : group(g), name(n) {
+    Ftrace::Beg(g, n);
+  }
+  ~ScopedTrace() { Ftrace::End(group, name); }
+  std::string group;
+  std::string name;
+};
+}  // namespace Ftrace
+}  // namespace RenderD7

include/renderd7/Hardware.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+namespace RenderD7 {
+namespace Hardware {
+/// @brief Initialisize required Services
+void Initialisize();
+/// @brief Check if Headphones are Plugged in
+/// @return true if headphones plugged in
+bool IsHeadphones();
+/// @brief Check if the 3ds Is Charging
+/// @return true if System gets Charged
+bool IsCharging();
+/// @brief Check the Battery Percentage
+/// @return Persentage as int
+int GetBatteryPercentage();
+/// @brief Get current State of 3d Slider
+/// @return current 3dslider poition
+float Get3dSliderLevel();
+/// @brief Get Current state of Sound Slider
+/// @return current SoundSlider state
+float GetSoundSliderLevel();
+/// @brief Get Current Wifi Level
+/// @return current wifi level
+int GetWifiLevel();
+}  // namespace Hardware
+}  // namespace RenderD7

include/renderd7/Hid.hpp

@@ -0,0 +1,42 @@
+// WARNING
+// THIS IS BETA STUFF
+// ITS MAKE LIKE EXTERNAL BUT
+// FOR RENDERD7 ITS INTEGRATED
+
+#pragma once
+
+#include <renderd7/R7Vec.hpp>
+#include <string>
+
+namespace RenderD7 {
+namespace Hid {
+enum Actions {
+  Down = 0,
+  Held = 1,
+  Up = 2,
+  DownRepeat = 3,
+};
+// Register Functions
+// Register Current state values
+void RegKeyDown(uint32_t &key_down);
+void RegKeyHeld(uint32_t &key_held);
+void RegKeyUp(uint32_t &key_up);
+void RegKeyRepeat(uint32_t &repeat);
+void RegTouchCoords(R7Vec2 &touch_pos);
+// Not Corectly Implemented Yet
+void RegAnalog1Movement(R7Vec2 &movement);
+void RegAnalog2Movement(R7Vec2 &movement);
+// Register Keys
+void RegKeyEvent(const std::string &event, uint32_t key);
+// KeyEvents
+bool IsEvent(const std::string &event, Actions action);
+R7Vec2 GetTouchPosition();
+R7Vec2 GetLastTouchPosition();
+R7Vec2 GetTouchDownPosition();
+void Update();
+// Lock/Unlock Input api for example for Keyboard
+void Lock();
+void Unlock();
+void Clear();
+}  // namespace Hid
+}  // namespace RenderD7

include/renderd7/Image.hpp

@@ -1,50 +1,33 @@
-#pragma once
-#include <citro2d.h>
-#include <citro3d.h>
-#include <memory>
-
-#include <renderd7/Sheet.hpp>
-#include <renderd7/bmp.hpp>
-#include <renderd7/bmpconverter.hpp>
-
-#include <cassert>
-#include <cstring>
-#include <renderd7/Color.hpp>
-#include <renderd7/external/lodepng.h>
-
-namespace RenderD7 {
-/// Image Class
-class Image {
-public:
-  /// @brief Constructor
-  Image() {}
-  /// @brief Deconstructor
-  ~Image();
-  /// @brief Unload The Image
-  void Unload();
-  /// Load Image from Png
-  /// \param path path to png file
-  void LoadPng(const std::string path);
-  /// Load the Image from buffer
-  /// \param buffer the frame buffer
-  void LoadPFromBuffer(const std::vector<u8> &buffer);
-  void LoadFromBitmap(BMP bitmap);
-  void LoadJpg(std::string path);
-  void LoadPixels(int w, int h, int bpp, void *buffer);
-  /// Draw the Image directly
-  /// \param x The x position
-  /// \param y the y position
-  /// \param scaleX x scale from 0.0 to 1.0
-  /// \param scaleY y scale from 0.0 to 1.0
-  bool Draw(float x, float y, float scaleX = 1.0f, float scaleY = 1.0f);
-  /// \brief Get The Image
-  /// \return C2D_Image
-  C2D_Image Get() { return this->img; }
-
-  void FromSheet(RenderD7::Sheet sheet, size_t index);
-  /// \param img this is the C2D_Image
-  C2D_Image img;
-  /// \param loadet whether the image is loadet or not
-  bool loadet = false;
-};
-} // namespace RenderD7
+#pragma once
+
+#include <3ds.h>
+#include <citro2d.h>
+
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/nimg.hpp>
+#include <renderd7/smart_ctor.hpp>
+#include <string>
+
+namespace RenderD7 {
+class Image {
+ public:
+  Image() = default;
+  Image(C2D_Image img) { this->img = img; }
+  Image(const std::string& path) { this->Load(path); }
+  ~Image() = default;
+  RD7_SMART_CTOR(Image)
+  void Load(const std::string& path);
+  void From_NIMG(const nimg& image);
+  void Delete();
+
+  C2D_Image Get();
+  C2D_Image& GetRef();
+  void Set(const C2D_Image& i);
+  R7Vec2 GetSize();
+  bool Loadet();
+
+ private:
+  bool ext = false;
+  C2D_Image img;
+};
+}  // namespace RenderD7

include/renderd7/Installer.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+namespace RenderD7 {
+struct InstallerInfo {
+  unsigned long long total;
+  unsigned long long current;
+  unsigned int mem_size = 0x80000;
+  bool active = false;
+};
+Result InstallCia(const std::string& path, bool self);
+void InstallSetBuffersSize(unsigned int bytes);
+InstallerInfo InstallGetInfo();
+}  // namespace RenderD7

include/renderd7/Logger.hpp

@@ -0,0 +1,35 @@
+#pragma once
+#include <fstream>
+#include <renderd7/smart_ctor.hpp>
+#include <string>
+#include <vector>
+
+namespace RenderD7 {
+
+/// @brief Logger base Class
+class LoggerBase {
+ public:
+  /// @brief Constructor
+  LoggerBase() = default;
+  /// @brief Deconstructor
+  ~LoggerBase();
+  RD7_SMART_CTOR(LoggerBase)
+  /// @brief Init the Logger
+  /// @param filename name[_date_time.txt]
+  void Init(const std::string& name, bool fileless = false);
+  /// @brief Write a String
+  /// @param debug_text string
+  /// @param lvl Logger LVL 0 = ERR, 1  =WARNING, >=2= Default
+  void Write(const std::string& debug_text, int lvl = 2);
+  void SetLvl(int lvl) { writelvl = lvl; }
+  const std::vector<std::string>& Lines();
+
+ private:
+  /// \param filename the name of the logfile
+  std::string filename;
+  std::string log_path;
+  std::ofstream _log;
+  int writelvl = 1;  // Only log errors/Warnings
+  std::vector<std::string> lines;
+};
+}  // namespace RenderD7

include/renderd7/Memory.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <cstddef>
+
+namespace RenderD7 {
+namespace Memory {
+/// @brief Metriks struct For the Internal Tracker
+struct memory_metrics {
+  uint32_t t_TotalAllocated = 0;  ///< Total Allocated Memory
+  uint32_t t_TotalFreed = 0;      ///< Total Deleted Memory
+  /// @brief Gets the Currently Allocated Memory
+  uint32_t t_CurrentlyAllocated() { return t_TotalAllocated - t_TotalFreed; }
+};
+/// @brief Get Total Allocated Memory
+/// @return Total Allocated Memory
+size_t GetTotalAllocated();
+/// @brief Get Total Deleted Memory
+/// @return Total Deleted Memory
+size_t GetTotalFreed();
+/// @brief Get Current Allocated Memory
+/// @return Current Allocated Memory
+size_t GetCurrent();
+}  // namespace Memory
+}  // namespace RenderD7

include/renderd7/Message.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <string>
+
+namespace RenderD7 {
+struct Message {
+  Message(std::string t, std::string m) {
+    title = t;
+    message = m;
+    animationframe = 0;
+  }
+
+  std::string title;
+  std::string message;
+  int animationframe;
+};
+
+void ProcessMessages();
+void PushMessage(const Message& msg);
+inline void PushMessage(const std::string& head, const std::string& msg) {
+  PushMessage(Message(head, msg));
+}
+// Config
+void SetMessageIdleStartFrame(int frame);
+void SetMessageTotalAnimationFrames(int total_frames);
+void SetMessageFadeOutStartFrame(int frame);
+}  // namespace RenderD7

include/renderd7/Net.hpp

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <renderd7/external/json.hpp>
+#include <string>
+
+namespace RenderD7 {
+namespace Net {
+// Define List of Errors
+enum Error_ {
+  Error_None,        // Function Executed Successfully
+  Error_Memory,      // Memory  Allocation Error
+  Error_Write,       // Unable to Write File
+  Error_StatusCode,  // Error with Status Code
+  Error_Git,         // Git Error
+  Error_CtrStatus,   // 3ds Result Code
+  Error_Curl,        // Curl Error
+  Error_Busy,        // Another Download Taskl is already running
+  Error_Invalid,     // Invalid Json struct
+  Error_NoWifi,      // Console not connected to wifi
+};
+// Set an typedefine for Error code
+using Error = unsigned long long;
+// Extract Error_ from Error code
+inline Error_ ErrorCode(Error err) {
+  return static_cast<Error_>(static_cast<unsigned int>(err & 0xffffffff));
+}
+// Extract Http Status code, Curl Error Code or Ctr Result Code
+inline int StatusCode(Error err) {
+  Error_ c = ErrorCode(err);
+  if (c != Error_StatusCode && c != Error_CtrStatus && c != Error_Curl)
+    return 0;
+  return static_cast<unsigned int>(err >> 32);
+}
+Error Download(const std::string& url, std::string& data);
+Error Download2File(const std::string& url, const std::string& path);
+Error GitDownloadRelease(const std::string& url, const std::string& asset_name,
+                         const std::string& path, bool prerelease = false);
+Error JsonApiRequest(const std::string& api_url, nlohmann::json& res);
+unsigned long long GetProgressCurrent();
+unsigned long long GetProgressTotal();
+}  // namespace Net
+}  // namespace RenderD7

include/renderd7/Overlays.hpp

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <renderd7/Ovl.hpp>
+#include <string>
+
+typedef int RD7Keyboard;
+
+enum RD7Keyboard_ {
+  RD7Keyboard_Default,
+  RD7Keyboard_Numpad,
+  RD7Keyboard_Password,
+};
+
+enum RD7KeyboardState {
+  RD7KeyboardState_None = 0,
+  RD7KeyboardState_Cancel = 1,
+  RD7KeyboardState_Confirm = 2,
+};
+
+namespace RenderD7 {
+class Ovl_Ftrace : public RenderD7::Ovl {
+ public:
+  /// @brief Constructor
+  Ovl_Ftrace(bool* is_enabled);
+  /// @brief Override for Draw
+  void Draw(void) const override;
+  /// @brief Override for Logic
+  void Logic() override;
+
+ private:
+  bool* i_is_enabled;
+};
+
+class Ovl_Metrik : public RenderD7::Ovl {
+ public:
+  /// @brief Constructor
+  Ovl_Metrik(bool* is_enabled, bool* screen, uint32_t* mt_color,
+             uint32_t* txt_color, float* txt_size);
+  /// @brief Override for Draw
+  void Draw(void) const override;
+  /// @brief Override for Logic
+  void Logic() override;
+
+ private:
+  // Mutable internal values
+  mutable std::string mt_fps;
+  mutable std::string mt_cpu;
+  mutable std::string mt_gpu;
+  mutable std::string mt_cmd;
+  mutable std::string mt_lfr;
+  mutable std::string mt_tbs;
+  mutable std::string mt_mem;
+
+  // Importand Adresses
+  bool* i_is_enabled;
+  bool* i_screen;
+  uint32_t* i_mt_color;
+  uint32_t* i_txt_color;
+  float* i_txt_size;
+};
+
+class Ovl_Keyboard : public RenderD7::Ovl {
+ public:
+  /// @brief Constructor
+  /// Keyboard Type not Supported for now
+  Ovl_Keyboard(std::string& ref, RD7KeyboardState& state,
+               const std::string& hint = "", RD7Keyboard type = 0);
+  /// @brief Deconstructor
+  ~Ovl_Keyboard();
+  /// @brief Override for Draw
+  void Draw(void) const override;
+  /// @brief Override for Logic
+  void Logic() override;
+
+ private:
+  mutable std::map<unsigned char, char> shared_data;
+  // Pointer to useres String
+  std::string* typed_text = nullptr;
+  std::string str_bak;
+  RD7KeyboardState* state;
+  RD7Keyboard type;
+  int mode = 0;
+  int ft3 = 0;
+};
+}  // namespace RenderD7

include/renderd7/Ovl.hpp

@@ -1,27 +1,28 @@
-#pragma once
-#include <memory>
-
-namespace RenderD7 {
-/// @brief The Overlay Class (Used for Toasts for example)
-class Ovl {
-public:
-  /// @brief Deconstructor
-  virtual ~Ovl() {}
-  /// @brief Function Called to Draw this
-  virtual void Draw() const = 0;
-  /// @brief Logic of the Overlay
-  virtual void Logic() = 0;
-  /// @brief Should the overlay be killed
-  /// @return Killed or Not
-  inline bool IsKilled() { return this->iskilled; }
-  /// @brief Kill The Overlay
-  inline void Kill() { iskilled = true; }
-
-private:
-  /// @param iskilled For IsKilled();
-  bool iskilled = false;
-};
-/// @brief Add an Overlay to the stack
-/// @param scene Overlay to push to Stack
-void AddOvl(std::unique_ptr<RenderD7::Ovl> scene);
-} // namespace RenderD7
+#pragma once
+#include <map>
+#include <memory>
+
+namespace RenderD7 {
+/// @brief The Overlay Class (Used for Toasts for example)
+class Ovl {
+ public:
+  /// @brief Deconstructor
+  virtual ~Ovl() {}
+  /// @brief Function Called to Draw this
+  virtual void Draw() const = 0;
+  /// @brief Logic of the Overlay
+  virtual void Logic() = 0;
+  /// @brief Should the overlay be killed
+  /// @return Killed or Not
+  inline bool IsKilled() { return this->iskilled; }
+  /// @brief Kill The Overlay
+  inline void Kill() { iskilled = true; }
+
+ private:
+  /// @param iskilled For IsKilled();
+  bool iskilled = false;
+};
+/// @brief Add an Overlay to the Screen
+/// @param scene Overlay to push to Screen
+void AddOvl(std::unique_ptr<RenderD7::Ovl> scene);
+}  // namespace RenderD7

include/renderd7/R7Vec.hpp

@@ -0,0 +1,104 @@
+#pragma once
+
+struct R7Vec2 {
+  // Init Funcs
+  R7Vec2() : x(0), y(0) {}
+  R7Vec2(float i0, float i1) : x(i0), y(i1) {}
+  R7Vec2(const R7Vec2 &i) {
+    x = i.x;
+    y = i.y;
+  }
+
+  // Operators
+  // Add
+  R7Vec2 &operator+=(const R7Vec2 &i) {
+    x += i.x;
+    y += i.y;
+    return *this;
+  }
+
+  R7Vec2 operator+(const R7Vec2 &i) const { return R7Vec2(x + i.x, y + i.y); }
+
+  // Sub
+  R7Vec2 &operator-=(const R7Vec2 &i) {
+    x -= i.x;
+    y -= i.y;
+    return *this;
+  }
+
+  R7Vec2 operator-(const R7Vec2 &i) const { return R7Vec2(x - i.x, y - i.y); }
+
+  // Compare
+  bool operator==(const R7Vec2 &in) const { return x == in.x && y == in.y; }
+
+  bool operator!=(const R7Vec2 &in) const {
+    // use the first comparefuncs result
+    // and swap it lol
+    return !(*this == in);
+  }
+  // Internal Values
+  float x;
+  float y;
+};
+
+struct R7Vec4 {
+  // Init Funcs
+  R7Vec4() : x(0), y(0), z(0), w(0) {}
+  R7Vec4(float i0, float i1, float i2, float i3) : x(i0), y(i1), z(i2), w(i3) {}
+  R7Vec4(const R7Vec4 &i) {
+    x = i.x;
+    y = i.y;
+    z = i.z;
+    w = i.w;
+  }
+
+  R7Vec4(const R7Vec2 &i0, const R7Vec2 &i1) {
+    x = i0.x;
+    y = i0.y;
+    z = i1.x;
+    w = i1.y;
+  }
+
+  // Operators
+  // Add
+  R7Vec4 &operator+=(const R7Vec4 &i) {
+    x += i.x;
+    y += i.y;
+    z += i.z;
+    w += i.w;
+    return *this;
+  }
+
+  R7Vec4 operator+(const R7Vec4 &i) const {
+    return R7Vec4(x + i.x, y + i.y, z + i.z, w + i.w);
+  }
+
+  // Sub
+  R7Vec4 &operator-=(const R7Vec4 &i) {
+    x -= i.x;
+    y -= i.y;
+    z -= i.z;
+    w -= i.w;
+    return *this;
+  }
+
+  R7Vec4 operator-(const R7Vec4 &i) const {
+    return R7Vec4(x - i.x, y - i.y, z - i.z, w - i.w);
+  }
+
+  // Compare
+  bool operator==(const R7Vec4 &in) const {
+    return x == in.x && y == in.y && z == in.z && w == in.w;
+  }
+
+  bool operator!=(const R7Vec4 &in) const {
+    // use the first comparefuncs result
+    // and swap it lol
+    return !(*this == in);
+  }
+  // Internal Values
+  float x;
+  float y;
+  float z;
+  float w;
+};

include/renderd7/Render2.hpp

@@ -0,0 +1,97 @@
+#pragma once
+
+#include <map>
+#include <renderd7/Color.hpp>
+#include <renderd7/Font.hpp>
+#include <renderd7/Image.hpp>
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/Sprite.hpp>
+#include <renderd7/smart_ctor.hpp>
+
+#define MAKEFLAG(x) (1 << x)
+
+typedef unsigned int RD7TextFlags;
+
+enum RD7TextFlags_ {
+  RD7TextFlags_None = 0,  //< Align is Left and Other things are disabled
+  RD7TextFlags_AlignRight = MAKEFLAG(0),
+  RD7TextFlags_AlignMid = MAKEFLAG(1),
+  RD7TextFlags_Shaddow = MAKEFLAG(2),  // TextBuf Killer lol (doubled Text)
+  RD7TextFlags_Wrap = MAKEFLAG(3),
+  RD7TextFlags_Short = MAKEFLAG(4),
+  RD7TextFlags_Scroll = MAKEFLAG(5),
+};
+
+enum R2Screen {
+  R2Screen_Bottom,
+  R2Screen_Top,
+  // TopRight,
+};
+
+namespace RenderD7 {
+class R2 {
+ public:
+  struct R2Cmd {
+    R7Vec2 pos;        //< Position
+    R7Vec2 pszs;       //< Position or (TextBox) Size
+    R7Vec2 ap;         //< Additional Pos
+    unsigned int clr;  //< Color
+    bool Screen;       //< TopScreen
+    Image::Ref img;    //< Image Reference
+    Sprite::Ref spr;   //< Sprite Reference
+    // 0 = skip, 1 = rect, 2 = tri, 3 = text,
+    // 4 = image, 5 = sprite, 6 = Line
+    int type;            //< Command Type
+    bool lined = false;  //< Draw Lined Rect/Tri
+    // Text Specific
+    RD7TextFlags flags;  // Text Flags
+    std::string text;    // Text
+    RD7_SMART_CTOR(R2Cmd)
+  };
+  R2() = default;
+  ~R2() = default;
+
+  static void Init();
+
+  // Settings
+  static void SetFont(Font::Ref fnt);
+  static Font::Ref GetFont();
+  static void DefaultFont();
+  static void DrawNextLined();
+  static void OnScreen(R2Screen screen);
+  static R2Screen GetCurrentScreen();
+  static void SetTextSize(float szs);
+  static void DefaultTextSize();
+  static float GetTextSize();
+  static R7Vec2 GetCurrentScreenSize();
+  // Processing
+  static void Process();
+  static R7Vec2 GetTextDimensions(const std::string& text);
+  static std::string WrapText(const std ::string& in, int maxlen);
+  static std::string ShortText(const std::string& in, int maxlen);
+  // Draw Functions
+  static void AddRect(R7Vec2 pos, R7Vec2 size, RD7Color clr);
+  static void AddRect(R7Vec2 pos, R7Vec2 size, unsigned int clr);
+  static void AddTriangle(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, RD7Color clr);
+  static void AddTriangle(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2,
+                          unsigned int clr);
+  static void AddText(R7Vec2 pos, const std::string& text, RD7Color clr,
+                      RD7TextFlags flags = 0, R7Vec2 tmb = R7Vec2());
+  static void AddText(R7Vec2 pos, const std::string& text, unsigned int clr,
+                      RD7TextFlags flags = 0, R7Vec2 tmb = R7Vec2());
+  static void AddImage(R7Vec2 pos, Image::Ref img);
+  static void AddSprite(Sprite::Ref spr);
+  static void AddLine(R7Vec2 pos_a, R7Vec2 pos_b, RD7Color clr, int t = 1);
+  static void AddLine(R7Vec2 pos_a, R7Vec2 pos_b, unsigned int clr, int t = 1);
+
+ private:
+  static const float default_text_size;
+  static float text_size;
+  static Font::Ref font;
+  static std::map<std::string, float> ts;
+  static std::map<std::string, int> mln;
+  static bool next_lined;
+  static std::vector<R2Cmd::Ref> commands;
+  static R2Screen current_screen;
+};
+}  // namespace RenderD7

include/renderd7/ResultDecoder.hpp

@@ -1,51 +1,54 @@
-#pragma once
-#include <3ds.h>
-#include <string>
-
-namespace RenderD7 {
-/// @brief Decoder for 3ds Result Codes
-class ResultDecoder {
-public:
-  /// @brief Constructor
-  ResultDecoder() {}
-  /// @brief Deconstructor
-  ~ResultDecoder() {}
-  /// @brief Load a Result into Decoder
-  /// @param rescode Result Code
-  void Load(Result rescode);
-  /// @brief Load A Hex Converted Code into Decoder
-  /// @param rescode Result-Hex Code
-  void Load(std::string rescode);
-  /// @brief Get Hex Code
-  /// @return Hex-Code
-  std::string GetCode();
-  /// @brief Get Level Name
-  /// @return Level Name
-  std::string GetLevel();
-  /// @brief Get Level Value
-  /// @return Level Value
-  int GetLevelInt();
-  /// @brief Get The Mosule Name
-  /// @return Module Name
-  std::string GetModule();
-  /// @brief Get The Module Value
-  /// @return Module Value
-  int GetModuleInt();
-  /// @brief Get The Description
-  /// @return Description
-  std::string GetDescription();
-  /// @brief Get The Description Valur
-  /// @return Description Value
-  int GetDescriptionInt();
-  /// @brief Get the Summary
-  /// @return Summary
-  std::string GetSummary();
-  /// @brief Get the Summary Value
-  /// @return Summary Value
-  int GetSummaryInt();
-
-private:
-  /// @param m_rescode Result code
-  Result m_rescode;
-};
-} // namespace RenderD7
+#pragma once
+#include <3ds.h>
+
+#include <string>
+
+namespace RenderD7 {
+/// @brief Decoder for 3ds Result Codes
+class ResultDecoder {
+ public:
+  /// @brief Constructor
+  ResultDecoder() {}
+  /// @brief Deconstructor
+  ~ResultDecoder() {}
+  /// @brief Load a Result into Decoder
+  /// @param rescode Result Code
+  void Load(Result rescode);
+  /// @brief Load A Hex Converted Code into Decoder
+  /// @param rescode Result-Hex Code
+  void Load(std::string rescode);
+  /// @brief Get Hex Code
+  /// @return Hex-Code
+  std::string GetCode();
+  /// @brief Get Level Name
+  /// @return Level Name
+  std::string GetLevel();
+  /// @brief Get Level Value
+  /// @return Level Value
+  int GetLevelInt();
+  /// @brief Get The Mosule Name
+  /// @return Module Name
+  std::string GetModule();
+  /// @brief Get The Module Value
+  /// @return Module Value
+  int GetModuleInt();
+  /// @brief Get The Description
+  /// @return Description
+  std::string GetDescription();
+  /// @brief Get The Description Valur
+  /// @return Description Value
+  int GetDescriptionInt();
+  /// @brief Get the Summary
+  /// @return Summary
+  std::string GetSummary();
+  /// @brief Get the Summary Value
+  /// @return Summary Value
+  int GetSummaryInt();
+  /// @brief Write a Result log file to sd
+  void WriteLog(void);
+
+ private:
+  /// @param m_rescode Result code
+  Result m_rescode;
+};
+}  // namespace RenderD7

include/renderd7/Screen.hpp

@@ -1,16 +0,0 @@
-#pragma once
-#include <citro2d.h>
-#include <citro3d.h>
-
-/// \param Top Tob-Screen Target
-extern C3D_RenderTarget *Top;
-/// \param TopRight Top-Right-Screen Target (Never atually used)
-extern C3D_RenderTarget *TopRight;
-/// \param Bottom Bottom-Screen Target
-extern C3D_RenderTarget *Bottom;
-
-namespace RenderD7 {
-/// @brief Begin Drawing On Specific Screen
-/// @param target The Screen Target (Top, Bottom or TopTight)
-void OnScreen(C3D_RenderTarget *target);
-} // namespace RenderD7

include/renderd7/Sheet.hpp

@@ -1,22 +1,35 @@
-#pragma once
-#include <citro2d.h>
-#include <citro3d.h>
-
-namespace RenderD7 {
-/// @brief SpriteSheet Class
-class Sheet {
-public:
-  /// @brief Constructor
-  Sheet();
-  /// @brief Deconstructor
-  ~Sheet();
-  /// @brief Load A Spritesheet File
-  /// @param path Path to the t3x
-  /// @return Result Code
-  Result Load(const char *path);
-  /// @brief Unload the Sheet
-  void Free();
-  /// \param spritesheet The Sheet
-  C2D_SpriteSheet spritesheet;
-};
-} // namespace RenderD7
+#pragma once
+#include <3ds.h>  // Result
+#include <citro2d.h>
+#include <citro3d.h>
+
+#include <renderd7/Image.hpp>
+#include <renderd7/smart_ctor.hpp>
+#include <string>
+
+namespace RenderD7 {
+/// @brief SpriteSheet Class
+class Sheet {
+ public:
+  /// @brief Constructor
+  Sheet() = default;
+  Sheet(const std::string& path) { this->Load(path); }
+  /// @brief Deconstructor
+  ~Sheet() {
+    if (spritesheet) Free();
+  }
+  RD7_SMART_CTOR(Sheet);
+  /// @brief Load A Spritesheet File
+  /// @param path Path to the t3x
+  /// @return Result Code
+  Result Load(const std::string& path);
+  /// @brief Unload the Sheet
+  void Free();
+  C2D_Image GetImage(int idx);
+  C2D_SpriteSheet Get() { return this->spritesheet; }
+
+ private:
+  /// \param spritesheet The Sheet
+  C2D_SpriteSheet spritesheet;
+};
+}  // namespace RenderD7

include/renderd7/Sound.hpp

@@ -1,30 +1,35 @@
-#pragma once
-
-#include <3ds.h>
-#include <string>
-
-/** Sound Class */
-class sound {
-public:
-  /// \brief Construct new Soundeffect
-  /// \param path Path to the .wav file
-  /// \param channel the channel 1-23
-  /// \param toloop true:loop the sound, false: don't loop
-  sound(const std::string &path, int channel = 1, bool toloop = false);
-  /// @brief Deconstructor
-  ~sound();
-  /// @brief Play the sound
-  void play();
-  /// @brief Stop the sound
-  void stop();
-
-private:
-  /// \param dataSize Size of the filedata
-  u32 dataSize;
-  /// \param waveBuf For ndsp
-  ndspWaveBuf waveBuf;
-  /// \param data Memmory data of the sound
-  uint8_t *data = NULL;
-  /// \param chnl Channel of the sound
-  int chnl;
-};
+#pragma once
+
+#include <3ds.h>
+
+#include <renderd7/smart_ctor.hpp>
+#include <string>
+
+namespace RenderD7 {
+/** Sound Class */
+class Sound {
+ public:
+  /// \brief Construct new Soundeffect
+  /// \param path Path to the .wav file
+  /// \param channel the channel 1-23
+  /// \param toloop true:loop the sound, false: don't loop
+  Sound(const std::string &path, int channel = 1, bool toloop = false);
+  /// @brief Deconstructor
+  ~Sound();
+  RD7_SMART_CTOR(Sound)
+  /// @brief Play the sound
+  void Play();
+  /// @brief Stop the sound
+  void Stop();
+
+ private:
+  /// \param dataSize Size of the filedata
+  u32 dataSize;
+  /// \param waveBuf For ndsp
+  ndspWaveBuf waveBuf;
+  /// \param data Memmory data of the sound
+  uint8_t *data = NULL;
+  /// \param chnl Channel of the sound
+  int chnl;
+};
+}  // namespace RenderD7

include/renderd7/Sprite.hpp

@@ -1,64 +1,71 @@
-#pragma once
-
-#include <citro2d.h>
-#include <citro3d.h>
-
-#include <renderd7/Image.hpp>
-#include <renderd7/Sheet.hpp>
-
-namespace RenderD7 {
-/// @brief Sprite Class
-class Sprite {
-public:
-  /// \brief Construct Sprite
-  Sprite();
-  /// \brief Deconstruct Sprite
-  ~Sprite();
-  /// \brief Load a Sprite From SpriteSheet
-  /// \param sheet the Sheet to load from.(RenderD7::Sheet)
-  /// \param index the number of the Sprite in the Sheet
-  void FromSheet(RenderD7::Sheet *sheet, size_t index);
-  /// \brief Load a Sprite From SpriteSheet
-  /// \param img the Image to load from.(RenderD7::Image)
-  void FromImage(RenderD7::Image *img);
-  /// @brief Draw the Sprite
-  /// @return success ?
-  bool Draw();
-  /// @brief Set the Center Position
-  /// @param x X Pos
-  /// @param y Y Pos
-  void SetCenter(float x, float y);
-  /// @brief Set the Sprite's Position
-  /// @param x X Pos
-  /// @param y Y Pos
-  void SetPos(float x, float y);
-  /// @brief Set The Sprite's Scale
-  /// @param x Scale on X-Axis
-  /// @param y Scale on Y-Axis
-  void SetScale(float x, float y);
-  /// @brief Set the Sprite's Rotation
-  /// @param rotation ratation
-  void SetRotation(float rotation);
-  /// @brief Rotate the Sprite
-  /// @param speed Speed to Rotate
-  void Rotate(float speed);
-  /// @brief Get Tje Sprite's Width
-  /// @return Width
-  float getWidth();
-  /// @brief Get the Sprite's Height
-  /// @return Height
-  float getHeight();
-  /// @brief Get The Sprite's X Position
-  /// @return X Position
-  float getPosX();
-  /// @brief Get the Sprite's Y Position
-  /// @return Y Position
-  float getPosY();
-
-private:
-  /// @param tint ImageTint (unused)
-  C2D_ImageTint tint;
-  /// @param sprite The Sprite
-  C2D_Sprite sprite;
-};
-} // namespace RenderD7
+#pragma once
+
+#include <citro2d.h>
+#include <citro3d.h>
+
+#include <renderd7/Image.hpp>
+#include <renderd7/Sheet.hpp>
+#include <renderd7/smart_ctor.hpp>
+
+namespace RenderD7 {
+/// @brief Sprite Class
+class Sprite {
+ public:
+  /// \brief Construct Sprite
+  Sprite() = default;
+  /// \brief Deconstruct Sprite
+  ~Sprite() = default;
+  RD7_SMART_CTOR(Sprite)
+  /// \brief Load a Sprite From SpriteSheet
+  /// \param sheet the Sheet to load from.(RenderD7::Sheet)
+  /// \param index the number of the Sprite in the Sheet
+  void FromSheet(RenderD7::Sheet::Ref sheet, size_t index);
+  /// \brief Load a Sprite From SpriteSheet
+  /// \param img the Image to load from.(RenderD7::Image)
+  void FromImage(RenderD7::Image::Ref img);
+  /// @brief Draw the Sprite
+  /// @return success ?
+  bool Draw();
+  /// @brief Set the Center Position
+  /// @param x X Pos
+  /// @param y Y Pos
+  void SetCenter(float x, float y);
+  /// @brief Set the Sprite's Position
+  /// @param x X Pos
+  /// @param y Y Pos
+  void SetPos(float x, float y);
+  /// @brief Set The Sprite's Scale
+  /// @param x Scale on X-Axis
+  /// @param y Scale on Y-Axis
+  void SetScale(float x, float y);
+  /// @brief Set the Sprite's Rotation
+  /// @param rotation ratation
+  void SetRotation(float rotation);
+  /// @brief Rotate the Sprite
+  /// @param speed Speed to Rotate
+  void Rotate(float speed);
+  /// @brief Get Tje Sprite's Width
+  /// @return Width
+  float GetWidth();
+  /// @brief Get the Sprite's Height
+  /// @return Height
+  float GetHeight();
+  /// @brief Get The Sprite's X Position
+  /// @return X Position
+  float GetPosX();
+  /// @brief Get the Sprite's Y Position
+  /// @return Y Position
+  float GetPosY();
+  R7Vec2 GetSize();
+  R7Vec2 GetPos();
+  void SetPos(R7Vec2 pos);
+  void SetScale(R7Vec2 scale);
+  void SetRotCenter(R7Vec2 percentage);
+
+ private:
+  /// @param tint ImageTint (unused)
+  C2D_ImageTint tint;
+  /// @param sprite The Sprite
+  C2D_Sprite sprite;
+};
+}  // namespace RenderD7

include/renderd7/SpriteAnimation.hpp

@@ -1,41 +1,43 @@
-#pragma once
-
-#include <renderd7/Sheet.hpp>
-#include <renderd7/Sprite.hpp>
-
-#include <citro2d.h>
-#include <citro3d.h>
-
-namespace RenderD7 {
-/// @brief SpriteSheetAnimation Class
-class SpriteSheetAnimation : public RenderD7::Sprite {
-public:
-  /// @brief Constructor
-  SpriteSheetAnimation();
-  /// @brief Deconstructor
-  ~SpriteSheetAnimation();
-  /// @brief Setup an Animation
-  /// @param sheet Input Spritesheet
-  /// @param imagecount Count of Images
-  /// @param startimage Where to Start the Loop
-  /// @param frame_begin Current Time (Should be 0)
-  /// @param frame_finish Time Length
-  void Setup(RenderD7::Sheet *sheet, size_t imagecount, size_t startimage,
-             float frame_begin, float frame_finish);
-  /// @brief Play the Animation
-  /// @param timespeed Speed of the animation
-  void Play(float timespeed);
-
-private:
-  /// @param images Count of Images
-  size_t images;
-  /// @param imgs Another Count of images ???
-  size_t imgs = 0;
-  /// @param D_totaltime Current Time
-  float D_totaltime;
-  /// @param sheet The Sheet of Images
-  RenderD7::Sheet *sheet;
-  /// @param time Total Time from frame_finish
-  float time;
-};
-} // namespace RenderD7
+#pragma once
+
+#include <citro2d.h>
+#include <citro3d.h>
+
+#include <renderd7/Sheet.hpp>
+#include <renderd7/Sprite.hpp>
+#include <renderd7/smart_ctor.hpp>
+
+namespace RenderD7 {
+/// @brief SpriteSheetAnimation Class
+class SpriteSheetAnimation : public RenderD7::Sprite {
+ public:
+  /// @brief Constructor
+  SpriteSheetAnimation() = default;
+  /// @brief Deconstructor
+  ~SpriteSheetAnimation() = default;
+  RD7_SMART_CTOR(SpriteSheetAnimation);
+  /// @brief Setup an Animation
+  /// @param sheet Input Spritesheet
+  /// @param imagecount Count of Images
+  /// @param startimage Where to Start the Loop
+  /// @param frame_begin Current Time (Should be 0)
+  /// @param frame_finish Time Length
+  void Setup(RenderD7::Sheet::Ref sheet, size_t imagecount, size_t startimage,
+             float frame_begin, float frame_finish);
+  /// @brief Play the Animation
+  /// @param timespeed Speed of the animation
+  void Play(float timespeed);
+
+ private:
+  /// @param images Count of Images
+  size_t images;
+  /// @param imgs Another Count of images ???
+  size_t imgs = 0;
+  /// @param D_totaltime Current Time
+  float D_totaltime;
+  /// @param sheet The Sheet of Images
+  RenderD7::Sheet::Ref sheet;
+  /// @param time Total Time from frame_finish
+  float time;
+};
+}  // namespace RenderD7

include/renderd7/StealConsole.hpp

@@ -1,21 +0,0 @@
-#pragma once
-#include <sstream>
-#include <string>
-
-namespace RenderD7 {
-/// @brief StealConsole Class
-class StealConsole {
-public:
-  /// @brief Constructor
-  StealConsole();
-  /// @brief Deconstructor
-  ~StealConsole();
-  /// @brief The Stolen Stdout
-  /// @return Stdout as string
-  std::string GetStdout();
-
-private:
-  /// @param stolen_stdout Stolen Stdout
-  std::stringstream stolen_stdout;
-};
-} // namespace RenderD7

include/renderd7/Tasks.hpp

@@ -1,13 +1,13 @@
-#pragma once
-#include <3ds.h>
-#include <vector>
-
-namespace RenderD7 {
-namespace Tasks {
-/// @brief Push A Task
-/// @param entrypoint Function of Your Task
-void create(ThreadFunc entrypoint);
-/// @brief Destroy all Tasks
-void destroy(void);
-} // namespace Tasks
-} // namespace RenderD7
+#pragma once
+#include <functional>
+
+namespace RenderD7 {
+namespace Tasks {
+/// @brief Push A Task
+/// @param fun Function of Your Task
+/// @return index
+int Create(std::function<void()> fun);
+/// @brief Destroy all Tasks
+void DestroyAll();
+}  // namespace Tasks
+}  // namespace RenderD7

include/renderd7/ThemeEditor.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <renderd7/renderd7.hpp>
+
+namespace RenderD7 {
+class ThemeEditor : public RenderD7::Scene {
+ public:
+  ThemeEditor();
+  ~ThemeEditor();
+
+  void Draw(void) const override;
+  void Logic() override;
+
+ private:
+  Theme::Ref edit_theme;
+  // Placeholder to save active one to
+  Theme::Ref temp_theme;
+
+  // temp vars for samples
+  mutable bool cm;
+  mutable std::string inpt;
+  mutable int menu = 0;
+
+  // Keyboard
+  mutable RD7KeyboardState kbd_state;
+  mutable std::string kbd_text;
+  mutable std::vector<std::string> theme_list;
+};
+}  // namespace RenderD7

include/renderd7/Time.hpp

@@ -1,13 +1,13 @@
-#pragma once
-#include <string>
-
-namespace RenderD7 {
-/// @brief Format a String
-/// @param fmt_str Format To
-/// @param ... Additional Args
-/// @return Formatted String
-std::string FormatString(std::string fmt_str, ...);
-/// @brief Get Current Time as String
-/// @return Time-String
-std::string GetTimeStr(void);
-} // namespace RenderD7
+#pragma once
+#include <string>
+
+namespace RenderD7 {
+/// @brief Format a String
+/// @param fmt_str Format To
+/// @param ... Additional Args
+/// @return Formatted String
+std::string FormatString(std::string fmt_str, ...);
+/// @brief Get Current Time as String
+/// @return Time-String
+std::string GetTimeStr(void);
+}  // namespace RenderD7

include/renderd7/Timer.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <3ds.h>
+
+#include <renderd7/smart_ctor.hpp>
+
+namespace RenderD7 {
+class Timer {
+ public:
+  Timer(bool autostart = true);
+  ~Timer() {}
+  RD7_SMART_CTOR(Timer)
+  void Reset();
+  void Tick();
+  void Pause();
+  void Resume();
+  float Get();
+  float GetLive();
+  bool Running();
+
+ private:
+  uint64_t last = 0;
+  uint64_t current = 0;
+  bool is_running = false;
+};
+}  // namespace RenderD7

include/renderd7/Toast.hpp

@@ -1,30 +0,0 @@
-#pragma once
-#include <renderd7/BitmapPrinter.hpp>
-#include <renderd7/Color.hpp>
-#include <renderd7/Image.hpp>
-#include <renderd7/Ovl.hpp>
-#include <renderd7/Screen.hpp>
-
-namespace RenderD7 {
-/// @brief Toast Class
-class Toast : public RenderD7::Ovl {
-public:
-  /// @brief Constructor
-  /// @param head Displayed String in Head
-  /// @param msg Displayed String in Message Box
-  Toast(std::string head, std::string msg);
-  /// @brief Override for Draw
-  void Draw(void) const override;
-  /// @brief Override for Logic
-  void Logic() override;
-
-private:
-  /// @param head The Header Text
-  /// @param nsg The Message-Box Text
-  std::string head, msg;
-  /// @param msgposy Position Y of The Toast
-  int msgposy = 240;
-  /// @param delay Delay of the Toast
-  int delay = 0;
-};
-} // namespace RenderD7

include/renderd7/UI7.hpp

@@ -0,0 +1,105 @@
+#pragma once
+
+#include <renderd7/Image.hpp>
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/Render2.hpp>
+#include <renderd7/smart_ctor.hpp>
+
+// UI7: The new RenderD7 UI Standart based on
+// Draw2 (based on Citro2D)
+
+#define UI7MAKEFLAG(x) (1 << x)
+
+typedef int UI7MenuFlags;
+
+enum UI7MenuFlags_ {
+  UI7MenuFlags_None = 0,
+  UI7MenuFlags_NoTitlebar = UI7MAKEFLAG(0),
+  UI7MenuFlags_TitleMid = UI7MAKEFLAG(1),
+  UI7MenuFlags_Scrolling = MAKEFLAG(2),
+};
+
+class DrawCmd;
+class UI7DrawList {
+ public:
+  UI7DrawList() = default;
+  ~UI7DrawList() = default;
+
+  void AddRectangle(R7Vec2 pos, R7Vec2 szs, RD7Color clr);
+  void AddRectangle(R7Vec2 pos, R7Vec2 szs, unsigned int clr);
+  void AddTriangle(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, RD7Color clr);
+  void AddTriangle(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, unsigned int clr);
+  void AddText(R7Vec2 pos, const std::string &text, RD7Color clr,
+               RD7TextFlags flags = 0, R7Vec2 box = R7Vec2());
+  void AddText(R7Vec2 pos, const std::string &text, unsigned int clr,
+               RD7TextFlags flags = 0, R7Vec2 box = R7Vec2());
+  void AddImage(R7Vec2 pos, RenderD7::Image::Ref img);
+  void AddCall(std::shared_ptr<DrawCmd> cmd);
+
+  void Process(bool auto_clear = true);
+  void Clear();
+
+  RD7_SMART_CTOR(UI7DrawList)
+
+ private:
+  void AddDebugCall(std::shared_ptr<DrawCmd> cmd);
+  std::vector<std::shared_ptr<DrawCmd>> list;
+};
+
+namespace UI7 {
+// Key functions
+void Init();
+void Deinit();
+void Update();
+float GetTime();
+float GetDeltaTime();
+bool &IsDebugging();
+// Internal Function
+// Should not be used
+void Debug();
+bool &DebugMenu();
+
+bool Button(const std::string &label, R7Vec2 size = R7Vec2(0, 0));
+void Checkbox(const std::string &label, bool &c);
+void Label(const std::string &label, RD7TextFlags flags = 0);
+void Progressbar(float value);
+/// @brief Draw Image in Menu
+/// @param img Pointer f.e to RenderD7::Image2
+void Image(RenderD7::Image::Ref img);
+void BrowserList(const std::vector<std::string> &entrys, int &selection,
+                 RD7TextFlags txtflags = 0, R7Vec2 size = R7Vec2(0, 0),
+                 int max_entrys = 13);
+void InputText(const std::string &label, std::string &text,
+               const std::string &hint = "");
+bool BeginMenu(const std::string &title, R7Vec2 size = R7Vec2(0, 0),
+               UI7MenuFlags flags = 0);
+void EndMenu();
+void Grid(const std::string &name, const R7Vec2 &size, const R7Vec2 &entry_size,
+          void (*display_func)(void *, R7Vec2), void **data_array,
+          size_t num_entrys);
+void ColorSelector(const std::string &label, unsigned int &color);
+bool BeginTree(const std::string &text);
+void EndTree();
+R7Vec2 GetCursorPos();
+void SetCursorPos(R7Vec2 cp);
+void RestoreCursor();
+void SameLine();
+// Internal API (For Creating Custom Objects)
+bool InBox(R7Vec2 inpos, R7Vec2 boxpos, R7Vec2 boxsize);
+void MoveCursor(R7Vec2 size);
+bool HandleScrolling(R7Vec2 &pos, R7Vec2 size);
+bool InMenu();
+namespace Menu {
+// All of them return the Main BG DrawList if Menu is null
+UI7DrawList::Ref GetBackgroundList();
+UI7DrawList::Ref GetList();
+UI7DrawList::Ref GetForegroundList();
+// Other Menu Specific Functions
+float GetScrollingOffset();
+void SetScrollingOffset(float off);
+bool IsScrolling();
+}  // namespace Menu
+// DrawLists
+UI7DrawList::Ref GetForegroundList();
+UI7DrawList::Ref GetBackgroundList();
+}  // namespace UI7

include/renderd7/battery_icons.hpp

@@ -1,5 +0,0 @@
-#pragma once
-#include <cstddef>
-
-extern unsigned char battery_icons[];
-extern size_t battery_icons_size;

include/renderd7/bmp.hpp

@@ -1,707 +0,0 @@
-#pragma once
-#include <fstream>
-#include <iostream>
-#include <iterator>
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-
-using namespace std;
-#pragma pack(push, 1)
-
-struct BMPFileHeader {
-  uint16_t file_type{0x4D42}; // File type always BM which is 0x4D42 (stored as
-                              // hex uint16_t in little endian)
-  uint32_t file_size{0};      // Size of the file (in bytes)
-  uint16_t reserved1{0};      // Reserved, always 0
-  uint16_t reserved2{0};      // Reserved, always 0
-  uint32_t offset_data{
-      0}; // Start position of pixel data (bytes from the beginning of the file)
-};
-
-struct BMPInfoHeader {
-  uint32_t size{0}; // Size of this header (in bytes)
-  int32_t width{0}; // width of bitmap in pixels
-  int32_t height{
-      0}; // height of bitmap in pixels
-          //       (if positive, bottom-up, with origin in lower left corner)
-          //       (if negative, top-down, with origin in upper left corner)
-  uint16_t planes{1}; // No. of planes for the target device, this is always 1
-  uint16_t bit_count{0};   // No. of bits per pixel
-  uint32_t compression{0}; // 0 or 3 - uncompressed. THIS PROGRAM CONSIDERS ONLY
-                           // UNCOMPRESSED BMP images
-  uint32_t size_image{0};  // 0 - for uncompressed images
-  int32_t x_pixels_per_meter{0};
-  int32_t y_pixels_per_meter{0};
-  uint32_t colors_used{0}; // No. color indexes in the color table. Use 0 for
-                           // the max number of colors allowed by bit_count
-  uint32_t colors_important{0}; // No. of colors used for displaying the bitmap.
-                                // If 0 all colors are required
-};
-
-struct BMPColorHeader {
-  uint32_t red_mask{0x00ff0000};         // Bit mask for the red channel
-  uint32_t green_mask{0x0000ff00};       // Bit mask for the green channel
-  uint32_t blue_mask{0x000000ff};        // Bit mask for the blue channel
-  uint32_t alpha_mask{0xff000000};       // Bit mask for the alpha channel
-  uint32_t color_space_type{0x73524742}; // Default "sRGB" (0x73524742)
-  uint32_t unused[16]{0};                // Unused data for sRGB color space
-};
-#pragma pack(pop)
-
-class BMP {
-public:
-  BMPFileHeader file_header;
-  BMPInfoHeader bmp_info_header;
-  BMPColorHeader bmp_color_header;
-  std::vector<uint8_t> data;
-
-  BMP(const char *fname) { read(fname); }
-
-  int read(const char *fname) {
-    std::ifstream inp{fname, std::ios_base::binary};
-    if (inp) {
-      inp.read((char *)&file_header, sizeof(file_header));
-      if (file_header.file_type != 0x4D42) {
-
-        return 50;
-        // throw std::runtime_error("Error! Unrecognized file format.");
-      }
-      inp.read((char *)&bmp_info_header, sizeof(bmp_info_header));
-
-      // The BMPColorHeader is used only for transparent images
-      if (bmp_info_header.bit_count == 32) {
-        // Check if the file has bit mask color information
-        if (bmp_info_header.size >=
-            (sizeof(BMPInfoHeader) + sizeof(BMPColorHeader))) {
-          inp.read((char *)&bmp_color_header, sizeof(bmp_color_header));
-          // Check if the pixel data is stored as BGRA and if the color space
-          // type is sRGB
-          check_color_header(bmp_color_header);
-        } else {
-          // std::cerr << "Error! The file \"" << fname << "\" does not seem to
-          // contain bit mask information\n"; return 51;//throw
-          // std::runtime_error("Error! Unrecognized file format.");
-        }
-      }
-
-      // Jump to the pixel data location
-      inp.seekg(file_header.offset_data, inp.beg);
-
-      // Adjust the header fields for output.
-      // Some editors will put extra info in the image file, we only save the
-      // headers and the data.
-      if (bmp_info_header.bit_count == 32) {
-        bmp_info_header.size = sizeof(BMPInfoHeader) + sizeof(BMPColorHeader);
-        file_header.offset_data = sizeof(BMPFileHeader) +
-                                  sizeof(BMPInfoHeader) +
-                                  sizeof(BMPColorHeader);
-      } else {
-        bmp_info_header.size = sizeof(BMPInfoHeader);
-        file_header.offset_data = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader);
-      }
-      file_header.file_size = file_header.offset_data;
-
-      if (bmp_info_header.height < 0) {
-        return 52; // throw std::runtime_error("The program can treat only BMP
-                   // images with the origin in the bottom left corner!");
-      }
-
-      data.resize(bmp_info_header.width * bmp_info_header.height *
-                  bmp_info_header.bit_count / 8);
-
-      // Here we check if we need to take into account row padding
-      if (bmp_info_header.width % 4 == 0) {
-        inp.read((char *)data.data(), data.size());
-        file_header.file_size += static_cast<uint32_t>(data.size());
-      } else {
-        row_stride = bmp_info_header.width * bmp_info_header.bit_count / 8;
-        uint32_t new_stride = make_stride_aligned(4);
-        std::vector<uint8_t> padding_row(new_stride - row_stride);
-
-        for (int y = 0; y < bmp_info_header.height; ++y) {
-          inp.read((char *)(data.data() + row_stride * y), row_stride);
-          inp.read((char *)padding_row.data(), padding_row.size());
-        }
-        file_header.file_size +=
-            static_cast<uint32_t>(data.size()) +
-            bmp_info_header.height * static_cast<uint32_t>(padding_row.size());
-      }
-    } else {
-      return 53; // throw std::runtime_error("Unable to open the input image
-                 // file   "+std::string(fname));
-    }
-    return 0;
-  }
-
-  int read_mem(std::vector<unsigned char> buffer) {
-    std::stringstream inp;
-    std::copy(buffer.begin(), buffer.end(),
-              std::ostream_iterator<unsigned char>(inp, "\n"));
-    std::cout << buffer.size() << std::endl;
-    if (inp) {
-      inp.read((char *)&file_header, sizeof(file_header));
-      if (file_header.file_type != 0x4D42) {
-
-        return 50;
-        // throw std::runtime_error("Error! Unrecognized file format. Header " +
-        //                          std::to_string(file_header.file_type));
-      }
-      inp.read((char *)&bmp_info_header, sizeof(bmp_info_header));
-
-      // The BMPColorHeader is used only for transparent images
-      if (bmp_info_header.bit_count == 32) {
-        // Check if the file has bit mask color information
-        if (bmp_info_header.size >=
-            (sizeof(BMPInfoHeader) + sizeof(BMPColorHeader))) {
-          inp.read((char *)&bmp_color_header, sizeof(bmp_color_header));
-          // Check if the pixel data is stored as BGRA and if the color space
-          // type is sRGB
-          check_color_header(bmp_color_header);
-        } else {
-          // std::cerr << "Error! The file \"" << fname << "\" does not seem to
-          // contain bit mask information\n";
-          return 51;
-          // throw std::runtime_error("Error! Unrecognized file format. Size");
-        }
-      }
-
-      // Jump to the pixel data location
-      inp.seekg(file_header.offset_data, inp.beg);
-
-      // Adjust the header fields for output.
-      // Some editors will put extra info in the image file, we only save the
-      // headers and the data.
-      if (bmp_info_header.bit_count == 32) {
-        bmp_info_header.size = sizeof(BMPInfoHeader) + sizeof(BMPColorHeader);
-        file_header.offset_data = sizeof(BMPFileHeader) +
-                                  sizeof(BMPInfoHeader) +
-                                  sizeof(BMPColorHeader);
-      } else {
-        bmp_info_header.size = sizeof(BMPInfoHeader);
-        file_header.offset_data = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader);
-      }
-      file_header.file_size = file_header.offset_data;
-
-      if (bmp_info_header.height < 0) {
-        return 52;
-        // throw std::runtime_error("The program can treat only BMP images with
-        // "
-        //                          "the origin in the bottom left corner!");
-      }
-
-      data.resize(bmp_info_header.width * bmp_info_header.height *
-                  bmp_info_header.bit_count / 8);
-
-      // Here we check if we need to take into account row padding
-      if (bmp_info_header.width % 4 == 0) {
-        inp.read((char *)data.data(), data.size());
-        file_header.file_size += static_cast<uint32_t>(data.size());
-      } else {
-        row_stride = bmp_info_header.width * bmp_info_header.bit_count / 8;
-        uint32_t new_stride = make_stride_aligned(4);
-        std::vector<uint8_t> padding_row(new_stride - row_stride);
-
-        for (int y = 0; y < bmp_info_header.height; ++y) {
-          inp.read((char *)(data.data() + row_stride * y), row_stride);
-          inp.read((char *)padding_row.data(), padding_row.size());
-        }
-        file_header.file_size +=
-            static_cast<uint32_t>(data.size()) +
-            bmp_info_header.height * static_cast<uint32_t>(padding_row.size());
-      }
-    } else {
-      return 53;
-      // throw std::runtime_error("Unable to open the input image buffer");
-    }
-    return 0;
-  }
-
-  BMP(int32_t width, int32_t height, bool has_alpha = true) {
-    if (width <= 0 || height <= 0) {
-      width = 1;
-      height = 1;
-    }
-
-    bmp_info_header.width = width;
-    bmp_info_header.height = height;
-    if (has_alpha) {
-      bmp_info_header.size = sizeof(BMPInfoHeader) + sizeof(BMPColorHeader);
-      file_header.offset_data = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader) +
-                                sizeof(BMPColorHeader);
-
-      bmp_info_header.bit_count = 32;
-      bmp_info_header.compression = 3;
-      row_stride = width * 4;
-      data.resize(row_stride * height);
-      file_header.file_size = file_header.offset_data + data.size();
-    } else {
-      bmp_info_header.size = sizeof(BMPInfoHeader);
-      file_header.offset_data = sizeof(BMPFileHeader) + sizeof(BMPInfoHeader);
-
-      bmp_info_header.bit_count = 24;
-      bmp_info_header.compression = 0;
-      row_stride = width * 3;
-      data.resize(row_stride * height);
-
-      uint32_t new_stride = make_stride_aligned(4);
-      file_header.file_size =
-          file_header.offset_data + static_cast<uint32_t>(data.size()) +
-          bmp_info_header.height * (new_stride - row_stride);
-    }
-  }
-
-  unsigned write(const char *fname) {
-    std::ofstream of{fname, std::ios_base::binary};
-    if (of) {
-      if (bmp_info_header.bit_count == 32) {
-        write_headers_and_data(of);
-      } else if (bmp_info_header.bit_count == 24) {
-        if (bmp_info_header.width % 4 == 0) {
-          write_headers_and_data(of);
-        } else {
-          uint32_t new_stride = make_stride_aligned(4);
-          std::vector<uint8_t> padding_row(new_stride - row_stride);
-
-          write_headers(of);
-
-          for (int y = 0; y < bmp_info_header.height; ++y) {
-            of.write((const char *)(data.data() + row_stride * y), row_stride);
-            of.write((const char *)padding_row.data(), padding_row.size());
-          }
-        }
-      } else {
-        return 54; // throw std::runtime_error("The program can treat only 24 or
-                   // 32 bits per pixel BMP files");
-      }
-    } else {
-      return 55; // throw std::runtime_error("Unable to open the output image
-                 // file.");
-    }
-    return 0;
-  }
-
-  std::vector<unsigned char> DATA() {
-    std::stringstream ss;
-    if (ss) {
-      if (bmp_info_header.bit_count == 32) {
-        write_headers_and_datass(ss);
-      } else if (bmp_info_header.bit_count == 24) {
-        if (bmp_info_header.width % 4 == 0) {
-          write_headers_and_datass(ss);
-        } else {
-          uint32_t new_stride = make_stride_aligned(4);
-          std::vector<uint8_t> padding_row(new_stride - row_stride);
-
-          write_headersss(ss);
-
-          for (int y = 0; y < bmp_info_header.height; ++y) {
-            ss.write((const char *)(data.data() + row_stride * y), row_stride);
-            ss.write((const char *)padding_row.data(), padding_row.size());
-          }
-        }
-      } else {
-      }
-    } else {
-    }
-    std::string test11 = ss.str();
-    std::vector<unsigned char> test12(test11.begin(), test11.end());
-    return test12;
-  }
-
-  unsigned fill_region(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h,
-                       uint8_t B, uint8_t G, uint8_t R, uint8_t A) {
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    for (uint32_t y = y0; y < y0 + h; ++y) {
-      for (uint32_t x = x0; x < x0 + w; ++x) {
-        /*if (x + w > (uint32_t)bmp_info_header.width || y + h >
-        (uint32_t)bmp_info_header.height) {
-            //
-        }*/
-        // else{
-        data[channels * (y * bmp_info_header.width + x) + 0] = B;
-        data[channels * (y * bmp_info_header.width + x) + 1] = G;
-        data[channels * (y * bmp_info_header.width + x) + 2] = R;
-        if (channels == 4) {
-          data[channels * (y * bmp_info_header.width + x) + 3] = A;
-        }
-        //}
-      }
-    }
-    return 0;
-  }
-
-  void fill_region_df(uint32_t x1, uint32_t y1, uint32_t w, uint32_t h,
-                      uint8_t B, uint8_t G, uint8_t R, uint8_t A) {
-
-    int x0 = x1;
-    int y0 = this->bmp_info_header.height - y1 - h;
-
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    for (uint32_t y = y0; y < y0 + h; ++y) {
-      for (uint32_t x = x0; x < x0 + w; ++x) {
-        if ((x + w < (uint32_t)bmp_info_header.width) ||
-            this->bmp_info_header.height - y - h > 0) {
-
-          data[channels * (y * bmp_info_header.width + x) + 0] = B;
-          data[channels * (y * bmp_info_header.width + x) + 1] = G;
-          data[channels * (y * bmp_info_header.width + x) + 2] = R;
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-  }
-
-  void manipulate_region(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h,
-                         uint8_t A) {
-    int choice, choice2, intensity;
-    cout << "What color do you want to change? " << endl;
-    cout << "Enter 1 for Blue, 2 for Green, 3 for Red " << endl;
-    cin >> choice;
-    cout << "To what color do you want to change it too?" << endl;
-    cout << "Enter 1 for Blue, 2 for Green, 3 for Red " << endl;
-    cin >> choice2;
-    cout << "Enter the intensity of the color. (From 0 to 255) " << endl;
-    cin >> intensity;
-    if (x0 + w > (uint32_t)bmp_info_header.width ||
-        y0 + h > (uint32_t)bmp_info_header.height) {
-      return; // throw std::runtime_error("The region does not fit in the
-              // image!");
-    }
-
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    if (choice == 1 && choice2 == 1) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make blue thing blue
-          if (data[channels * (y * bmp_info_header.width + x) + 0] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 0] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          // data[channels * (y * bmp_info_header.width + x) + 0] = B;
-          // data[channels * (y * bmp_info_header.width + x) + 1] = G;
-          // data[channels * (y * bmp_info_header.width + x) + 2] = R;
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 1 && choice2 == 2) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make blue thing green
-          if (data[channels * (y * bmp_info_header.width + x) + 0] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 0] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 1 && choice2 == 3) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make blue thing red
-          if (data[channels * (y * bmp_info_header.width + x) + 0] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 0] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = intensity;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 2 && choice2 == 1) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make green thing blue
-          if (data[channels * (y * bmp_info_header.width + x) + 1] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 1] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 2 && choice2 == 2) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make green thing green
-          if (data[channels * (y * bmp_info_header.width + x) + 1] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 1] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 2 && choice2 == 3) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make green thing red
-          if (data[channels * (y * bmp_info_header.width + x) + 1] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 1] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = intensity;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 3 && choice2 == 1) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make red thing blue
-          if (data[channels * (y * bmp_info_header.width + x) + 2] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 2] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 3 && choice2 == 2) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make red thing green
-          if (data[channels * (y * bmp_info_header.width + x) + 2] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 2] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = intensity;
-            data[channels * (y * bmp_info_header.width + x) + 2] = 0;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-    if (choice == 3 && choice2 == 3) {
-      for (uint32_t y = y0; y < y0 + h; ++y) {
-        for (uint32_t x = x0; x < x0 + w; ++x) {
-          cout << channels * (y * bmp_info_header.width + x) << endl;
-          // Make red thing blue
-          if (data[channels * (y * bmp_info_header.width + x) + 2] > 80 &&
-              data[channels * (y * bmp_info_header.width + x) + 2] < 255) {
-            data[channels * (y * bmp_info_header.width + x) + 0] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 1] = 0;
-            data[channels * (y * bmp_info_header.width + x) + 2] = intensity;
-          }
-          if (channels == 4) {
-            data[channels * (y * bmp_info_header.width + x) + 3] = A;
-          }
-        }
-      }
-    }
-  }
-
-  unsigned set_pixel(uint32_t x0, uint32_t y0, uint8_t B, uint8_t G, uint8_t R,
-                     uint8_t A) {
-    if (x0 >= (uint32_t)bmp_info_header.width ||
-        y0 >= (uint32_t)bmp_info_header.height || x0 < 0 || y0 < 0) {
-      return 59;
-      // std::string errr = "The point is outside the image boundaries! -> " +
-      // std::to_string(x0) + "," + std::to_string(y0); throw
-      // std::runtime_error(errr);
-    }
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    data[channels * (y0 * bmp_info_header.width + x0) + 0] = B;
-    data[channels * (y0 * bmp_info_header.width + x0) + 1] = G;
-    data[channels * (y0 * bmp_info_header.width + x0) + 2] = R;
-    if (channels == 4) {
-      data[channels * (y0 * bmp_info_header.width + x0) + 3] = A;
-    }
-    return 0;
-  }
-
-  void set_pixel_df(uint32_t x0, uint32_t y0, uint8_t B, uint8_t G, uint8_t R,
-                    uint8_t A) {
-    uint32_t y1 = this->bmp_info_header.height - y0;
-    if (x0 >= (uint32_t)bmp_info_header.width ||
-        y1 <= (uint32_t)bmp_info_header.width || x0 < 0 || y0 > 0) {
-      return;
-      // throw std::runtime_error("The point is outside the image boundaries! ->
-      // " + std::to_string(x0) + "," + std::to_string(y1));
-    }
-
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    data[channels * (y0 * bmp_info_header.width + x0) + 0] = B;
-    data[channels * (y0 * bmp_info_header.width + x0) + 1] = G;
-    data[channels * (y0 * bmp_info_header.width + x0) + 2] = R;
-    if (channels == 4) {
-      data[channels * (y0 * bmp_info_header.width + x0) + 3] = A;
-    }
-  }
-
-  uint32_t get_pixel(uint32_t x0, uint32_t y0) {
-    if (x0 >= (uint32_t)bmp_info_header.width ||
-        y0 >= (uint32_t)bmp_info_header.height || x0 < 0 || y0 < 0) {
-      return 59; // throw std::runtime_error("The point is outside the image
-                 // boundaries!");
-    }
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    uint32_t outcol = 0;
-    uint8_t red = 0;
-    uint8_t green = 0;
-    uint8_t blue = 0;
-    uint8_t alpha = 255;
-    blue = data[channels * (y0 * bmp_info_header.width + x0) + 0];
-    green = data[channels * (y0 * bmp_info_header.width + x0) + 1];
-    red = data[channels * (y0 * bmp_info_header.width + x0) + 2];
-    if (channels == 4) {
-      alpha = data[channels * (y0 * bmp_info_header.width + x0) + 3];
-    }
-    outcol = ((red << 24) | (green << 16) | (blue << 8) | alpha);
-    return outcol;
-  }
-
-  uint32_t get_pixel_df(uint32_t x0, uint32_t y0) {
-    uint32_t y1 = this->bmp_info_header.height - y0;
-    if (x0 >= (uint32_t)bmp_info_header.width ||
-        y1 <= (uint32_t)bmp_info_header.width || x0 < 0 || y0 > 0) {
-      return 0; // throw std::runtime_error("The point is outside the image
-                // boundaries!");
-    }
-
-    uint32_t channels = bmp_info_header.bit_count / 8;
-    uint32_t outcol = 0;
-    uint8_t red = 0;
-    uint8_t green = 0;
-    uint8_t blue = 0;
-    uint8_t alpha = 255;
-    blue = data[channels * (y0 * bmp_info_header.width + x0) + 0];
-    green = data[channels * (y0 * bmp_info_header.width + x0) + 1];
-    red = data[channels * (y0 * bmp_info_header.width + x0) + 2];
-    if (channels == 4) {
-      alpha = data[channels * (y0 * bmp_info_header.width + x0) + 3];
-    }
-    outcol = ((red << 24) | (green << 16) | (blue << 8) | alpha);
-    return outcol;
-  }
-
-  unsigned draw_rectangle(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h,
-                          uint8_t B, uint8_t G, uint8_t R, uint8_t A,
-                          uint8_t line_w) {
-    if (x0 + w > (uint32_t)bmp_info_header.width ||
-        y0 + h > (uint32_t)bmp_info_header.height) {
-      return 59; // throw std::runtime_error("The rectangle does not fit in the
-                 // image!");
-    }
-
-    fill_region(x0, y0, w, line_w, B, G, R, A);                // top line
-    fill_region(x0, (y0 + h - line_w), w, line_w, B, G, R, A); // bottom line
-    fill_region((x0 + w - line_w), (y0 + line_w), line_w, (h - (2 * line_w)), B,
-                G, R, A); // right line
-    fill_region(x0, (y0 + line_w), line_w, (h - (2 * line_w)), B, G, R,
-                A); // left line
-    return 0;
-  }
-
-  void draw_rectangle_df(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h,
-                         uint8_t B, uint8_t G, uint8_t R, uint8_t A,
-                         uint8_t line_w) {
-    if (x0 + w > (uint32_t)bmp_info_header.width ||
-        y0 + h > (uint32_t)bmp_info_header.height) {
-      return; // throw std::runtime_error("The rectangle does not fit in the
-              // image!");
-    }
-
-    fill_region_df(x0, y0, w, line_w, B, G, R, A);                // top line
-    fill_region_df(x0, (y0 + h - line_w), w, line_w, B, G, R, A); // bottom line
-    fill_region_df((x0 + w - line_w), (y0 + line_w), line_w, (h - (2 * line_w)),
-                   B, G, R, A); // right line
-    fill_region_df(x0, (y0 + line_w), line_w, (h - (2 * line_w)), B, G, R,
-                   A); // left line
-  }
-
-private:
-  uint32_t row_stride{0};
-
-  void write_headers(std::ofstream &of) {
-    of.write((const char *)&file_header, sizeof(file_header));
-    of.write((const char *)&bmp_info_header, sizeof(bmp_info_header));
-    if (bmp_info_header.bit_count == 32) {
-      of.write((const char *)&bmp_color_header, sizeof(bmp_color_header));
-    }
-  }
-
-  void write_headers_and_data(std::ofstream &of) {
-    write_headers(of);
-    of.write((const char *)data.data(), data.size());
-  }
-
-  void write_headersss(std::stringstream &of) {
-    of.write((const char *)&file_header, sizeof(file_header));
-    of.write((const char *)&bmp_info_header, sizeof(bmp_info_header));
-    if (bmp_info_header.bit_count == 32) {
-      of.write((const char *)&bmp_color_header, sizeof(bmp_color_header));
-    }
-  }
-
-  void write_headers_and_datass(std::stringstream &of) {
-    write_headersss(of);
-    of.write((const char *)data.data(), data.size());
-  }
-
-  // Add 1 to the row_stride until it is divisible with align_stride
-  uint32_t make_stride_aligned(uint32_t align_stride) {
-    uint32_t new_stride = row_stride;
-    while (new_stride % align_stride != 0) {
-      new_stride++;
-    }
-    return new_stride;
-  }
-
-  // Check if the pixel data is stored as BGRA and if the color space type is
-  // sRGB
-  void check_color_header(BMPColorHeader &bmp_color_header) {
-    BMPColorHeader expected_color_header;
-    if (expected_color_header.red_mask != bmp_color_header.red_mask ||
-        expected_color_header.blue_mask != bmp_color_header.blue_mask ||
-        expected_color_header.green_mask != bmp_color_header.green_mask ||
-        expected_color_header.alpha_mask != bmp_color_header.alpha_mask) {
-      return; // throw std::runtime_error("Unexpected color mask format! The
-              // program expects the pixel data to be in the BGRA format");
-    }
-    if (expected_color_header.color_space_type !=
-        bmp_color_header.color_space_type) {
-      return; // throw std::runtime_error("Unexpected color space type! The
-              // program expects sRGB values");
-    }
-  }
-};

include/renderd7/bmpconverter.hpp

@@ -1,21 +0,0 @@
-#pragma once
-#include <renderd7/external/lodepng.h>
-
-#include <iostream>
-
-namespace BitmapConverter {
-/// returns 0 if all went ok, non-0 if error
-/// output image is always given in RGBA (with alpha channel), even if it's a
-/// BMP without alpha channel
-unsigned decodeBMP(std::vector<unsigned char> &image, unsigned &w, unsigned &h,
-                   const std::vector<unsigned char> &bmp);
-
-/// @brief Convert A File
-/// @param filename
-/// @return data
-std::vector<unsigned char> ConvertFile(std::string filename);
-/// @brief Convert data
-/// @param data
-/// @return data
-std::vector<unsigned char> ConvertData(std::vector<unsigned char> data);
-} // namespace BitmapConverter

include/renderd7/debugfont.h

@@ -1,187 +0,0 @@
-/*
-  This file was autogenerated by raw2c.
-Visit http://www.devkitpro.org
-*/
-
-//---------------------------------------------------------------------------------
-#ifndef _debugfont_h_
-#define _debugfont_h_
-//---------------------------------------------------------------------------------
-static const unsigned char debugfont[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81,
-    0xbd, 0x99, 0x81, 0x7e, 0x7e, 0xff, 0xdb, 0xff, 0xc3, 0xe7, 0xff, 0x7e,
-    0x6c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x10, 0x38, 0x7c, 0xfe,
-    0x7c, 0x38, 0x10, 0x00, 0x3c, 0x3c, 0x18, 0xff, 0xe7, 0x18, 0x3c, 0x00,
-    0x10, 0x38, 0x7c, 0xfe, 0xee, 0x10, 0x38, 0x00, 0x00, 0x00, 0x18, 0x3c,
-    0x3c, 0x18, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff,
-    0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00, 0xff, 0xc3, 0x99, 0xbd,
-    0xbd, 0x99, 0xc3, 0xff, 0x0f, 0x07, 0x0f, 0x7d, 0xcc, 0xcc, 0xcc, 0x78,
-    0x3c, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x08, 0x0c, 0x0a, 0x0a,
-    0x08, 0x78, 0xf0, 0x00, 0x18, 0x14, 0x1a, 0x16, 0x72, 0xe2, 0x0e, 0x1c,
-    0x10, 0x54, 0x38, 0xee, 0x38, 0x54, 0x10, 0x00, 0x80, 0xe0, 0xf8, 0xfe,
-    0xf8, 0xe0, 0x80, 0x00, 0x02, 0x0e, 0x3e, 0xfe, 0x3e, 0x0e, 0x02, 0x00,
-    0x18, 0x3c, 0x5a, 0x18, 0x5a, 0x3c, 0x18, 0x00, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x00, 0x66, 0x00, 0x7f, 0xdb, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x00,
-    0x1c, 0x22, 0x38, 0x44, 0x44, 0x38, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00,
-    0x7e, 0x7e, 0x7e, 0x00, 0x18, 0x3c, 0x5a, 0x18, 0x5a, 0x3c, 0x18, 0x7e,
-    0x18, 0x3c, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0x5a, 0x3c, 0x18, 0x00, 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00,
-    0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
-    0xc0, 0xfe, 0x00, 0x00, 0x00, 0x24, 0x42, 0xff, 0x42, 0x24, 0x00, 0x00,
-    0x00, 0x10, 0x38, 0x7c, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c,
-    0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x3c, 0x3c, 0x18, 0x18, 0x00, 0x18, 0x00, 0x6c, 0x24, 0x24, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0xfe, 0x6c, 0xfe, 0x6c, 0x6c, 0x00,
-    0x10, 0x7c, 0xd0, 0x7c, 0x16, 0xfc, 0x10, 0x00, 0x00, 0x66, 0xac, 0xd8,
-    0x36, 0x6a, 0xcc, 0x00, 0x38, 0x4c, 0x38, 0x78, 0xce, 0xcc, 0x7a, 0x00,
-    0x30, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x60,
-    0x60, 0x30, 0x18, 0x00, 0x60, 0x30, 0x18, 0x18, 0x18, 0x30, 0x60, 0x00,
-    0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x30, 0x30, 0xfc,
-    0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x20,
-    0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x30, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x00,
-    0x7c, 0xce, 0xde, 0xf6, 0xe6, 0xe6, 0x7c, 0x00, 0x18, 0x38, 0x78, 0x18,
-    0x18, 0x18, 0x7e, 0x00, 0x7c, 0xc6, 0x06, 0x1c, 0x70, 0xc6, 0xfe, 0x00,
-    0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x1c, 0x3c, 0x6c, 0xcc,
-    0xfe, 0x0c, 0x1e, 0x00, 0xfe, 0xc0, 0xfc, 0x06, 0x06, 0xc6, 0x7c, 0x00,
-    0x7c, 0xc6, 0xc0, 0xfc, 0xc6, 0xc6, 0x7c, 0x00, 0xfe, 0xc6, 0x0c, 0x18,
-    0x30, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0x7c, 0x00,
-    0x7c, 0xc6, 0xc6, 0x7e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x30, 0x00, 0x00,
-    0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, 0x10, 0x20,
-    0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x7e, 0x00,
-    0x00, 0x7e, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00,
-    0x78, 0xcc, 0x0c, 0x18, 0x30, 0x00, 0x30, 0x00, 0x7c, 0x82, 0x9e, 0xa6,
-    0x9e, 0x80, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00,
-    0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x7c, 0xc6, 0xc0, 0xc0,
-    0xc0, 0xc6, 0x7c, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00,
-    0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0xfe, 0x62, 0x68, 0x78,
-    0x68, 0x60, 0xf0, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xce, 0xc6, 0x7e, 0x00,
-    0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x3c, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x3c, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0x78, 0x00,
-    0xe6, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0xf0, 0x60, 0x60, 0x60,
-    0x62, 0x66, 0xfe, 0x00, 0x82, 0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0x00,
-    0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0x7c, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00,
-    0x7c, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c, 0x06, 0xfc, 0x66, 0x66, 0x7c,
-    0x66, 0x66, 0xe6, 0x00, 0x7c, 0xc6, 0xc0, 0x7c, 0x06, 0xc6, 0x7c, 0x00,
-    0x7e, 0x5a, 0x5a, 0x18, 0x18, 0x18, 0x3c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6,
-    0xc6, 0xc6, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00,
-    0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x82, 0x00, 0xc6, 0x6c, 0x38, 0x38,
-    0x38, 0x6c, 0xc6, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x3c, 0x00,
-    0xfe, 0xc6, 0x8c, 0x18, 0x32, 0x66, 0xfe, 0x00, 0x78, 0x60, 0x60, 0x60,
-    0x60, 0x60, 0x78, 0x00, 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02, 0x00,
-    0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, 0x10, 0x38, 0x6c, 0xc6,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
-    0x30, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c,
-    0x7c, 0xcc, 0x76, 0x00, 0xe0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc6, 0x7c, 0x00, 0x1c, 0x0c, 0x0c, 0x7c,
-    0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0x7c, 0x00,
-    0x1c, 0x36, 0x30, 0x78, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x76, 0xcc,
-    0xcc, 0x7c, 0x0c, 0x78, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0xe6, 0x00,
-    0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x0c, 0x00, 0x1c,
-    0x0c, 0x0c, 0xcc, 0x78, 0xe0, 0x60, 0x66, 0x6c, 0x78, 0x6c, 0xe6, 0x00,
-    0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0xcc, 0xfe,
-    0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x00,
-    0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0xdc, 0x66,
-    0x66, 0x7c, 0x60, 0xf0, 0x00, 0x00, 0x7c, 0xcc, 0xcc, 0x7c, 0x0c, 0x1e,
-    0x00, 0x00, 0xde, 0x76, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x7c, 0xc0,
-    0x7c, 0x06, 0x7c, 0x00, 0x10, 0x30, 0xfc, 0x30, 0x30, 0x34, 0x18, 0x00,
-    0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0xc6, 0xc6,
-    0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00,
-    0x00, 0x00, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0xcc, 0xcc,
-    0xcc, 0x7c, 0x0c, 0xf8, 0x00, 0x00, 0xfc, 0x98, 0x30, 0x64, 0xfc, 0x00,
-    0x0e, 0x18, 0x18, 0x30, 0x18, 0x18, 0x0e, 0x00, 0x18, 0x18, 0x18, 0x00,
-    0x18, 0x18, 0x18, 0x00, 0xe0, 0x30, 0x30, 0x18, 0x30, 0x30, 0xe0, 0x00,
-    0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
-    0xc6, 0xc6, 0xfe, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x70,
-    0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x0e, 0x10, 0x7c, 0xc6,
-    0xfe, 0xc0, 0x7c, 0x00, 0x7c, 0x82, 0x38, 0x0c, 0x7c, 0xcc, 0x76, 0x00,
-    0xcc, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0x76, 0x00, 0xe0, 0x10, 0x78, 0x0c,
-    0x7c, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x78, 0x0c, 0x7c, 0xcc, 0x76, 0x00,
-    0x00, 0x00, 0x7c, 0xc0, 0xc0, 0x7c, 0x18, 0x70, 0x7c, 0x82, 0x7c, 0xc6,
-    0xfe, 0xc0, 0x7c, 0x00, 0xc6, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0x7c, 0x00,
-    0xe0, 0x10, 0x7c, 0xc6, 0xfe, 0xc0, 0x7c, 0x00, 0x66, 0x00, 0x38, 0x18,
-    0x18, 0x18, 0x3c, 0x00, 0x7c, 0x82, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00,
-    0xe0, 0x10, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00, 0xc6, 0x00, 0x7c, 0xc6,
-    0xfe, 0xc6, 0xc6, 0x00, 0x38, 0x38, 0x7c, 0xc6, 0xfe, 0xc6, 0xc6, 0x00,
-    0x0e, 0x10, 0xfe, 0x60, 0x78, 0x60, 0xfe, 0x00, 0x00, 0x00, 0x7c, 0x12,
-    0x7e, 0xd0, 0x7e, 0x00, 0x7e, 0xc8, 0xc8, 0xfe, 0xc8, 0xc8, 0xce, 0x00,
-    0x7c, 0x82, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0xc6, 0x00, 0x7c, 0xc6,
-    0xc6, 0xc6, 0x7c, 0x00, 0xe0, 0x10, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
-    0x7c, 0x82, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0xe0, 0x10, 0xcc, 0xcc,
-    0xcc, 0xcc, 0x76, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xf8,
-    0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0xc6, 0x00, 0xc6, 0xc6,
-    0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x7c, 0xd6, 0xd0, 0xd6, 0x7c, 0x18, 0x00,
-    0x38, 0x6c, 0x60, 0xf0, 0x60, 0xf2, 0xdc, 0x00, 0x66, 0x3c, 0x18, 0x7e,
-    0x18, 0x7e, 0x18, 0x00, 0xf8, 0xcc, 0xf8, 0xc4, 0xcc, 0xde, 0xcc, 0x06,
-    0x0e, 0x1b, 0x18, 0x3c, 0x18, 0x18, 0xd8, 0x70, 0x0e, 0x10, 0x78, 0x0c,
-    0x7c, 0xcc, 0x76, 0x00, 0x0e, 0x10, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x00,
-    0x0e, 0x10, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x0e, 0x10, 0xcc, 0xcc,
-    0xcc, 0xcc, 0x76, 0x00, 0x66, 0x98, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x00,
-    0x66, 0x98, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0x00, 0x38, 0x0c, 0x3c, 0x34,
-    0x00, 0x7e, 0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x7c, 0x00, 0x00,
-    0x30, 0x00, 0x30, 0x60, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xfc,
-    0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0x0c, 0x00, 0x00,
-    0xc0, 0xc8, 0xd0, 0xfe, 0x46, 0x8c, 0x1e, 0x00, 0xc0, 0xc8, 0xd0, 0xec,
-    0x5c, 0xbe, 0x0c, 0x00, 0x18, 0x00, 0x18, 0x18, 0x3c, 0x3c, 0x18, 0x00,
-    0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
-    0x6c, 0xd8, 0x00, 0x00, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88,
-    0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0xdb, 0x77, 0xdb, 0xee,
-    0xdb, 0x77, 0xdb, 0xee, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18,
-    0xf8, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36,
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x00, 0x00, 0xf8, 0x18,
-    0xf8, 0x18, 0x18, 0x18, 0x36, 0x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0xfe, 0x06,
-    0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00,
-    0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x18, 0x18, 0xf8, 0x18,
-    0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18,
-    0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
-    0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36,
-    0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x00, 0x00, 0xff, 0x00,
-    0xff, 0x00, 0x00, 0x00, 0x36, 0x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36,
-    0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18,
-    0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
-    0x3f, 0x00, 0x00, 0x00, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36,
-    0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
-    0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-    0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xcc, 0xc8, 0xdc, 0x76, 0x00,
-    0x78, 0xcc, 0xd8, 0xcc, 0xc6, 0xc6, 0xdc, 0x40, 0xfe, 0x62, 0x60, 0x60,
-    0x60, 0x60, 0xf0, 0x00, 0x00, 0x02, 0x7e, 0xec, 0x6c, 0x6c, 0x48, 0x00,
-    0xfe, 0x62, 0x30, 0x18, 0x30, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x7e, 0xd0,
-    0xc8, 0xc8, 0x70, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xf8, 0x80,
-    0x00, 0x00, 0x7e, 0xd8, 0x18, 0x18, 0x10, 0x00, 0x38, 0x10, 0x7c, 0xd6,
-    0xd6, 0x7c, 0x10, 0x38, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00,
-    0x7c, 0xc6, 0xc6, 0xc6, 0x6c, 0x28, 0xee, 0x00, 0x3c, 0x22, 0x18, 0x7c,
-    0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x66, 0x99, 0x99, 0x66, 0x00, 0x00,
-    0x00, 0x06, 0x7c, 0x9e, 0xf2, 0x7c, 0xc0, 0x00, 0x00, 0x00, 0x7c, 0xc0,
-    0xf8, 0xc0, 0x7c, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
-    0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
-    0x18, 0x00, 0x7e, 0x00, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0x00,
-    0x18, 0x30, 0x60, 0x30, 0x18, 0x00, 0x7c, 0x00, 0x0e, 0x1b, 0x1b, 0x18,
-    0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0x70,
-    0x00, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
-    0x76, 0xdc, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x18, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x0c, 0x0c, 0xec, 0x6c, 0x3c, 0x00,
-    0xd8, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x30, 0xc0, 0xf0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-};
-const int debugfont_size = sizeof(debugfont);
-//---------------------------------------------------------------------------------
-#endif //_font_h_
-//---------------------------------------------------------------------------------

include/renderd7/external/jpgd.h

@@ -1,422 +0,0 @@
-// jpgd.h - C++ class for JPEG decompression.
-// Richard Geldreich <richgel99@gmail.com>
-// See jpgd.cpp for license (Public Domain or Apache 2.0).
-#ifndef JPEG_DECODER_H
-#define JPEG_DECODER_H
-
-#include <assert.h>
-#include <cinttypes>
-#include <setjmp.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef _MSC_VER
-#define JPGD_NORETURN __declspec(noreturn)
-#elif defined(__GNUC__)
-#define JPGD_NORETURN __attribute__((noreturn))
-#else
-#define JPGD_NORETURN
-#endif
-
-#define JPGD_HUFF_TREE_MAX_LENGTH 512
-#define JPGD_HUFF_CODE_SIZE_MAX_LENGTH 256
-
-namespace jpgd {
-typedef unsigned char uint8;
-typedef signed short int16;
-typedef unsigned short uint16;
-typedef unsigned int uint;
-typedef signed int int32;
-
-// Loads a JPEG image from a memory buffer or a file.
-// req_comps can be 1 (grayscale), 3 (RGB), or 4 (RGBA).
-// On return, width/height will be set to the image's dimensions, and
-// actual_comps will be set to the either 1 (grayscale) or 3 (RGB). Notes: For
-// more control over where and how the source data is read, see the
-// decompress_jpeg_image_from_stream() function below, or call the jpeg_decoder
-// class directly. Requesting a 8 or 32bpp image is currently a little faster
-// than 24bpp because the jpeg_decoder class itself currently always unpacks to
-// either 8 or 32bpp.
-unsigned char *decompress_jpeg_image_from_memory(const unsigned char *pSrc_data,
-                                                 int src_data_size, int *width,
-                                                 int *height, int *actual_comps,
-                                                 int req_comps,
-                                                 uint32_t flags = 0);
-unsigned char *decompress_jpeg_image_from_file(const char *pSrc_filename,
-                                               int *width, int *height,
-                                               int *actual_comps, int req_comps,
-                                               uint32_t flags = 0);
-
-// Success/failure error codes.
-enum jpgd_status {
-  JPGD_SUCCESS = 0,
-  JPGD_FAILED = -1,
-  JPGD_DONE = 1,
-  JPGD_BAD_DHT_COUNTS = -256,
-  JPGD_BAD_DHT_INDEX,
-  JPGD_BAD_DHT_MARKER,
-  JPGD_BAD_DQT_MARKER,
-  JPGD_BAD_DQT_TABLE,
-  JPGD_BAD_PRECISION,
-  JPGD_BAD_HEIGHT,
-  JPGD_BAD_WIDTH,
-  JPGD_TOO_MANY_COMPONENTS,
-  JPGD_BAD_SOF_LENGTH,
-  JPGD_BAD_VARIABLE_MARKER,
-  JPGD_BAD_DRI_LENGTH,
-  JPGD_BAD_SOS_LENGTH,
-  JPGD_BAD_SOS_COMP_ID,
-  JPGD_W_EXTRA_BYTES_BEFORE_MARKER,
-  JPGD_NO_ARITHMITIC_SUPPORT,
-  JPGD_UNEXPECTED_MARKER,
-  JPGD_NOT_JPEG,
-  JPGD_UNSUPPORTED_MARKER,
-  JPGD_BAD_DQT_LENGTH,
-  JPGD_TOO_MANY_BLOCKS,
-  JPGD_UNDEFINED_QUANT_TABLE,
-  JPGD_UNDEFINED_HUFF_TABLE,
-  JPGD_NOT_SINGLE_SCAN,
-  JPGD_UNSUPPORTED_COLORSPACE,
-  JPGD_UNSUPPORTED_SAMP_FACTORS,
-  JPGD_DECODE_ERROR,
-  JPGD_BAD_RESTART_MARKER,
-  JPGD_BAD_SOS_SPECTRAL,
-  JPGD_BAD_SOS_SUCCESSIVE,
-  JPGD_STREAM_READ,
-  JPGD_NOTENOUGHMEM,
-  JPGD_TOO_MANY_SCANS
-};
-
-// Input stream interface.
-// Derive from this class to read input data from sources other than files or
-// memory. Set m_eof_flag to true when no more data is available. The decoder is
-// rather greedy: it will keep on calling this method until its internal input
-// buffer is full, or until the EOF flag is set. It the input stream contains
-// data after the JPEG stream's EOI (end of image) marker it will probably be
-// pulled into the internal buffer. Call the get_total_bytes_read() method to
-// determine the actual size of the JPEG stream after successful decoding.
-class jpeg_decoder_stream {
-public:
-  jpeg_decoder_stream() {}
-  virtual ~jpeg_decoder_stream() {}
-
-  // The read() method is called when the internal input buffer is empty.
-  // Parameters:
-  // pBuf - input buffer
-  // max_bytes_to_read - maximum bytes that can be written to pBuf
-  // pEOF_flag - set this to true if at end of stream (no more bytes remaining)
-  // Returns -1 on error, otherwise return the number of bytes actually written
-  // to the buffer (which may be 0). Notes: This method will be called in a loop
-  // until you set *pEOF_flag to true or the internal buffer is full.
-  virtual int read(uint8 *pBuf, int max_bytes_to_read, bool *pEOF_flag) = 0;
-};
-
-// stdio FILE stream class.
-class jpeg_decoder_file_stream : public jpeg_decoder_stream {
-  jpeg_decoder_file_stream(const jpeg_decoder_file_stream &);
-  jpeg_decoder_file_stream &operator=(const jpeg_decoder_file_stream &);
-
-  FILE *m_pFile;
-  bool m_eof_flag, m_error_flag;
-
-public:
-  jpeg_decoder_file_stream();
-  virtual ~jpeg_decoder_file_stream();
-
-  bool open(const char *Pfilename);
-  void close();
-
-  virtual int read(uint8 *pBuf, int max_bytes_to_read, bool *pEOF_flag);
-};
-
-// Memory stream class.
-class jpeg_decoder_mem_stream : public jpeg_decoder_stream {
-  const uint8 *m_pSrc_data;
-  uint m_ofs, m_size;
-
-public:
-  jpeg_decoder_mem_stream() : m_pSrc_data(NULL), m_ofs(0), m_size(0) {}
-  jpeg_decoder_mem_stream(const uint8 *pSrc_data, uint size)
-      : m_pSrc_data(pSrc_data), m_ofs(0), m_size(size) {}
-
-  virtual ~jpeg_decoder_mem_stream() {}
-
-  bool open(const uint8 *pSrc_data, uint size);
-  void close() {
-    m_pSrc_data = NULL;
-    m_ofs = 0;
-    m_size = 0;
-  }
-
-  virtual int read(uint8 *pBuf, int max_bytes_to_read, bool *pEOF_flag);
-};
-
-// Loads JPEG file from a jpeg_decoder_stream.
-unsigned char *decompress_jpeg_image_from_stream(jpeg_decoder_stream *pStream,
-                                                 int *width, int *height,
-                                                 int *actual_comps,
-                                                 int req_comps,
-                                                 uint32_t flags = 0);
-
-enum {
-  JPGD_IN_BUF_SIZE = 8192,
-  JPGD_MAX_BLOCKS_PER_MCU = 10,
-  JPGD_MAX_HUFF_TABLES = 8,
-  JPGD_MAX_QUANT_TABLES = 4,
-  JPGD_MAX_COMPONENTS = 4,
-  JPGD_MAX_COMPS_IN_SCAN = 4,
-  JPGD_MAX_BLOCKS_PER_ROW = 16384,
-  JPGD_MAX_HEIGHT = 32768,
-  JPGD_MAX_WIDTH = 32768
-};
-
-typedef int16 jpgd_quant_t;
-typedef int16 jpgd_block_coeff_t;
-
-class jpeg_decoder {
-public:
-  enum { cFlagBoxChromaFiltering = 1, cFlagDisableSIMD = 2 };
-
-  // Call get_error_code() after constructing to determine if the stream is
-  // valid or not. You may call the get_width(), get_height(), etc. methods
-  // after the constructor is called. You may then either destruct the object,
-  // or begin decoding the image by calling begin_decoding(), then decode() on
-  // each scanline.
-  jpeg_decoder(jpeg_decoder_stream *pStream, uint32_t flags = 0);
-
-  ~jpeg_decoder();
-
-  // Call this method after constructing the object to begin decompression.
-  // If JPGD_SUCCESS is returned you may then call decode() on each scanline.
-
-  int begin_decoding();
-
-  // Returns the next scan line.
-  // For grayscale images, pScan_line will point to a buffer containing 8-bit
-  // pixels (get_bytes_per_pixel() will return 1). Otherwise, it will always
-  // point to a buffer containing 32-bit RGBA pixels (A will always be 255, and
-  // get_bytes_per_pixel() will return 4). Returns JPGD_SUCCESS if a scan line
-  // has been returned. Returns JPGD_DONE if all scan lines have been returned.
-  // Returns JPGD_FAILED if an error occurred. Call get_error_code() for a more
-  // info.
-  int decode(const void **pScan_line, uint *pScan_line_len);
-
-  inline jpgd_status get_error_code() const { return m_error_code; }
-
-  inline int get_width() const { return m_image_x_size; }
-  inline int get_height() const { return m_image_y_size; }
-
-  inline int get_num_components() const { return m_comps_in_frame; }
-
-  inline int get_bytes_per_pixel() const { return m_dest_bytes_per_pixel; }
-  inline int get_bytes_per_scan_line() const {
-    return m_image_x_size * get_bytes_per_pixel();
-  }
-
-  // Returns the total number of bytes actually consumed by the decoder (which
-  // should equal the actual size of the JPEG file).
-  inline int get_total_bytes_read() const { return m_total_bytes_read; }
-
-private:
-  jpeg_decoder(const jpeg_decoder &);
-  jpeg_decoder &operator=(const jpeg_decoder &);
-
-  typedef void (*pDecode_block_func)(jpeg_decoder *, int, int, int);
-
-  struct huff_tables {
-    bool ac_table;
-    uint look_up[256];
-    uint look_up2[256];
-    uint8 code_size[JPGD_HUFF_CODE_SIZE_MAX_LENGTH];
-    uint tree[JPGD_HUFF_TREE_MAX_LENGTH];
-  };
-
-  struct coeff_buf {
-    uint8 *pData;
-    int block_num_x, block_num_y;
-    int block_len_x, block_len_y;
-    int block_size;
-  };
-
-  struct mem_block {
-    mem_block *m_pNext;
-    size_t m_used_count;
-    size_t m_size;
-    char m_data[1];
-  };
-
-  jmp_buf m_jmp_state;
-  uint32_t m_flags;
-  mem_block *m_pMem_blocks;
-  int m_image_x_size;
-  int m_image_y_size;
-  jpeg_decoder_stream *m_pStream;
-
-  int m_progressive_flag;
-
-  uint8 m_huff_ac[JPGD_MAX_HUFF_TABLES];
-  uint8 *m_huff_num[JPGD_MAX_HUFF_TABLES]; // pointer to number of Huffman codes
-                                           // per bit size
-  uint8 *
-      m_huff_val[JPGD_MAX_HUFF_TABLES]; // pointer to Huffman codes per bit size
-  jpgd_quant_t
-      *m_quant[JPGD_MAX_QUANT_TABLES]; // pointer to quantization tables
-  int m_scan_type; // Gray, Yh1v1, Yh1v2, Yh2v1, Yh2v2 (CMYK111, CMYK4114 no
-                   // longer supported)
-  int m_comps_in_frame;                   // # of components in frame
-  int m_comp_h_samp[JPGD_MAX_COMPONENTS]; // component's horizontal sampling
-                                          // factor
-  int m_comp_v_samp[JPGD_MAX_COMPONENTS]; // component's vertical sampling
-                                          // factor
-  int m_comp_quant[JPGD_MAX_COMPONENTS];  // component's quantization table
-                                          // selector
-  int m_comp_ident[JPGD_MAX_COMPONENTS];  // component's ID
-  int m_comp_h_blocks[JPGD_MAX_COMPONENTS];
-  int m_comp_v_blocks[JPGD_MAX_COMPONENTS];
-  int m_comps_in_scan;                     // # of components in scan
-  int m_comp_list[JPGD_MAX_COMPS_IN_SCAN]; // components in this scan
-  int m_comp_dc_tab[JPGD_MAX_COMPONENTS]; // component's DC Huffman coding table
-                                          // selector
-  int m_comp_ac_tab[JPGD_MAX_COMPONENTS]; // component's AC Huffman coding table
-                                          // selector
-  int m_spectral_start;                   // spectral selection start
-  int m_spectral_end;                     // spectral selection end
-  int m_successive_low;                   // successive approximation low
-  int m_successive_high;                  // successive approximation high
-  int m_max_mcu_x_size;                   // MCU's max. X size in pixels
-  int m_max_mcu_y_size;                   // MCU's max. Y size in pixels
-  int m_blocks_per_mcu;
-  int m_max_blocks_per_row;
-  int m_mcus_per_row, m_mcus_per_col;
-  int m_mcu_org[JPGD_MAX_BLOCKS_PER_MCU];
-  int m_total_lines_left; // total # lines left in image
-  int m_mcu_lines_left;   // total # lines left in this MCU
-  int m_num_buffered_scanlines;
-  int m_real_dest_bytes_per_scan_line;
-  int m_dest_bytes_per_scan_line; // rounded up
-  int m_dest_bytes_per_pixel;     // 4 (RGB) or 1 (Y)
-  huff_tables *m_pHuff_tabs[JPGD_MAX_HUFF_TABLES];
-  coeff_buf *m_dc_coeffs[JPGD_MAX_COMPONENTS];
-  coeff_buf *m_ac_coeffs[JPGD_MAX_COMPONENTS];
-  int m_eob_run;
-  int m_block_y_mcu[JPGD_MAX_COMPONENTS];
-  uint8 *m_pIn_buf_ofs;
-  int m_in_buf_left;
-  int m_tem_flag;
-
-  uint8 m_in_buf_pad_start[64];
-  uint8 m_in_buf[JPGD_IN_BUF_SIZE + 128];
-  uint8 m_in_buf_pad_end[64];
-
-  int m_bits_left;
-  uint m_bit_buf;
-  int m_restart_interval;
-  int m_restarts_left;
-  int m_next_restart_num;
-  int m_max_mcus_per_row;
-  int m_max_blocks_per_mcu;
-
-  int m_max_mcus_per_col;
-  uint m_last_dc_val[JPGD_MAX_COMPONENTS];
-  jpgd_block_coeff_t *m_pMCU_coefficients;
-  int m_mcu_block_max_zag[JPGD_MAX_BLOCKS_PER_MCU];
-  uint8 *m_pSample_buf;
-  uint8 *m_pSample_buf_prev;
-  int m_crr[256];
-  int m_cbb[256];
-  int m_crg[256];
-  int m_cbg[256];
-  uint8 *m_pScan_line_0;
-  uint8 *m_pScan_line_1;
-  jpgd_status m_error_code;
-  int m_total_bytes_read;
-
-  bool m_ready_flag;
-  bool m_eof_flag;
-  bool m_sample_buf_prev_valid;
-  bool m_has_sse2;
-
-  inline int check_sample_buf_ofs(int ofs) const {
-    assert(ofs >= 0);
-    assert(ofs < m_max_blocks_per_row * 64);
-    return ofs;
-  }
-  void free_all_blocks();
-  JPGD_NORETURN void stop_decoding(jpgd_status status);
-  void *alloc(size_t n, bool zero = false);
-  void *alloc_aligned(size_t nSize, uint32_t align = 16, bool zero = false);
-  void word_clear(void *p, uint16 c, uint n);
-  void prep_in_buffer();
-  void read_dht_marker();
-  void read_dqt_marker();
-  void read_sof_marker();
-  void skip_variable_marker();
-  void read_dri_marker();
-  void read_sos_marker();
-  int next_marker();
-  int process_markers();
-  void locate_soi_marker();
-  void locate_sof_marker();
-  int locate_sos_marker();
-  void init(jpeg_decoder_stream *pStream, uint32_t flags);
-  void create_look_ups();
-  void fix_in_buffer();
-  void transform_mcu(int mcu_row);
-  coeff_buf *coeff_buf_open(int block_num_x, int block_num_y, int block_len_x,
-                            int block_len_y);
-  inline jpgd_block_coeff_t *coeff_buf_getp(coeff_buf *cb, int block_x,
-                                            int block_y);
-  void load_next_row();
-  void decode_next_row();
-  void make_huff_table(int index, huff_tables *pH);
-  void check_quant_tables();
-  void check_huff_tables();
-  bool calc_mcu_block_order();
-  int init_scan();
-  void init_frame();
-  void process_restart();
-  void decode_scan(pDecode_block_func decode_block_func);
-  void init_progressive();
-  void init_sequential();
-  void decode_start();
-  void decode_init(jpeg_decoder_stream *pStream, uint32_t flags);
-  void H2V2Convert();
-  uint32_t H2V2ConvertFiltered();
-  void H2V1Convert();
-  void H2V1ConvertFiltered();
-  void H1V2Convert();
-  void H1V2ConvertFiltered();
-  void H1V1Convert();
-  void gray_convert();
-  void find_eoi();
-  inline uint get_char();
-  inline uint get_char(bool *pPadding_flag);
-  inline void stuff_char(uint8 q);
-  inline uint8 get_octet();
-  inline uint get_bits(int num_bits);
-  inline uint get_bits_no_markers(int numbits);
-  inline int huff_decode(huff_tables *pH);
-  inline int huff_decode(huff_tables *pH, int &extrabits);
-
-  // Clamps a value between 0-255.
-  static inline uint8 clamp(int i) {
-    if (static_cast<uint>(i) > 255)
-      i = (((~i) >> 31) & 0xFF);
-    return static_cast<uint8>(i);
-  }
-  int decode_next_mcu_row();
-
-  static void decode_block_dc_first(jpeg_decoder *pD, int component_id,
-                                    int block_x, int block_y);
-  static void decode_block_dc_refine(jpeg_decoder *pD, int component_id,
-                                     int block_x, int block_y);
-  static void decode_block_ac_first(jpeg_decoder *pD, int component_id,
-                                    int block_x, int block_y);
-  static void decode_block_ac_refine(jpeg_decoder *pD, int component_id,
-                                     int block_x, int block_y);
-};
-
-} // namespace jpgd
-
-#endif // JPEG_DECODER_H

include/renderd7/external/jpgd_idct.h

@@ -1,478 +0,0 @@
-// Copyright 2009 Intel Corporation
-// All Rights Reserved
-//
-// Permission is granted to use, copy, distribute and prepare derivative works
-// of this software for any purpose and without fee, provided, that the above
-// copyright notice and this statement appear in all copies.  Intel makes no
-// representations about the suitability of this software for any purpose.  THIS
-// SOFTWARE IS PROVIDED "AS IS." INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
-// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER
-// INDIRECT DAMAGES, FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR
-// INFRINGEMENT OF ANY PROPRIETARY RIGHTS, AND INCLUDING THE WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  Intel does not assume
-// any responsibility for any errors which may appear in this software nor any
-// responsibility to update it.
-//
-// From:
-// https://software.intel.com/sites/default/files/m/d/4/1/d/8/UsingIntelAVXToImplementIDCT-r1_5.pdf
-// https://software.intel.com/file/29048
-//
-// Requires SSE
-//
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-#include <immintrin.h>
-
-#ifdef _MSC_VER
-#define JPGD_SIMD_ALIGN(type, name) __declspec(align(16)) type name
-#else
-#define JPGD_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-#endif
-
-#include <cinttypes>
-
-#define BITS_INV_ACC 4
-#define SHIFT_INV_ROW 16 - BITS_INV_ACC
-#define SHIFT_INV_COL 1 + BITS_INV_ACC
-const short IRND_INV_ROW = 1024 * (6 - BITS_INV_ACC); // 1 << (SHIFT_INV_ROW-1)
-const short IRND_INV_COL = 16 * (BITS_INV_ACC - 3);   // 1 << (SHIFT_INV_COL-1)
-const short IRND_INV_CORR = IRND_INV_COL - 1; // correction -1.0 and round
-
-JPGD_SIMD_ALIGN(short, shortM128_one_corr[8]) = {1, 1, 1, 1, 1, 1, 1, 1};
-JPGD_SIMD_ALIGN(short, shortM128_round_inv_row[8]) = {
-    IRND_INV_ROW, 0, IRND_INV_ROW, 0, IRND_INV_ROW, 0, IRND_INV_ROW, 0};
-JPGD_SIMD_ALIGN(short, shortM128_round_inv_col[8]) = {
-    IRND_INV_COL, IRND_INV_COL, IRND_INV_COL, IRND_INV_COL,
-    IRND_INV_COL, IRND_INV_COL, IRND_INV_COL, IRND_INV_COL};
-JPGD_SIMD_ALIGN(short, shortM128_round_inv_corr[8]) = {
-    IRND_INV_CORR, IRND_INV_CORR, IRND_INV_CORR, IRND_INV_CORR,
-    IRND_INV_CORR, IRND_INV_CORR, IRND_INV_CORR, IRND_INV_CORR};
-JPGD_SIMD_ALIGN(short, shortM128_tg_1_16[8]) = {
-    13036, 13036, 13036, 13036,
-    13036, 13036, 13036, 13036}; // tg * (2<<16) + 0.5
-JPGD_SIMD_ALIGN(short, shortM128_tg_2_16[8]) = {
-    27146, 27146, 27146, 27146,
-    27146, 27146, 27146, 27146}; // tg * (2<<16) + 0.5
-JPGD_SIMD_ALIGN(short, shortM128_tg_3_16[8]) = {
-    -21746, -21746, -21746, -21746,
-    -21746, -21746, -21746, -21746}; // tg * (2<<16) + 0.5
-JPGD_SIMD_ALIGN(short, shortM128_cos_4_16[8]) = {
-    -19195, -19195, -19195, -19195,
-    -19195, -19195, -19195, -19195}; // cos * (2<<16) + 0.5
-
-//-----------------------------------------------------------------------------
-// Table for rows 0,4 - constants are multiplied on cos_4_16
-// w15 w14 w11 w10 w07 w06 w03 w02
-// w29 w28 w25 w24 w21 w20 w17 w16
-// w31 w30 w27 w26 w23 w22 w19 w18
-// movq -> w05 w04 w01 w00
-JPGD_SIMD_ALIGN(short, shortM128_tab_i_04[]) = {
-    16384,  21407,  16384,  8867,
-    16384,  -8867,  16384,  -21407,  // w13 w12 w09 w08
-    16384,  8867,   -16384, -21407,  // w07 w06 w03 w02
-    -16384, 21407,  16384,  -8867,   // w15 w14 w11 w10
-    22725,  19266,  19266,  -4520,   // w21 w20 w17 w16
-    12873,  -22725, 4520,   -12873,  // w29 w28 w25 w24
-    12873,  4520,   -22725, -12873,  // w23 w22 w19 w18
-    4520,   19266,  19266,  -22725}; // w31 w30 w27 w26
-
-// Table for rows 1,7 - constants are multiplied on cos_1_16
-// movq -> w05 w04 w01 w00
-JPGD_SIMD_ALIGN(short, shortM128_tab_i_17[]) = {
-    22725,  29692,  22725,  12299,
-    22725,  -12299, 22725,  -29692,  // w13 w12 w09 w08
-    22725,  12299,  -22725, -29692,  // w07 w06 w03 w02
-    -22725, 29692,  22725,  -12299,  // w15 w14 w11 w10
-    31521,  26722,  26722,  -6270,   // w21 w20 w17 w16
-    17855,  -31521, 6270,   -17855,  // w29 w28 w25 w24
-    17855,  6270,   -31521, -17855,  // w23 w22 w19 w18
-    6270,   26722,  26722,  -31521}; // w31 w30 w27 w26
-
-// Table for rows 2,6 - constants are multiplied on cos_2_16
-// movq -> w05 w04 w01 w00
-JPGD_SIMD_ALIGN(short, shortM128_tab_i_26[]) = {
-    21407,  27969,  21407,  11585,
-    21407,  -11585, 21407,  -27969,  // w13 w12 w09 w08
-    21407,  11585,  -21407, -27969,  // w07 w06 w03 w02
-    -21407, 27969,  21407,  -11585,  // w15 w14 w11 w10
-    29692,  25172,  25172,  -5906,   // w21 w20 w17 w16
-    16819,  -29692, 5906,   -16819,  // w29 w28 w25 w24
-    16819,  5906,   -29692, -16819,  // w23 w22 w19 w18
-    5906,   25172,  25172,  -29692}; // w31 w30 w27 w26
-// Table for rows 3,5 - constants are multiplied on cos_3_16
-// movq -> w05 w04 w01 w00
-JPGD_SIMD_ALIGN(short, shortM128_tab_i_35[]) = {
-    19266,  25172,  19266,  10426,
-    19266,  -10426, 19266,  -25172,  // w13 w12 w09 w08
-    19266,  10426,  -19266, -25172,  // w07 w06 w03 w02
-    -19266, 25172,  19266,  -10426,  // w15 w14 w11 w10
-    26722,  22654,  22654,  -5315,   // w21 w20 w17 w16
-    15137,  -26722, 5315,   -15137,  // w29 w28 w25 w24
-    15137,  5315,   -26722, -15137,  // w23 w22 w19 w18
-    5315,   22654,  22654,  -26722}; // w31 w30 w27 w26
-
-JPGD_SIMD_ALIGN(short, shortM128_128[8]) = {128, 128, 128, 128,
-                                            128, 128, 128, 128};
-
-void idctSSEShortU8(const short *pInput, uint8_t *pOutputUB) {
-  __m128i r_xmm0, r_xmm4;
-  __m128i r_xmm1, r_xmm2, r_xmm3, r_xmm5, r_xmm6, r_xmm7;
-  __m128i row0, row1, row2, row3, row4, row5, row6, row7;
-  short *pTab_i_04 = shortM128_tab_i_04;
-  short *pTab_i_26 = shortM128_tab_i_26;
-
-  // Get pointers for this input and output
-  pTab_i_04 = shortM128_tab_i_04;
-  pTab_i_26 = shortM128_tab_i_26;
-
-  // Row 1 and Row 3
-  r_xmm0 = _mm_load_si128((__m128i *)pInput);
-  r_xmm4 = _mm_load_si128((__m128i *)(&pInput[2 * 8]));
-
-  // *** Work on the data in xmm0
-  // low shuffle mask = 0xd8 = 11 01 10 00
-  // get short 2 and short 0 into ls 32-bits
-  r_xmm0 = _mm_shufflelo_epi16(r_xmm0, 0xd8);
-
-  // copy short 2 and short 0 to all locations
-  r_xmm1 = _mm_shuffle_epi32(r_xmm0, 0);
-
-  // add to those copies
-  r_xmm1 = _mm_madd_epi16(r_xmm1, *((__m128i *)pTab_i_04));
-
-  // shuffle mask = 0x55 = 01 01 01 01
-  // copy short 3 and short 1 to all locations
-  r_xmm3 = _mm_shuffle_epi32(r_xmm0, 0x55);
-
-  // high shuffle mask = 0xd8 = 11 01 10 00
-  // get short 6 and short 4 into bit positions 64-95
-  // get short 7 and short 5 into bit positions 96-127
-  r_xmm0 = _mm_shufflehi_epi16(r_xmm0, 0xd8);
-
-  // add to short 3 and short 1
-  r_xmm3 = _mm_madd_epi16(r_xmm3, *((__m128i *)&pTab_i_04[16]));
-
-  // shuffle mask = 0xaa = 10 10 10 10
-  // copy short 6 and short 4 to all locations
-  r_xmm2 = _mm_shuffle_epi32(r_xmm0, 0xaa);
-
-  // shuffle mask = 0xaa = 11 11 11 11
-  // copy short 7 and short 5 to all locations
-  r_xmm0 = _mm_shuffle_epi32(r_xmm0, 0xff);
-
-  // add to short 6 and short 4
-  r_xmm2 = _mm_madd_epi16(r_xmm2, *((__m128i *)&pTab_i_04[8]));
-
-  // *** Work on the data in xmm4
-  // high shuffle mask = 0xd8 11 01 10 00
-  // get short 6 and short 4 into bit positions 64-95
-  // get short 7 and short 5 into bit positions 96-127
-  r_xmm4 = _mm_shufflehi_epi16(r_xmm4, 0xd8);
-
-  // (xmm0 short 2 and short 0 plus pSi) + some constants
-  r_xmm1 = _mm_add_epi32(r_xmm1, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_shufflelo_epi16(r_xmm4, 0xd8);
-  r_xmm0 = _mm_madd_epi16(r_xmm0, *((__m128i *)&pTab_i_04[24]));
-  r_xmm5 = _mm_shuffle_epi32(r_xmm4, 0);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm4, 0xaa);
-  r_xmm5 = _mm_madd_epi16(r_xmm5, *((__m128i *)&shortM128_tab_i_26[0]));
-  r_xmm1 = _mm_add_epi32(r_xmm1, r_xmm2);
-  r_xmm2 = r_xmm1;
-  r_xmm7 = _mm_shuffle_epi32(r_xmm4, 0x55);
-  r_xmm6 = _mm_madd_epi16(r_xmm6, *((__m128i *)&shortM128_tab_i_26[8]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm3);
-  r_xmm4 = _mm_shuffle_epi32(r_xmm4, 0xff);
-  r_xmm2 = _mm_sub_epi32(r_xmm2, r_xmm0);
-  r_xmm7 = _mm_madd_epi16(r_xmm7, *((__m128i *)&shortM128_tab_i_26[16]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm1);
-  r_xmm2 = _mm_srai_epi32(r_xmm2, 12);
-  r_xmm5 = _mm_add_epi32(r_xmm5, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_madd_epi16(r_xmm4, *((__m128i *)&shortM128_tab_i_26[24]));
-  r_xmm5 = _mm_add_epi32(r_xmm5, r_xmm6);
-  r_xmm6 = r_xmm5;
-  r_xmm0 = _mm_srai_epi32(r_xmm0, 12);
-  r_xmm2 = _mm_shuffle_epi32(r_xmm2, 0x1b);
-  row0 = _mm_packs_epi32(r_xmm0, r_xmm2);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm7);
-  r_xmm6 = _mm_sub_epi32(r_xmm6, r_xmm4);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm5);
-  r_xmm6 = _mm_srai_epi32(r_xmm6, 12);
-  r_xmm4 = _mm_srai_epi32(r_xmm4, 12);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm6, 0x1b);
-  row2 = _mm_packs_epi32(r_xmm4, r_xmm6);
-
-  // Row 5 and row 7
-  r_xmm0 = _mm_load_si128((__m128i *)(&pInput[4 * 8]));
-  r_xmm4 = _mm_load_si128((__m128i *)(&pInput[6 * 8]));
-
-  r_xmm0 = _mm_shufflelo_epi16(r_xmm0, 0xd8);
-  r_xmm1 = _mm_shuffle_epi32(r_xmm0, 0);
-  r_xmm1 = _mm_madd_epi16(r_xmm1, *((__m128i *)pTab_i_04));
-  r_xmm3 = _mm_shuffle_epi32(r_xmm0, 0x55);
-  r_xmm0 = _mm_shufflehi_epi16(r_xmm0, 0xd8);
-  r_xmm3 = _mm_madd_epi16(r_xmm3, *((__m128i *)&pTab_i_04[16]));
-  r_xmm2 = _mm_shuffle_epi32(r_xmm0, 0xaa);
-  r_xmm0 = _mm_shuffle_epi32(r_xmm0, 0xff);
-  r_xmm2 = _mm_madd_epi16(r_xmm2, *((__m128i *)&pTab_i_04[8]));
-  r_xmm4 = _mm_shufflehi_epi16(r_xmm4, 0xd8);
-  r_xmm1 = _mm_add_epi32(r_xmm1, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_shufflelo_epi16(r_xmm4, 0xd8);
-  r_xmm0 = _mm_madd_epi16(r_xmm0, *((__m128i *)&pTab_i_04[24]));
-  r_xmm5 = _mm_shuffle_epi32(r_xmm4, 0);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm4, 0xaa);
-  r_xmm5 = _mm_madd_epi16(r_xmm5, *((__m128i *)&shortM128_tab_i_26[0]));
-  r_xmm1 = _mm_add_epi32(r_xmm1, r_xmm2);
-  r_xmm2 = r_xmm1;
-  r_xmm7 = _mm_shuffle_epi32(r_xmm4, 0x55);
-  r_xmm6 = _mm_madd_epi16(r_xmm6, *((__m128i *)&shortM128_tab_i_26[8]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm3);
-  r_xmm4 = _mm_shuffle_epi32(r_xmm4, 0xff);
-  r_xmm2 = _mm_sub_epi32(r_xmm2, r_xmm0);
-  r_xmm7 = _mm_madd_epi16(r_xmm7, *((__m128i *)&shortM128_tab_i_26[16]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm1);
-  r_xmm2 = _mm_srai_epi32(r_xmm2, 12);
-  r_xmm5 = _mm_add_epi32(r_xmm5, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_madd_epi16(r_xmm4, *((__m128i *)&shortM128_tab_i_26[24]));
-  r_xmm5 = _mm_add_epi32(r_xmm5, r_xmm6);
-  r_xmm6 = r_xmm5;
-  r_xmm0 = _mm_srai_epi32(r_xmm0, 12);
-  r_xmm2 = _mm_shuffle_epi32(r_xmm2, 0x1b);
-  row4 = _mm_packs_epi32(r_xmm0, r_xmm2);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm7);
-  r_xmm6 = _mm_sub_epi32(r_xmm6, r_xmm4);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm5);
-  r_xmm6 = _mm_srai_epi32(r_xmm6, 12);
-  r_xmm4 = _mm_srai_epi32(r_xmm4, 12);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm6, 0x1b);
-  row6 = _mm_packs_epi32(r_xmm4, r_xmm6);
-
-  // Row 4 and row 2
-  pTab_i_04 = shortM128_tab_i_35;
-  pTab_i_26 = shortM128_tab_i_17;
-  r_xmm0 = _mm_load_si128((__m128i *)(&pInput[3 * 8]));
-  r_xmm4 = _mm_load_si128((__m128i *)(&pInput[1 * 8]));
-
-  r_xmm0 = _mm_shufflelo_epi16(r_xmm0, 0xd8);
-  r_xmm1 = _mm_shuffle_epi32(r_xmm0, 0);
-  r_xmm1 = _mm_madd_epi16(r_xmm1, *((__m128i *)pTab_i_04));
-  r_xmm3 = _mm_shuffle_epi32(r_xmm0, 0x55);
-  r_xmm0 = _mm_shufflehi_epi16(r_xmm0, 0xd8);
-  r_xmm3 = _mm_madd_epi16(r_xmm3, *((__m128i *)&pTab_i_04[16]));
-  r_xmm2 = _mm_shuffle_epi32(r_xmm0, 0xaa);
-  r_xmm0 = _mm_shuffle_epi32(r_xmm0, 0xff);
-  r_xmm2 = _mm_madd_epi16(r_xmm2, *((__m128i *)&pTab_i_04[8]));
-  r_xmm4 = _mm_shufflehi_epi16(r_xmm4, 0xd8);
-  r_xmm1 = _mm_add_epi32(r_xmm1, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_shufflelo_epi16(r_xmm4, 0xd8);
-  r_xmm0 = _mm_madd_epi16(r_xmm0, *((__m128i *)&pTab_i_04[24]));
-  r_xmm5 = _mm_shuffle_epi32(r_xmm4, 0);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm4, 0xaa);
-  r_xmm5 = _mm_madd_epi16(r_xmm5, *((__m128i *)&pTab_i_26[0]));
-  r_xmm1 = _mm_add_epi32(r_xmm1, r_xmm2);
-  r_xmm2 = r_xmm1;
-  r_xmm7 = _mm_shuffle_epi32(r_xmm4, 0x55);
-  r_xmm6 = _mm_madd_epi16(r_xmm6, *((__m128i *)&pTab_i_26[8]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm3);
-  r_xmm4 = _mm_shuffle_epi32(r_xmm4, 0xff);
-  r_xmm2 = _mm_sub_epi32(r_xmm2, r_xmm0);
-  r_xmm7 = _mm_madd_epi16(r_xmm7, *((__m128i *)&pTab_i_26[16]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm1);
-  r_xmm2 = _mm_srai_epi32(r_xmm2, 12);
-  r_xmm5 = _mm_add_epi32(r_xmm5, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_madd_epi16(r_xmm4, *((__m128i *)&pTab_i_26[24]));
-  r_xmm5 = _mm_add_epi32(r_xmm5, r_xmm6);
-  r_xmm6 = r_xmm5;
-  r_xmm0 = _mm_srai_epi32(r_xmm0, 12);
-  r_xmm2 = _mm_shuffle_epi32(r_xmm2, 0x1b);
-  row3 = _mm_packs_epi32(r_xmm0, r_xmm2);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm7);
-  r_xmm6 = _mm_sub_epi32(r_xmm6, r_xmm4);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm5);
-  r_xmm6 = _mm_srai_epi32(r_xmm6, 12);
-  r_xmm4 = _mm_srai_epi32(r_xmm4, 12);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm6, 0x1b);
-  row1 = _mm_packs_epi32(r_xmm4, r_xmm6);
-
-  // Row 6 and row 8
-  r_xmm0 = _mm_load_si128((__m128i *)(&pInput[5 * 8]));
-  r_xmm4 = _mm_load_si128((__m128i *)(&pInput[7 * 8]));
-
-  r_xmm0 = _mm_shufflelo_epi16(r_xmm0, 0xd8);
-  r_xmm1 = _mm_shuffle_epi32(r_xmm0, 0);
-  r_xmm1 = _mm_madd_epi16(r_xmm1, *((__m128i *)pTab_i_04));
-  r_xmm3 = _mm_shuffle_epi32(r_xmm0, 0x55);
-  r_xmm0 = _mm_shufflehi_epi16(r_xmm0, 0xd8);
-  r_xmm3 = _mm_madd_epi16(r_xmm3, *((__m128i *)&pTab_i_04[16]));
-  r_xmm2 = _mm_shuffle_epi32(r_xmm0, 0xaa);
-  r_xmm0 = _mm_shuffle_epi32(r_xmm0, 0xff);
-  r_xmm2 = _mm_madd_epi16(r_xmm2, *((__m128i *)&pTab_i_04[8]));
-  r_xmm4 = _mm_shufflehi_epi16(r_xmm4, 0xd8);
-  r_xmm1 = _mm_add_epi32(r_xmm1, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_shufflelo_epi16(r_xmm4, 0xd8);
-  r_xmm0 = _mm_madd_epi16(r_xmm0, *((__m128i *)&pTab_i_04[24]));
-  r_xmm5 = _mm_shuffle_epi32(r_xmm4, 0);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm4, 0xaa);
-  r_xmm5 = _mm_madd_epi16(r_xmm5, *((__m128i *)&pTab_i_26[0]));
-  r_xmm1 = _mm_add_epi32(r_xmm1, r_xmm2);
-  r_xmm2 = r_xmm1;
-  r_xmm7 = _mm_shuffle_epi32(r_xmm4, 0x55);
-  r_xmm6 = _mm_madd_epi16(r_xmm6, *((__m128i *)&pTab_i_26[8]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm3);
-  r_xmm4 = _mm_shuffle_epi32(r_xmm4, 0xff);
-  r_xmm2 = _mm_sub_epi32(r_xmm2, r_xmm0);
-  r_xmm7 = _mm_madd_epi16(r_xmm7, *((__m128i *)&pTab_i_26[16]));
-  r_xmm0 = _mm_add_epi32(r_xmm0, r_xmm1);
-  r_xmm2 = _mm_srai_epi32(r_xmm2, 12);
-  r_xmm5 = _mm_add_epi32(r_xmm5, *((__m128i *)shortM128_round_inv_row));
-  r_xmm4 = _mm_madd_epi16(r_xmm4, *((__m128i *)&pTab_i_26[24]));
-  r_xmm5 = _mm_add_epi32(r_xmm5, r_xmm6);
-  r_xmm6 = r_xmm5;
-  r_xmm0 = _mm_srai_epi32(r_xmm0, 12);
-  r_xmm2 = _mm_shuffle_epi32(r_xmm2, 0x1b);
-  row5 = _mm_packs_epi32(r_xmm0, r_xmm2);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm7);
-  r_xmm6 = _mm_sub_epi32(r_xmm6, r_xmm4);
-  r_xmm4 = _mm_add_epi32(r_xmm4, r_xmm5);
-  r_xmm6 = _mm_srai_epi32(r_xmm6, 12);
-  r_xmm4 = _mm_srai_epi32(r_xmm4, 12);
-  r_xmm6 = _mm_shuffle_epi32(r_xmm6, 0x1b);
-  row7 = _mm_packs_epi32(r_xmm4, r_xmm6);
-
-  r_xmm1 = _mm_load_si128((__m128i *)shortM128_tg_3_16);
-  r_xmm2 = row5;
-  r_xmm3 = row3;
-  r_xmm0 = _mm_mulhi_epi16(row5, r_xmm1);
-
-  r_xmm1 = _mm_mulhi_epi16(r_xmm1, r_xmm3);
-  r_xmm5 = _mm_load_si128((__m128i *)shortM128_tg_1_16);
-  r_xmm6 = row7;
-  r_xmm4 = _mm_mulhi_epi16(row7, r_xmm5);
-
-  r_xmm0 = _mm_adds_epi16(r_xmm0, r_xmm2);
-  r_xmm5 = _mm_mulhi_epi16(r_xmm5, row1);
-  r_xmm1 = _mm_adds_epi16(r_xmm1, r_xmm3);
-  r_xmm7 = row6;
-
-  r_xmm0 = _mm_adds_epi16(r_xmm0, r_xmm3);
-  r_xmm3 = _mm_load_si128((__m128i *)shortM128_tg_2_16);
-  r_xmm2 = _mm_subs_epi16(r_xmm2, r_xmm1);
-  r_xmm7 = _mm_mulhi_epi16(r_xmm7, r_xmm3);
-  r_xmm1 = r_xmm0;
-  r_xmm3 = _mm_mulhi_epi16(r_xmm3, row2);
-  r_xmm5 = _mm_subs_epi16(r_xmm5, r_xmm6);
-  r_xmm4 = _mm_adds_epi16(r_xmm4, row1);
-  r_xmm0 = _mm_adds_epi16(r_xmm0, r_xmm4);
-  r_xmm0 = _mm_adds_epi16(r_xmm0, *((__m128i *)shortM128_one_corr));
-  r_xmm4 = _mm_subs_epi16(r_xmm4, r_xmm1);
-  r_xmm6 = r_xmm5;
-  r_xmm5 = _mm_subs_epi16(r_xmm5, r_xmm2);
-  r_xmm5 = _mm_adds_epi16(r_xmm5, *((__m128i *)shortM128_one_corr));
-  r_xmm6 = _mm_adds_epi16(r_xmm6, r_xmm2);
-
-  // Intermediate results, needed later
-  __m128i temp3, temp7;
-  temp7 = r_xmm0;
-
-  r_xmm1 = r_xmm4;
-  r_xmm0 = _mm_load_si128((__m128i *)shortM128_cos_4_16);
-  r_xmm4 = _mm_adds_epi16(r_xmm4, r_xmm5);
-  r_xmm2 = _mm_load_si128((__m128i *)shortM128_cos_4_16);
-  r_xmm2 = _mm_mulhi_epi16(r_xmm2, r_xmm4);
-
-  // Intermediate results, needed later
-  temp3 = r_xmm6;
-
-  r_xmm1 = _mm_subs_epi16(r_xmm1, r_xmm5);
-  r_xmm7 = _mm_adds_epi16(r_xmm7, row2);
-  r_xmm3 = _mm_subs_epi16(r_xmm3, row6);
-  r_xmm6 = row0;
-  r_xmm0 = _mm_mulhi_epi16(r_xmm0, r_xmm1);
-  r_xmm5 = row4;
-  r_xmm5 = _mm_adds_epi16(r_xmm5, r_xmm6);
-  r_xmm6 = _mm_subs_epi16(r_xmm6, row4);
-  r_xmm4 = _mm_adds_epi16(r_xmm4, r_xmm2);
-
-  r_xmm4 = _mm_or_si128(r_xmm4, *((__m128i *)shortM128_one_corr));
-  r_xmm0 = _mm_adds_epi16(r_xmm0, r_xmm1);
-  r_xmm0 = _mm_or_si128(r_xmm0, *((__m128i *)shortM128_one_corr));
-
-  r_xmm2 = r_xmm5;
-  r_xmm5 = _mm_adds_epi16(r_xmm5, r_xmm7);
-  r_xmm1 = r_xmm6;
-  r_xmm5 = _mm_adds_epi16(r_xmm5, *((__m128i *)shortM128_round_inv_col));
-  r_xmm2 = _mm_subs_epi16(r_xmm2, r_xmm7);
-  r_xmm7 = temp7;
-  r_xmm6 = _mm_adds_epi16(r_xmm6, r_xmm3);
-  r_xmm6 = _mm_adds_epi16(r_xmm6, *((__m128i *)shortM128_round_inv_col));
-  r_xmm7 = _mm_adds_epi16(r_xmm7, r_xmm5);
-  r_xmm7 = _mm_srai_epi16(r_xmm7, SHIFT_INV_COL);
-  r_xmm1 = _mm_subs_epi16(r_xmm1, r_xmm3);
-  r_xmm1 = _mm_adds_epi16(r_xmm1, *((__m128i *)shortM128_round_inv_corr));
-  r_xmm3 = r_xmm6;
-  r_xmm2 = _mm_adds_epi16(r_xmm2, *((__m128i *)shortM128_round_inv_corr));
-  r_xmm6 = _mm_adds_epi16(r_xmm6, r_xmm4);
-
-  // Store results for row 0
-  //_mm_store_si128((__m128i *) pOutput, r_xmm7);
-  __m128i r0 = r_xmm7;
-
-  r_xmm6 = _mm_srai_epi16(r_xmm6, SHIFT_INV_COL);
-  r_xmm7 = r_xmm1;
-  r_xmm1 = _mm_adds_epi16(r_xmm1, r_xmm0);
-
-  // Store results for row 1
-  //_mm_store_si128((__m128i *) (&pOutput[1*8]), r_xmm6);
-  __m128i r1 = r_xmm6;
-
-  r_xmm1 = _mm_srai_epi16(r_xmm1, SHIFT_INV_COL);
-  r_xmm6 = temp3;
-  r_xmm7 = _mm_subs_epi16(r_xmm7, r_xmm0);
-  r_xmm7 = _mm_srai_epi16(r_xmm7, SHIFT_INV_COL);
-
-  // Store results for row 2
-  //_mm_store_si128((__m128i *) (&pOutput[2*8]), r_xmm1);
-  __m128i r2 = r_xmm1;
-
-  r_xmm5 = _mm_subs_epi16(r_xmm5, temp7);
-  r_xmm5 = _mm_srai_epi16(r_xmm5, SHIFT_INV_COL);
-
-  // Store results for row 7
-  //_mm_store_si128((__m128i *) (&pOutput[7*8]), r_xmm5);
-  __m128i r7 = r_xmm5;
-
-  r_xmm3 = _mm_subs_epi16(r_xmm3, r_xmm4);
-  r_xmm6 = _mm_adds_epi16(r_xmm6, r_xmm2);
-  r_xmm2 = _mm_subs_epi16(r_xmm2, temp3);
-  r_xmm6 = _mm_srai_epi16(r_xmm6, SHIFT_INV_COL);
-  r_xmm2 = _mm_srai_epi16(r_xmm2, SHIFT_INV_COL);
-
-  // Store results for row 3
-  //_mm_store_si128((__m128i *) (&pOutput[3*8]), r_xmm6);
-  __m128i r3 = r_xmm6;
-
-  r_xmm3 = _mm_srai_epi16(r_xmm3, SHIFT_INV_COL);
-
-  // Store results for rows 4, 5, and 6
-  //_mm_store_si128((__m128i *) (&pOutput[4*8]), r_xmm2);
-  //_mm_store_si128((__m128i *) (&pOutput[5*8]), r_xmm7);
-  //_mm_store_si128((__m128i *) (&pOutput[6*8]), r_xmm3);
-
-  __m128i r4 = r_xmm2;
-  __m128i r5 = r_xmm7;
-  __m128i r6 = r_xmm3;
-
-  r0 = _mm_add_epi16(*(const __m128i *)shortM128_128, r0);
-  r1 = _mm_add_epi16(*(const __m128i *)shortM128_128, r1);
-  r2 = _mm_add_epi16(*(const __m128i *)shortM128_128, r2);
-  r3 = _mm_add_epi16(*(const __m128i *)shortM128_128, r3);
-  r4 = _mm_add_epi16(*(const __m128i *)shortM128_128, r4);
-  r5 = _mm_add_epi16(*(const __m128i *)shortM128_128, r5);
-  r6 = _mm_add_epi16(*(const __m128i *)shortM128_128, r6);
-  r7 = _mm_add_epi16(*(const __m128i *)shortM128_128, r7);
-
-  ((__m128i *)pOutputUB)[0] = _mm_packus_epi16(r0, r1);
-  ((__m128i *)pOutputUB)[1] = _mm_packus_epi16(r2, r3);
-  ((__m128i *)pOutputUB)[2] = _mm_packus_epi16(r4, r5);
-  ((__m128i *)pOutputUB)[3] = _mm_packus_epi16(r6, r7);
-}

include/renderd7/external/jpge.h

@@ -1,186 +0,0 @@
-// jpge.h - C++ class for JPEG compression.
-// Public Domain or Apache 2.0, Richard Geldreich <richgel99@gmail.com>
-// Alex Evans: Added RGBA support, linear memory allocator.
-#ifndef JPEG_ENCODER_H
-#define JPEG_ENCODER_H
-
-namespace jpge {
-typedef unsigned char uint8;
-typedef signed short int16;
-typedef signed int int32;
-typedef unsigned short uint16;
-typedef unsigned int uint32;
-typedef unsigned int uint;
-
-// JPEG chroma subsampling factors. Y_ONLY (grayscale images) and H2V2 (color
-// images) are the most common.
-enum subsampling_t { Y_ONLY = 0, H1V1 = 1, H2V1 = 2, H2V2 = 3 };
-
-// JPEG compression parameters structure.
-struct params {
-  inline params()
-      : m_quality(85), m_subsampling(H2V2), m_no_chroma_discrim_flag(false),
-        m_two_pass_flag(false), m_use_std_tables(false) {}
-
-  inline bool check() const {
-    if ((m_quality < 1) || (m_quality > 100))
-      return false;
-    if ((uint)m_subsampling > (uint)H2V2)
-      return false;
-    return true;
-  }
-
-  // Quality: 1-100, higher is better. Typical values are around 50-95.
-  int m_quality;
-
-  // m_subsampling:
-  // 0 = Y (grayscale) only
-  // 1 = YCbCr, no subsampling (H1V1, YCbCr 1x1x1, 3 blocks per MCU)
-  // 2 = YCbCr, H2V1 subsampling (YCbCr 2x1x1, 4 blocks per MCU)
-  // 3 = YCbCr, H2V2 subsampling (YCbCr 4x1x1, 6 blocks per MCU-- very common)
-  subsampling_t m_subsampling;
-
-  // Disables CbCr discrimination - only intended for testing.
-  // If true, the Y quantization table is also used for the CbCr channels.
-  bool m_no_chroma_discrim_flag;
-
-  bool m_two_pass_flag;
-
-  // By default we use the same quantization tables as mozjpeg's default.
-  // Set to true to use the traditional tables from JPEG Annex K.
-  bool m_use_std_tables;
-};
-
-// Writes JPEG image to a file.
-// num_channels must be 1 (Y) or 3 (RGB), image pitch must be
-// width*num_channels.
-bool compress_image_to_jpeg_file(const char *pFilename, int width, int height,
-                                 int num_channels, const uint8 *pImage_data,
-                                 const params &comp_params = params());
-
-// Writes JPEG image to memory buffer.
-// On entry, buf_size is the size of the output buffer pointed at by pBuf, which
-// should be at least ~1024 bytes. If return value is true, buf_size will be set
-// to the size of the compressed data.
-bool compress_image_to_jpeg_file_in_memory(
-    void *pBuf, int &buf_size, int width, int height, int num_channels,
-    const uint8 *pImage_data, const params &comp_params = params());
-
-// Output stream abstract class - used by the jpeg_encoder class to write to the
-// output stream. put_buf() is generally called with len==JPGE_OUT_BUF_SIZE
-// bytes, but for headers it'll be called with smaller amounts.
-class output_stream {
-public:
-  virtual ~output_stream(){};
-  virtual bool put_buf(const void *Pbuf, int len) = 0;
-  template <class T> inline bool put_obj(const T &obj) {
-    return put_buf(&obj, sizeof(T));
-  }
-};
-
-// Lower level jpeg_encoder class - useful if more control is needed than the
-// above helper functions.
-class jpeg_encoder {
-public:
-  jpeg_encoder();
-  ~jpeg_encoder();
-
-  // Initializes the compressor.
-  // pStream: The stream object to use for writing compressed data.
-  // params - Compression parameters structure, defined above.
-  // width, height  - Image dimensions.
-  // channels - May be 1, or 3. 1 indicates grayscale, 3 indicates RGB source
-  // data. Returns false on out of memory or if a stream write fails.
-  bool init(output_stream *pStream, int width, int height, int src_channels,
-            const params &comp_params = params());
-
-  const params &get_params() const { return m_params; }
-
-  // Deinitializes the compressor, freeing any allocated memory. May be called
-  // at any time.
-  void deinit();
-
-  uint get_total_passes() const { return m_params.m_two_pass_flag ? 2 : 1; }
-  inline uint get_cur_pass() { return m_pass_num; }
-
-  // Call this method with each source scanline.
-  // width * src_channels bytes per scanline is expected (RGB or Y format).
-  // You must call with NULL after all scanlines are processed to finish
-  // compression. Returns false on out of memory or if a stream write fails.
-  bool process_scanline(const void *pScanline);
-
-private:
-  jpeg_encoder(const jpeg_encoder &);
-  jpeg_encoder &operator=(const jpeg_encoder &);
-
-  typedef int32 sample_array_t;
-
-  output_stream *m_pStream;
-  params m_params;
-  uint8 m_num_components;
-  uint8 m_comp_h_samp[3], m_comp_v_samp[3];
-  int m_image_x, m_image_y, m_image_bpp, m_image_bpl;
-  int m_image_x_mcu, m_image_y_mcu;
-  int m_image_bpl_xlt, m_image_bpl_mcu;
-  int m_mcus_per_row;
-  int m_mcu_x, m_mcu_y;
-  uint8 *m_mcu_lines[16];
-  uint8 m_mcu_y_ofs;
-  sample_array_t m_sample_array[64];
-  int16 m_coefficient_array[64];
-  int32 m_quantization_tables[2][64];
-  uint m_huff_codes[4][256];
-  uint8 m_huff_code_sizes[4][256];
-  uint8 m_huff_bits[4][17];
-  uint8 m_huff_val[4][256];
-  uint32 m_huff_count[4][256];
-  int m_last_dc_val[3];
-  enum { JPGE_OUT_BUF_SIZE = 2048 };
-  uint8 m_out_buf[JPGE_OUT_BUF_SIZE];
-  uint8 *m_pOut_buf;
-  uint m_out_buf_left;
-  uint32 m_bit_buffer;
-  uint m_bits_in;
-  uint8 m_pass_num;
-  bool m_all_stream_writes_succeeded;
-
-  void optimize_huffman_table(int table_num, int table_len);
-  void emit_byte(uint8 i);
-  void emit_word(uint i);
-  void emit_marker(int marker);
-  void emit_jfif_app0();
-  void emit_dqt();
-  void emit_sof();
-  void emit_dht(uint8 *bits, uint8 *val, int index, bool ac_flag);
-  void emit_dhts();
-  void emit_sos();
-  void emit_markers();
-  void compute_huffman_table(uint *codes, uint8 *code_sizes, uint8 *bits,
-                             uint8 *val);
-  void compute_quant_table(int32 *dst, int16 *src);
-  void adjust_quant_table(int32 *dst, int32 *src);
-  void first_pass_init();
-  bool second_pass_init();
-  bool jpg_open(int p_x_res, int p_y_res, int src_channels);
-  void load_block_8_8_grey(int x);
-  void load_block_8_8(int x, int y, int c);
-  void load_block_16_8(int x, int c);
-  void load_block_16_8_8(int x, int c);
-  void load_quantized_coefficients(int component_num);
-  void flush_output_buffer();
-  void put_bits(uint bits, uint len);
-  void code_coefficients_pass_one(int component_num);
-  void code_coefficients_pass_two(int component_num);
-  void code_block(int component_num);
-  void process_mcu_row();
-  bool terminate_pass_one();
-  bool terminate_pass_two();
-  bool process_end_of_image();
-  void load_mcu(const void *src);
-  void clear();
-  void init();
-};
-
-} // namespace jpge
-
-#endif // JPEG_ENCODER