Codebase of 0.9.5 26.06.2024 found on my OneDrive

Replace Toasts with ToastsV2
(MessageHandler)

.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
+...
+

.gitignore

@@ -2,3 +2,5 @@ release/
 debug/
 lib/
 *.bz2
+rd7le/
+*.DS_Store*

.vscode/c_cpp_properties.json

@@ -0,0 +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
+} 

.vscode/launch.json

@@ -0,0 +1,115 @@
+{
+    "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",
+            "miDebuggerPath": "/opt/devkitPro/devkitARM/bin/arm-none-eabi-gdb",
+            "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",
+            "miDebuggerPath": "/opt/devkitPro/devkitARM/bin/arm-none-eabi-gdb",
+            "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

@@ -0,0 +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",
+        "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"
+    }
+}

CHANGELOG.md

@@ -0,0 +1,98 @@
+# RenderD7 Changelog
+## 0.9.5
+- Remove Npi Intro and NVID Api
+- Replace Toasts System with Message 
+- Lots of Optimisations
+- Added GetTime
+- Implement Draw2 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
+- Added Music Player (MP3, Vorbis)
+- Rewrite of RenderD7::Image
+- Internal Debugger/Database (IDB)
+- Removed BitmapPrinter
+- Added nimg and nimg_engine
+- Removed Old Error/Message Handler
+- GetTextSize (extra buffer) + New TextShorter
+## 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

Doxyfile

@@ -39,7 +39,7 @@ PROJECT_NAME           = Renderd7-nightly
 # control system is used.
 
 
-PROJECT_NUMBER         = "v0.7.0"
+PROJECT_NUMBER         = "v0.9.3"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Makefile

@@ -9,8 +9,8 @@ endif
 include $(DEVKITARM)/3ds_rules
 
 export renderd7_MAJOR	:= 0
-export renderd7_MINOR	:= 8
+export renderd7_MINOR	:= 9
-export renderd7_PATCH	:= 0
+export renderd7_PATCH	:= 4
 
 VERSION	:=	$(renderd7_MAJOR).$(renderd7_MINOR).$(renderd7_PATCH)
 
@@ -32,7 +32,7 @@ TIME_TIME := $(shell date --iso=seconds)
 # INCLUDES is a list of directories containing header files
 #---------------------------------------------------------------------------------
 TARGET		:=	renderd7
-SOURCES		:=	source external/source external/libnsbmp/source
+SOURCES		:=	source source/external source/music
 DATA		:=	data
 INCLUDES	:=	include
 
@@ -41,9 +41,9 @@ INCLUDES	:=	include
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
 
-CFLAGS	:=	-g -Wall -Werror -mword-relocations -save-temps\
+CFLAGS	:=	-g -Wall -mword-relocations -save-temps\
-			-DV_STRING=\"$(GIT_VER)\" \
+			-DV_RD7CSTRING=\"$(GIT_VER)\" \
-			-DV_TIME=\"$(TIME_TIME)\" \
+			-DV_RD7BTIME=\"$(TIME_TIME)\" \
 			-ffunction-sections -fdata-sections \
 			$(ARCH) $(BUILD_CFLAGS)
 
@@ -112,17 +112,13 @@ doc:
 	@doxygen Doxyfile
 
 dist-bin: all
-	@tar --exclude=*~ -cjf $(TARGET)-$(VERSION).tar.bz2 include lib
+	@tar --exclude=*~ -cjf $(TARGET).tar.bz2 include lib
 
 dist-src:
-	@tar --exclude=*~ -cjf $(TARGET)-src-$(VERSION).tar.bz2 include $(SOURCES) Makefile
+	@tar --exclude=*~ -cjf $(TARGET)-src.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 $@
 

README.md

@@ -1,18 +1,58 @@
-# RenderD7
+# <img alt="LOGO" src="https://github.com/NPI-D7/RenderD7/raw/main/logo.png" height="90">
 RenderD7 is now LibRenderD7.
-### Installation (Ubuntu)
+### Installation
-first run this
+Download a Package From Releses Page
-`sudo su`
+`https://github.com/NPI-D7/RenderD7/releases/download/v0.9.4/renderd7.tar.bz2 -o renderd7.tar.bz2`
-then this
+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
 ```
-git clone https://github.com/NPI-D7/RenderD7.git
+LIBS	:= -lrenderd7 -lcurl -lstdc++ -lm -lcitro2d -lcitro3d -lctru
-cd RenderD7
+#---------------------------------------------------------------------------------
-export DEVKITARM=/opt/devkitpro/devkitARM/
+# list of directories containing libraries, this must be the top level containing
-export DEVKITPRO=/opt/devkitpro/
+# include and lib
-make install
+#---------------------------------------------------------------------------------
+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
+```
+# Back to Old Usage aka Submodule (0.9.5+)
+If you want to use RenderD7 as Submodule run
+`git submodule add https://github.com/NPI-D7/RenderD7`
 
-# RenderD7 (https://npi-d7.github.io/RenderD7/)
+And to Use Add this to make file
-Simple and Easey to use UI and Graphics helper.
+```
-Create DOCS
+# Make Sure to Change this paths if your Submodule
+# is located somewhere else
+RENDERD7_SRC := RenderD7/source RenderD7/external
+RENDERD7_INC := RenderD7/include
+```
+Now you need to add it to your sources and includes
+```
+SOURCES		:=	source $(RENDERD7_SRC)
+INCLUDES	:=	source $(RENDERD7_INC)
+```
+Example from rd7tf
+# Credits
+- NPI-D7
+  - Tobi-D7 Main Dev
+
+Some Icons are From
+https://icons8.de/
+See Subfolder Readmes

assets/build_assets.sh

@@ -0,0 +1,31 @@
+#!/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 "Fix The Output of file2array"
+for file in ./*.cpp
+do
+    ../../tools/bin/rd7f2afix "${file}" "renderd7"
+done
+echo "Finished!"

assets/clear_assets.sh

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

assets/resources/renderd7_logo.t3s

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

cformat.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+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

envsetup.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+#Build Tools
+echo "Build Tools..."
+cd tools
+./build_tools.sh
+cd ..
+#Setup asset-arrays
+echo "Generate Asset-Arrays..."
+cd assets
+./build_assets.sh
+echo "Update Files in RenderD7..."
+cp -rf code/*.cpp ../source/
+cp -rf code/*.hpp ../include/renderd7/
+echo "Clean Assets..."
+./clear_assets.sh
+cd ..
+#Clear Tools
+echo "Clean Tools..."
+cd tools
+./clear_tools.sh
+cd ..
+#Finished
+echo "Done!"

external/libnsbmp/COPYING

@@ -1,20 +0,0 @@
-Copyright (C) 2006 Richard Wilson
-Copyright (C) 2008 Sean Fox
-
-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.

external/source/fs.c

@@ -1,386 +0,0 @@
-#include <renderd7/external/fs.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <stdlib.h>
-
-#define WORKING_DIR	"/"
-
-void Utils_U8_To_U16(u16 *buf, const u8 *input, size_t bufsize) {
-	ssize_t units = utf8_to_utf16(buf, input, bufsize);
-
-	if (units < 0)
-		units = 0;
-
-	buf[units] = 0;
-}
-
-FS_Archive archive, sdmc_archive, nand_archive;
-
-Result FS_OpenArchive(FS_Archive *archive, FS_ArchiveID archiveID) {
-	Result ret = 0;
-
-	if (R_FAILED(ret = FSUSER_OpenArchive(archive, archiveID, fsMakePath(PATH_EMPTY, ""))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_CloseArchive(FS_Archive archive) {
-	Result ret = 0;
-
-	if (R_FAILED(ret = FSUSER_CloseArchive(archive)))
-		return ret;
-
-	return 0;
-}
-
-Result FS_OpenDir(Handle *handle, FS_Archive archive, const char *path) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_OpenDirectory(handle, archive, fsMakePath(PATH_UTF16, path_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_OpenFile(Handle *handle, FS_Archive archive, const char *path, u32 flags, u32 attributes) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_OpenFile(handle, archive, fsMakePath(PATH_UTF16, path_u16), flags, attributes)))
-		return ret;
-
-	return 0;
-}
-
-Result FS_MakeDir(FS_Archive archive, const char *path) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_CreateDirectory(archive, fsMakePath(PATH_UTF16, path_u16), 0)))
-		return ret;
-
-	return 0;
-}
-
-Result FS_CreateFile(FS_Archive archive, const char *path, u64 size) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_CreateFile(archive, fsMakePath(PATH_UTF16, path_u16), 0, size)))
-		return ret;
-
-	return 0;
-}
-
-Result FS_RecursiveMakeDir(FS_Archive archive, const char *path) {
-	Result ret = 0;
-	char buf[256];
-	char *p = NULL;
-	size_t len;
-
-	snprintf(buf, sizeof(buf), "%s", path);
-	len = strlen(buf);
-
-	if (buf[len - 1] == '/')
-		buf[len - 1] = 0;
-
-	for (p = buf + 1; *p; p++) {
-		if (*p == '/') {
-			*p = 0;
-
-			if (!FS_DirExists(archive, buf))
-				ret = FS_MakeDir(archive, buf);
-
-			*p = '/';
-		}
-
-		if (!FS_DirExists(archive, buf))
-			ret = FS_MakeDir(archive, buf);
-	}
-
-	return ret;
-}
-
-bool FS_FileExists(FS_Archive archive, const char *path) {
-	Handle handle;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_UTF16, path_u16), FS_OPEN_READ, 0)))
-		return false;
-
-	if (R_FAILED(FSFILE_Close(handle)))
-		return false;
-
-	return true;
-}
-
-bool FS_DirExists(FS_Archive archive, const char *path) {
-	Handle handle;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(FSUSER_OpenDirectory(&handle, archive, fsMakePath(PATH_UTF16, path_u16))))
-		return false;
-
-	if (R_FAILED(FSDIR_Close(handle)))
-		return false;
-
-	return true;
-}
-
-Result FS_GetFileSize(FS_Archive archive, const char *path, u64 *size) {
-	Result ret = 0;
-	Handle handle;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_UTF16, path_u16), FS_OPEN_READ, 0)))
-		return ret;
-
-	if (R_FAILED(ret = FSFILE_GetSize(handle, size))) {
-		FSFILE_Close(handle);
-		return ret;
-	}
-
-	if (R_FAILED(ret = FSFILE_Close(handle)))
-		return ret;
-
-	return 0;
-}
-
-u64 FS_GetFreeStorage(FS_SystemMediaType media_type) {
-	FS_ArchiveResource resource = {0};
-
-	if (R_SUCCEEDED(FSUSER_GetArchiveResource(&resource, media_type)))
-		return (((u64)resource.freeClusters * (u64)resource.clusterSize));
-
-	return 0;
-}
-
-u64 FS_GetTotalStorage(FS_SystemMediaType media_type) {
-	FS_ArchiveResource resource = {0};
-
-	if (R_SUCCEEDED(FSUSER_GetArchiveResource(&resource, media_type)))
-		return (((u64)resource.totalClusters * (u64)resource.clusterSize));
-
-	return 0;
-}
-
-u64 FS_GetUsedStorage(FS_SystemMediaType media_type) {
-	return 0;//(FS_GetTotalStorage(media_type) - FS_GetUsedStorage(media_type));
-}
-
-Result FS_RemoveFile(FS_Archive archive, const char *path) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_DeleteFile(archive, fsMakePath(PATH_UTF16, path_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_RemoveDir(FS_Archive archive, const char *path) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_DeleteDirectory(archive, fsMakePath(PATH_UTF16, path_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_RemoveDirRecursive(FS_Archive archive, const char *path) {
-	Result ret = 0;
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_DeleteDirectoryRecursively(archive, fsMakePath(PATH_UTF16, path_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_RenameFile(FS_Archive archive, const char *old_filename, const char *new_filename) {
-	Result ret = 0;
-
-	u16 old_filename_u16[strlen(old_filename) + 1];
-	Utils_U8_To_U16(old_filename_u16, (const u8 *)old_filename, strlen(old_filename) + 1);
-
-	u16 new_filename_u16[strlen(new_filename) + 1];
-	Utils_U8_To_U16(new_filename_u16, (const u8 *)new_filename, strlen(new_filename) + 1);
-
-	if (R_FAILED(ret = FSUSER_RenameFile(archive, fsMakePath(PATH_UTF16, old_filename_u16), archive, fsMakePath(PATH_UTF16, new_filename_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_RenameDir(FS_Archive archive, const char *old_dirname, const char *new_dirname) {
-	Result ret = 0;
-
-	u16 old_dirname_u16[strlen(old_dirname) + 1];
-	Utils_U8_To_U16(old_dirname_u16, (const u8 *)old_dirname, strlen(old_dirname) + 1);
-
-	u16 new_dirname_u16[strlen(new_dirname) + 1];
-	Utils_U8_To_U16(new_dirname_u16, (const u8 *)new_dirname, strlen(new_dirname) + 1);
-
-	if (R_FAILED(ret = FSUSER_RenameDirectory(archive, fsMakePath(PATH_UTF16, old_dirname_u16), archive, fsMakePath(PATH_UTF16, new_dirname_u16))))
-		return ret;
-
-	return 0;
-}
-
-Result FS_Read(FS_Archive archive, const char *path, u64 size, void *buf) {
-	Result ret = 0;
-	Handle handle;
-
-	u32 bytes_read = 0;
-
-	if (R_FAILED(ret = FS_OpenFile(&handle, archive, path, FS_OPEN_READ, 0)))
-		return ret;
-
-	if (R_FAILED(ret = FSFILE_Read(handle, &bytes_read, 0, buf, size))) {
-		FSFILE_Close(handle);
-		return ret;
-	}
-
-	if (R_FAILED(ret = FSFILE_Close(handle)))
-		return ret;
-
-	return 0;
-}
-
-Result FS_Write(FS_Archive archive, const char *path, const void *buf, u32 size) {
-	Result ret = 0;
-	Handle handle;
-	u32 bytes_written = 0;
-
-	if (FS_FileExists(archive, path))
-		FS_RemoveFile(archive, path);
-
-	u16 path_u16[strlen(path) + 1];
-	Utils_U8_To_U16(path_u16, (const u8 *)path, strlen(path) + 1);
-
-	if (R_FAILED(ret = FSUSER_CreateFile(archive, fsMakePath(PATH_UTF16, path_u16), 0, size)))
-		return ret;
-
-	if (R_FAILED(ret = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_UTF16, path_u16), FS_OPEN_WRITE, 0)))
-		return ret;
-
-	if (R_FAILED(ret = FSFILE_Write(handle, &bytes_written, 0, buf, size, FS_WRITE_FLUSH))) {
-		FSFILE_Close(handle);
-		return ret;
-	}
-
-	if (R_FAILED(ret = FSFILE_Close(handle)))
-		return ret;
-
-	return 0;
-}
-
-char *FS_GetFileTimestamp(const char *path) {
-	static char timeStr[60];
-	u64 mtime = 0;
-
-	if (R_SUCCEEDED(archive_getmtime(path, &mtime))) {
-		time_t mt = mtime;
-		struct tm *timeStruct = gmtime(&mt);
-
-		int hours = timeStruct->tm_hour;
-		int minutes = timeStruct->tm_min;
-
-		int day = timeStruct->tm_mday;
-		int month = timeStruct->tm_mon + 1; // January being 0
-		int year = timeStruct->tm_year + 1900;
-
-		snprintf(timeStr, 60, "%d/%d/%d %2i:%02i", year, month, day, hours, minutes);
-	}
-	else
-		return NULL;
-
-	return timeStr;
-}
-
-FS_Path getPathInfo(const char * path, FS_ArchiveID * archive) {
-	*archive = ARCHIVE_SDMC;
-	FS_Path filePath = {0};
-	unsigned int prefixlen = 0;
-
-	if (!strncmp(path, "sdmc:/", 6)) {
-		prefixlen = 5;
-	} else if (*path != '/') {
-		//if the path is local (doesnt start with a slash), it needs to be appended to the working dir to be valid
-		char * actualPath = NULL;
-		asprintf(&actualPath, "%s%s", WORKING_DIR, path);
-		filePath = fsMakePath(PATH_ASCII, actualPath);
-		free(actualPath);
-	}
-
-	//if the filePath wasnt set above, set it
-	if (filePath.size == 0) {
-		filePath = fsMakePath(PATH_ASCII, path+prefixlen);
-	}
-
-	return filePath;
-}
-Result makeDirs(const char * path) {
-	Result ret = 0;
-	FS_ArchiveID archiveID;
-	FS_Path filePath = getPathInfo(path, &archiveID);
-	FS_Archive archive;
-
-	ret = FSUSER_OpenArchive(&archive, archiveID, fsMakePath(PATH_EMPTY, ""));
-
-	for (char * slashpos = strchr(path+1, '/'); slashpos != NULL; slashpos = strchr(slashpos+1, '/')) {
-		char bak = *(slashpos);
-		*(slashpos) = '\0';
-		Handle dirHandle;
-
-		ret = FSUSER_OpenDirectory(&dirHandle, archive, filePath);
-		if (R_SUCCEEDED(ret))	FSDIR_Close(dirHandle);
-		else	ret = FSUSER_CreateDirectory(archive, filePath, FS_ATTRIBUTE_DIRECTORY);
-
-		*(slashpos) = bak;
-	}
-
-	FSUSER_CloseArchive(archive);
-
-	return ret;
-}
-
-Result openFile(Handle* fileHandle, const char * path, bool write) {
-	FS_ArchiveID archive;
-	FS_Path filePath = getPathInfo(path, &archive);
-	u32 flags = (write ? (FS_OPEN_CREATE | FS_OPEN_WRITE) : FS_OPEN_READ);
-
-	Result ret = 0;
-	ret = makeDirs(strdup(path));
-	ret = FSUSER_OpenFileDirectly(fileHandle, archive, fsMakePath(PATH_EMPTY, ""), filePath, flags, 0);
-	if (write)	ret = FSFILE_SetSize(*fileHandle, 0); //truncate the file to remove previous contents before writing
-
-	return ret;
-}

extlibs/external.md

@@ -1 +0,0 @@
-External Librarys

include/rd7.hpp

@@ -1,4 +1,16 @@
 #pragma once
 
-#include <renderd7/bmp.hpp>
+#include <renderd7/StealConsole.hpp>
 #include <renderd7/renderd7.hpp>
+#include <renderd7/sound.hpp>
+#include <renderd7/Message.hpp>
+#include <renderd7/DrawV2.hpp>
+#include <renderd7/Hid.hpp>
+#include <renderd7/UI7.hpp>
+#include <renderd7/FileSystem.hpp>
+#include <renderd7/Image.hpp>
+#include <renderd7/Timer.hpp>
+#include <renderd7/music/Music.hpp>
+#include <renderd7/nimg_engine.hpp>
+#include <renderd7/global_db.hpp>
+#include <renderd7/Error.hpp>

include/renderd7/Clock.hpp

@@ -1,23 +0,0 @@
-#pragma once
-#include <renderd7/Time.hpp>
-
-namespace rnd7 {
-    class Clock {
-    public:
-        Clock() {};
-
-        virtual ~Clock() {};
-
-        
-        virtual Time getCurrentTime() const { return Time{}; };
-
-        Time getElapsedTime() const;
-
-        Time restart();
-
-    protected:
-
-        Time m_startTime; ///< Time of last reset, in microseconds
-    };
-
-}

include/renderd7/Color.hpp

@@ -0,0 +1,169 @@
+#pragma once
+#include <unistd.h>
+
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <regex>
+#include <sstream>
+#include <string>
+
+#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)
+// it is actually not RGBA lol
+inline uint32_t RGBA8(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255) {
+#define ISIMPLEPAK(x, y) (((x) & 0xff) << y)
+  return (ISIMPLEPAK(r, 0) | ISIMPLEPAK(g, 8) | ISIMPLEPAK(b, 16) |
+          ISIMPLEPAK(a, 24));
+}
+
+/*#define RGBA8(r, g, b, a) \
+  ((((r)&0xFF) << 0) | (((g)&0xFF) << 8) | (((b)&0xFF) << 16) |                \
+   (((a)&0xFF) << 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,
+  RD7Color_SelectorFade,
+  RD7Color_List0,
+  RD7Color_List1,
+  RD7Color_MessageBackground,
+  RD7Color_Button,
+  RD7Color_ButtonHovered,
+  RD7Color_ButtonDisabled,
+  RD7Color_ButtonActive,
+  RD7Color_Checkmark,
+  RD7Color_FrameBg,
+  RD7Color_FrameBgHovered,
+  RD7Color_Progressbar,
+};
+
+namespace RenderD7 {
+unsigned int StyleColor(RD7Color color);
+void RedirectColor(RD7Color to, RD7Color from);
+void TextColorByBg(RD7Color background);
+/// @brief Customices a color until undone
+/// For example with RebderD7::Color::Hex
+void CustomizeColor(RD7Color color, unsigned int custom);
+/// @brief Completly changes a theme color
+void ColorNew(RD7Color color, unsigned int new_color);
+void UndoColorEdit(RD7Color color);
+void UndoAllColorEdits();
+namespace Color {
+/// @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 = 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) {
+    unsigned int col = RenderD7::StyleColor(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
+  uint32_t 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);
+  }
+
+  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

include/renderd7/DrawV2.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <citro2d.h>
+
+#include <renderd7/Color.hpp>
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/Image.hpp>
+#include <string>
+
+#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),
+};
+
+namespace RenderD7 {
+R7Vec2 GetTextDimensions(const std::string &text);
+void CustomTextSize(float size);
+void TextDefaultSize();
+std::string TextShort(const std::string& in, int max_len);
+// Overrite TextBox Size (by default Screenwidth x Text.h)
+void TextMaxBox(R7Vec2 size);
+void TextDefaultBox();
+void TextFont(C2D_Font fnt);
+void TextDefaultFont();
+namespace Draw2 {
+void Rect(R7Vec2 pos, R7Vec2 size, unsigned int color, int t = 1);
+void RectFilled(R7Vec2 pos, R7Vec2 size, Color4 colors);
+void RectFilledSolid(R7Vec2 pos, R7Vec2 size, unsigned int color);
+// Wrapper of RectFilledSolid
+inline void RFS(R7Vec2 pos, R7Vec2 size, unsigned int color) {
+  RectFilledSolid(pos, size, color);
+}
+void Line(R7Vec2 pos0, R7Vec2 pos1, unsigned int color, int t = 1);
+void Triangle(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, Color3 colors);
+void TriangleSolid(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, unsigned int color);
+// Beta and Very unstable
+void TriangleLined(R7Vec2 pos0, R7Vec2 pos1, R7Vec2 pos2, unsigned int color,
+                   int t = 1);
+void Text(R7Vec2 pos, const std::string& text, RD7TextFlags flags = 0);
+void Image(RenderD7::Image* img, const R7Vec2& pos = R7Vec2(0, 0), const R7Vec2& scale = R7Vec2(1, 1));
+} // namespace Draw2
+} // namespace RenderD7

include/renderd7/Error.hpp

@@ -0,0 +1,16 @@
+#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) {
+        std::string location = __FILE__ + std::string(":") + std::to_string(__LINE__);
+        if(v == false)
+            Error("Assert Failed:\n" + location + "\n" + msg);
+    }
+}

include/renderd7/FileSystem.hpp

@@ -0,0 +1,25 @@
+#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/FunctionTrace.hpp

@@ -0,0 +1,53 @@
+#pragma once
+// Base includes
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+// 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)
+  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(std::string group, std::string func_name) {
+  std::string trace_id = scomb(group, func_name);
+  rd7_traces[trace_id].group = group;
+  rd7_traces[trace_id].func_name = func_name;
+  rd7_traces[trace_id].time_start = svcGetSystemTick();
+}
+/// @brief Set an End TracePoint
+/// @param group Set a Group Name
+/// @param func_name Set a Function Name
+inline void End(std::string group, std::string func_name) {
+  std::string trace_id = scomb(group, func_name);
+  rd7_traces[trace_id].time_end = svcGetSystemTick();
+  rd7_traces[trace_id].time_of = static_cast<float>(
+      rd7_traces[trace_id].time_end / (float)TICKS_PER_MSEC -
+      rd7_traces[trace_id].time_start / (float)TICKS_PER_MSEC);
+}
+} // namespace Ftrace
+} // namespace RenderD7

include/renderd7/Hardware.hpp

@@ -0,0 +1,23 @@
+#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 float
+float 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();
+} // namespace Hardware
+} // namespace RenderD7

include/renderd7/Hid.hpp

@@ -0,0 +1,41 @@
+/// 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();
+void Update();
+// Lock/Unlock Input api for example for Keyboard
+void Lock();
+void Unlock();
+void Clear();
+} // namespace Hid
+} // namespace RenderD7

include/renderd7/Image.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <citro2d.h>
+#include <3ds.h>
+
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/nimg.hpp>
+
+#include <string>
+
+namespace RenderD7 {
+    class Image {
+        public:
+        Image();
+        ~Image();
+        void load(const std::string& path);
+        void from_nimg(const nimg& image);
+
+        C2D_Image get();
+        C2D_Image& get_ref();
+        void set(const C2D_Image& i);
+        R7Vec2 get_size();
+        bool loaded();
+
+        private:
+        void safe_del();
+        bool ld = false;
+        C2D_Image img;
+    };
+}

include/renderd7/Memory.hpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+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,24 @@
+#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);
+    // Config
+    void SetMessageIdleStartFrame(int frame);
+    void SetMessageTotalAnimationFrames(int total_frames);
+    void SetMessageFadeOutStartFrame(int frame);
+}

include/renderd7/Overlays.hpp

@@ -0,0 +1,74 @@
+#pragma once
+
+#include <renderd7/Ovl.hpp>
+#include <string>
+
+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;
+
+// Importand Adresses
+bool* i_is_enabled;
+bool* i_screen;
+uint32_t* i_mt_color;
+uint32_t* i_txt_color;
+float* i_txt_size;
+};
+
+typedef int RD7Keyboard;
+
+enum RD7Keyboard_ {
+  RD7Keyboard_Default,
+  RD7Keyboard_Numpad,
+  RD7Keyboard_Password,
+};
+
+class Ovl_Keyboard : public RenderD7::Ovl {
+public:
+  /// @brief Constructor
+  /// Keyboard Type not Supported for now
+  Ovl_Keyboard(std::string& ref, 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;
+int mode = 0;
+int ft3 = 0;
+};
+} // namespace RenderD7

include/renderd7/Ovl.hpp

@@ -0,0 +1,27 @@
+#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 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,42 @@
+#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;
+};

include/renderd7/ResultDecoder.hpp

@@ -0,0 +1,53 @@
+#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

@@ -0,0 +1,16 @@
+#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/Security.hpp

@@ -0,0 +1,60 @@
+#pragma once
+#include <cstdint>
+#include <functional>
+#include <string>
+#include <vector>
+
+#include <3ds.h>
+
+namespace RenderD7 {
+namespace Init {
+void Security();
+}
+
+class Security {
+public:
+  /// @brief Security Levels
+  enum Level {
+    NONE,     ///< Do Completly Nothing (excludes FrameEnd Security)
+    FULL,     ///< Display Every Reports even Success
+    ERRORS,   ///< Display Only Errors
+    WARNINGS, ///< Display Errors and Warnings
+    LOG,      ///< Log Every Error with Detailed Information
+  };
+
+  Security();
+  ~Security();
+  /// @brief Report an Output (For SafeTraceInit)
+  /// @param addr Adress of Pointer
+  /// @param result_ptr Pointer to the result
+  void Report(uint32_t addr, void *result_ptr);
+  /// @brief Set the Security Level
+  /// @param level Level to use
+  void SetLevel(Level level);
+  /// @brief Get Current Security Level
+  /// @return Security Level
+  Level GetLevel();
+  /// @brief Call a Function at Program Crash/Exit
+  /// @param exit_func Function to Call
+  void SafeExit(void (*exit_func)());
+  /// @brief SaveInit a Function and define a Exit Func
+  /// @param init_func Init Function
+  /// @param exit_func Exit Function
+  void SafeInit(void (*init_func)(), void (*exit_func)());
+  /// @brief SaveInit a Function and define a Exit Func
+  /// @param init_func Init Function
+  /// @param exit_func Exit Function
+  void SafeInit(Result (*init_func)(), void (*exit_func)());
+  /// @brief SaveInit a Function and define a Exit Func
+  /// @param init_func Init Function
+  /// @param exit_func Exit Function
+  void SafeInit(void (*init_func)(), Result (*exit_func)());
+  /// @brief SaveInit a Function and define a Exit Func
+  /// @param init_func Init Function
+  /// @param exit_func Exit Function
+  void SafeInit(Result (*init_func)(), Result (*exit_func)());
+};
+} // namespace RenderD7
+
+/// @brief RenderD7 Security Object
+extern RenderD7::Security *rd7_security;

include/renderd7/Sheet.hpp

@@ -0,0 +1,24 @@
+#pragma once
+#include <citro2d.h>
+#include <citro3d.h>
+#include <3ds.h> // Result
+#include <string>
+
+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 std::string& path);
+  /// @brief Unload the Sheet
+  void Free();
+  /// \param spritesheet The Sheet
+  C2D_SpriteSheet spritesheet;
+};
+} // namespace RenderD7

include/renderd7/Sprite.hpp

@@ -0,0 +1,64 @@
+#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

include/renderd7/SpriteAnimation.hpp

@@ -0,0 +1,41 @@
+#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

include/renderd7/StealConsole.hpp

@@ -0,0 +1,21 @@
+#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

@@ -0,0 +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

include/renderd7/Time.hpp

@@ -1,82 +1,13 @@
-namespace rnd7 {
+#pragma once
-class Time {
+#include <string>
-    public:
 
-        Time();
+namespace RenderD7 {
-
+/// @brief Format a String
-        float asSeconds() const;
+/// @param fmt_str Format To
-
+/// @param ... Additional Args
-        int asMilliseconds() const;
+/// @return Formatted String
-
+std::string FormatString(std::string fmt_str, ...);
-        long asMicroseconds() const;
+/// @brief Get Current Time as String
-
+/// @return Time-String
-        static const Time Zero_;
+std::string GetTimeStr(void);
-
+} // namespace RenderD7
-    private:
-
-        friend Time seconds(float);
-
-        friend Time milliseconds(int);
-
-        friend Time microseconds(long);
-
-        explicit Time(long microseconds);
-
-    private:
-
-        long m_microseconds; ///< Time value stored as microseconds
-    };
-
-    Time seconds(float amount);
-
-    Time milliseconds(int amount);
-
-    Time microseconds(long amount);
-
-    bool operator==(Time left, Time right);
-
-    bool operator!=(Time left, Time right);
-
-    bool operator<(Time left, Time right);
-
-    bool operator>(Time left, Time right);
-    bool operator<=(Time left, Time right);
-
-    bool operator>=(Time left, Time right);
-
-    Time operator-(Time right);
-    Time operator+(Time left, Time right);
-
-    Time &operator+=(Time &left, Time right);
-
-    Time operator-(Time left, Time right);
-
-    Time &operator-=(Time &left, Time right);
-
-    Time operator*(Time left, float right);
-
-    Time operator*(Time left, long right);
-
-    Time operator*(float left, Time right);
-
-    Time operator*(long left, Time right);
-
-    Time &operator*=(Time &left, float right);
-
-    Time &operator*=(Time &left, long right);
-
-    Time operator/(Time left, float right);
-
-    Time operator/(Time left, long right);
-
-    Time &operator/=(Time &left, float right);
-
-    Time &operator/=(Time &left, long right);
-
-    float operator/(Time left, Time right);
-
-    Time operator%(Time left, Time right);
-
-    Time &operator%=(Time &left, Time right);
-
-} 

include/renderd7/Timer.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <3ds.h>
+
+namespace RenderD7 {
+    class Timer {
+        public:
+        Timer(bool autostart = true);
+        ~Timer() {}
+        void reset();
+        void tick();
+        void pause();
+        void resume();
+        float get();
+        float get_live();
+        bool running();
+        private:
+        uint64_t last = 0;
+        uint64_t current = 0;
+        bool is_running = false;
+    };
+}

include/renderd7/UI7.hpp

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <algorithm>
+#include <renderd7/R7Vec.hpp>
+#include <renderd7/DrawV2.hpp>
+#include <string>
+#include <vector>
+
+// 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),
+};
+
+namespace UI7 {
+// Key functions
+void Init();
+void Deinit();
+void Update();
+float GetTime();
+float GetDeltaTime();
+
+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* 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, R7Vec2(*display_func)(void*, R7Vec2), void**data_array, size_t num_entrys);
+R7Vec2 GetCursorPos();
+void SetCursorPos(R7Vec2 cp);
+void RestoreCursor();
+void SameLine();
+} // namespace UI7

include/renderd7/bmp.hpp

@@ -1,717 +0,0 @@
-#pragma once
-#include <fstream>
-#include <vector>
-#include <stdexcept>
-#include <iostream>
-#include <iterator>
-#include <sstream>
-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)
-
-struct BMP {
-    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"));
-        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;
-    }
-
-    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) {
-        if (x0 + w > (uint32_t)bmp_info_header.width || y0 + h > (uint32_t)bmp_info_header.height) {
-            return 59;
-        }
-
-        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) {
-                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;
-                }
-            }
-        }
-        }
-        
-    }
-
-    int OrganizeAverageRed()
-    {
-      int ColorRed[bmp_info_header.height][bmp_info_header.width];
-      int ColorGreen[bmp_info_header.height][bmp_info_header.width];;
-      int ColorBlue[bmp_info_header.height][bmp_info_header.width];
-      float pixels=bmp_info_header.height*bmp_info_header.width;
-      float intensity=0;
-      float sum=0;
-      uint32_t channels = bmp_info_header.bit_count / 8;
-      cout << "The Width of the image is " << bmp_info_header.width << endl;
-      cout << "The height of the image is " << bmp_info_header.height << endl;
-      for (int y = 0; y < bmp_info_header.height; ++y) {
-            for (int x = 0; x < bmp_info_header.width; ++x) {
-                //cout << channels*(y*bmp_info_header.width+x) << endl;
-                //Read red
-                  ColorBlue[y][x]=data[channels * (y * bmp_info_header.width + x) + 0];
-                  ColorGreen[y][x]=data[channels * (y * bmp_info_header.width + x) + 1];
-                  ColorRed[y][x]=data[channels * (y * bmp_info_header.width + x) + 2];
-                }
-            }
-      for(int y=0; y<bmp_info_header.height; y++)
-      {
-        for(int x=0; x<bmp_info_header.width; x++)
-        {
-          sum=ColorRed[y][x]+sum-((ColorBlue[y][x])/2+(ColorGreen[y][x])/2);
-        }
-      }
-      
-      intensity=sum/pixels;
-      cout << intensity << endl;
-      return intensity;
-    }
-    
-    int OrganizeAverageGreen()
-    {
-      int ColorRed[bmp_info_header.height][bmp_info_header.width];
-      int ColorGreen[bmp_info_header.height][bmp_info_header.width];;
-      int ColorBlue[bmp_info_header.height][bmp_info_header.width];
-      float pixels=bmp_info_header.height*bmp_info_header.width;
-      float intensity=0;
-      float sum=0;
-      uint32_t channels = bmp_info_header.bit_count / 8;
-      cout << "The Width of the image is " << bmp_info_header.width << endl;
-      cout << "The height of the image is " << bmp_info_header.height << endl;
-      for (int y = 0; y < bmp_info_header.height; ++y) {
-            for (int x = 0; x < bmp_info_header.width; ++x) {
-                //cout << channels*(y*bmp_info_header.width+x) << endl;
-                //Read Green
-                  ColorBlue[y][x]=data[channels * (y * bmp_info_header.width + x) + 0];
-                  ColorGreen[y][x]=data[channels * (y * bmp_info_header.width + x) + 1];
-                  ColorRed[y][x]=data[channels * (y * bmp_info_header.width + x) + 2];
-                }
-            }
-      for(int y=0; y<bmp_info_header.height; y++)
-      {
-        for(int x=0; x<bmp_info_header.width; x++)
-        {
-          sum=ColorGreen[y][x]+sum-((ColorBlue[y][x])/2+(ColorRed[y][x])/2);
-        }
-      }
-      
-      intensity=sum/pixels;
-      cout << intensity << endl;
-      return intensity;
-    }
-    
-    int OrganizeAverageBlue()
-    {
-      int ColorRed[bmp_info_header.height][bmp_info_header.width];
-      int ColorGreen[bmp_info_header.height][bmp_info_header.width];;
-      int ColorBlue[bmp_info_header.height][bmp_info_header.width];
-      float pixels=bmp_info_header.height*bmp_info_header.width;
-      float intensity=0;
-      float sum=0;
-      uint32_t channels = bmp_info_header.bit_count / 8;
-      cout << "The Width of the image is " << bmp_info_header.width << endl;
-      cout << "The height of the image is " << bmp_info_header.height << endl;
-      for (int y = 0; y < bmp_info_header.height; ++y) {
-            for (int x = 0; x < bmp_info_header.width; ++x) {
-                //cout << channels*(y*bmp_info_header.width+x) << endl;
-                //Read Blue
-                  ColorBlue[y][x]=data[channels * (y * bmp_info_header.width + x) + 0];
-                  ColorGreen[y][x]=data[channels * (y * bmp_info_header.width + x) + 1];
-                  ColorRed[y][x]=data[channels * (y * bmp_info_header.width + x) + 2];
-                }
-            }
-      for(int y=0; y<bmp_info_header.height; y++)
-      {
-        for(int x=0; x<bmp_info_header.width; x++)
-        {
-          sum=ColorBlue[y][x]+sum-((ColorGreen[y][x])/2+(ColorRed[y][x])/2);
-        }
-      }
-      
-      intensity=sum/pixels;
-      cout << intensity << endl;
-      return intensity;
-    }
-
-    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;//throw std::runtime_error("The point is outside the image boundaries!");
-        }
-        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!");
-        }
-        
-        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;
-        }
-    }
-
-    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,14 +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);
-
-std::vector<unsigned char> ConvertFile(std::string filename);
-
-std::vector<unsigned char> ConvertData(std::vector<unsigned char> data);
-}

include/renderd7/external/fs.h

@@ -1,29 +0,0 @@
-
-
-#include <3ds.h>
-
-extern FS_Archive archive, sdmc_archive, nand_archive;
-
-Result FS_OpenArchive(FS_Archive *archive, FS_ArchiveID id);
-Result FS_CloseArchive(FS_Archive archive);
-Result FS_OpenDir(Handle *handle, FS_Archive archive, const char *path);
-Result FS_OpenFile(Handle *handle, FS_Archive archive, const char *path, u32 flags, u32 attributes);
-Result FS_MakeDir(FS_Archive archive, const char *path);
-Result FS_CreateFile(FS_Archive archive, const char *path, u64 size);
-Result FS_RecursiveMakeDir(FS_Archive archive, const char *path);
-bool FS_FileExists(FS_Archive archive, const char *path);
-bool FS_DirExists(FS_Archive archive, const char *path);
-Result FS_GetFileSize(FS_Archive archive, const char *path, u64 *size);
-u64 FS_GetFreeStorage(FS_SystemMediaType media_type);
-u64 FS_GetTotalStorage(FS_SystemMediaType media_type);
-u64 FS_GetUsedStorage(FS_SystemMediaType media_type);
-Result FS_RemoveFile(FS_Archive archive, const char *path);
-Result FS_RemoveDir(FS_Archive archive, const char *path);
-Result FS_RemoveDirRecursive(FS_Archive archive, const char *path);
-Result FS_RenameFile(FS_Archive archive, const char *old_filename, const char *new_filename);
-Result FS_RenameDir(FS_Archive archive, const char *old_dirname, const char *new_dirname);
-Result FS_Read(FS_Archive archive, const char *path, u64 size, void *buf);
-Result FS_Write(FS_Archive archive, const char *path, const void *buf, u32 size);
-char *FS_GetFileTimestamp(const char *path);
-Result makeDirs(const char * path);
-Result openFile(Handle* fileHandle, const char * path, bool write);

include/renderd7/external/libnsbmp/libnsbmp.h

@@ -1,250 +0,0 @@
-/*
- * Copyright 2006 Richard Wilson <richard.wilson@netsurf-browser.org>
- * Copyright 2008 Sean Fox <dyntryx@gmail.com>
- *
- * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/
- * Licenced under the MIT License,
- *                http://www.opensource.org/licenses/mit-license.php
- */
-
-/**
- * \file
- * Bitmap file decoding interface.
- */
-
-#ifndef libnsbmp_h_
-#define libnsbmp_h_
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-
-/* bmp flags */
-#define BMP_NEW			0
-/** image is opaque (as opposed to having an alpha mask) */
-#define BMP_OPAQUE		(1 << 0)
-/** memory should be wiped */
-#define BMP_CLEAR_MEMORY	(1 << 1)
-
-/**
- * error return values
- */
-typedef enum {
-        BMP_OK = 0,
-        BMP_INSUFFICIENT_MEMORY = 1,
-        BMP_INSUFFICIENT_DATA = 2,
-        BMP_DATA_ERROR = 3
-} bmp_result;
-
-/**
- * encoding types
- */
-typedef enum {
-        BMP_ENCODING_RGB = 0,
-        BMP_ENCODING_RLE8 = 1,
-        BMP_ENCODING_RLE4 = 2,
-        BMP_ENCODING_BITFIELDS = 3
-} bmp_encoding;
-
-/* API for Bitmap callbacks */
-typedef void* (*bmp_bitmap_cb_create)(int width, int height, unsigned int state);
-typedef void (*bmp_bitmap_cb_destroy)(void *bitmap);
-typedef unsigned char* (*bmp_bitmap_cb_get_buffer)(void *bitmap);
-typedef size_t (*bmp_bitmap_cb_get_bpp)(void *bitmap);
-
-/**
- * The Bitmap callbacks function table
- */
-typedef struct bmp_bitmap_callback_vt_s {
-        /** Callback to allocate bitmap storage. */
-        bmp_bitmap_cb_create bitmap_create;
-        /** Called to free bitmap storage. */
-        bmp_bitmap_cb_destroy bitmap_destroy;
-        /** Return a pointer to the pixel data in a bitmap. */
-        bmp_bitmap_cb_get_buffer bitmap_get_buffer;
-        /** Find the width of a pixel row in bytes. */
-        bmp_bitmap_cb_get_bpp bitmap_get_bpp;
-} bmp_bitmap_callback_vt;
-
-/**
- * bitmap image
- */
-typedef struct bmp_image {
-        /** callbacks for bitmap functions */
-        bmp_bitmap_callback_vt bitmap_callbacks;
-        /** pointer to BMP data */
-        uint8_t *bmp_data;
-        /** width of BMP (valid after _analyse) */
-        uint32_t width;
-        /** heigth of BMP (valid after _analyse) */
-        uint32_t height;
-        /** whether the image has been decoded */
-        bool decoded;
-        /** decoded image */
-        void *bitmap;
-
-        /* Internal members are listed below */
-        /** total number of bytes of BMP data available */
-        uint32_t buffer_size;
-        /** pixel encoding type */
-        bmp_encoding encoding;
-        /** offset of bitmap data */
-        uint32_t bitmap_offset;
-        /** bits per pixel */
-        uint16_t bpp;
-        /** number of colours */
-        uint32_t colours;
-        /** colour table */
-        uint32_t *colour_table;
-        /** whether to use bmp's limited transparency */
-        bool limited_trans;
-        /** colour to display for "transparent" pixels when using limited
-         * transparency
-         */
-        uint32_t trans_colour;
-        /** scanlines are top to bottom */
-        bool reversed;
-        /** image is part of an ICO, mask follows */
-        bool ico;
-        /** true if the bitmap does not contain an alpha channel */
-        bool opaque;
-        /** four bitwise mask */
-        uint32_t mask[4];
-        /** four bitwise shifts */
-        int32_t shift[4];
-        /** colour representing "transparency" in the bitmap */
-        uint32_t transparent_index;
-} bmp_image;
-
-typedef struct ico_image {
-        bmp_image bmp;
-        struct ico_image *next;
-} ico_image;
-
-/**
- * icon image collection
- */
-typedef struct ico_collection {
-        /** callbacks for bitmap functions */
-        bmp_bitmap_callback_vt bitmap_callbacks;
-        /** width of largest BMP */
-        uint16_t width;
-        /** heigth of largest BMP */
-        uint16_t height;
-
-        /* Internal members are listed below */
-        /** pointer to ICO data */
-        uint8_t *ico_data;
-        /** total number of bytes of ICO data available */
-        uint32_t buffer_size;
-        /** root of linked list of images */
-        ico_image *first;
-} ico_collection;
-
-/**
- * Initialises bitmap ready for analysing the bitmap.
- *
- * \param bmp The Bitmap to initialise
- * \param callbacks The callbacks the library will call on operations.
- * \return BMP_OK on success or appropriate error code.
- */
-bmp_result bmp_create(bmp_image *bmp, bmp_bitmap_callback_vt *callbacks);
-
-/**
- * Initialises icon ready for analysing the icon
- *
- * \param bmp The Bitmap to initialise
- * \param callbacks The callbacks the library will call on operations.
- * \return BMP_OK on success or appropriate error code.
- */
-bmp_result ico_collection_create(ico_collection *ico,
-                                 bmp_bitmap_callback_vt *callbacks);
-
-/**
- * Analyse a BMP prior to decoding.
- *
- * This will scan the data provided and perform checks to ensure the data is a
- * valid BMP and prepare the bitmap image structure ready for decode.
- *
- * This function must be called and resturn BMP_OK before bmp_decode() as it
- * prepares the bmp internal state for the decode process.
- *
- * \param bmp the BMP image to analyse.
- * \param size The size of data in cdata.
- * \param data The bitmap source data.
- * \return BMP_OK on success or error code on faliure.
- */
-bmp_result bmp_analyse(bmp_image *bmp, size_t size, uint8_t *data);
-
-/**
- * Analyse an ICO prior to decoding.
- *
- * This function will scan the data provided and perform checks to ensure the
- * data is a valid ICO.
- *
- * This function must be called before ico_find().
- *
- * \param ico the ICO image to analyse
- * \param size The size of data in cdata.
- * \param data The bitmap source data.
- * \return BMP_OK on success
- */
-bmp_result ico_analyse(ico_collection *ico, size_t size, uint8_t *data);
-
-/**
- * Decode a BMP
- *
- * This function decodes the BMP data such that bmp->bitmap is a valid
- * image. The state of bmp->decoded is set to TRUE on exit such that it
- * can easily be identified which BMPs are in a fully decoded state.
- *
- * \param bmp the BMP image to decode
- * \return BMP_OK on success
- */
-bmp_result bmp_decode(bmp_image *bmp);
-
-/**
- * Decode a BMP using "limited transparency"
- *
- * Bitmaps do not have native transparency support.  However, there is a
- * "trick" that is used in some instances in which the first pixel of the
- * bitmap becomes the "transparency index".  The decoding application can
- * replace this index with whatever background colour it chooses to
- * create the illusion of transparency.
- *
- * When to use transparency is at the discretion of the decoding
- * application.
- *
- * \param bmp the BMP image to decode
- * \param colour the colour to use as "transparent"
- * \return BMP_OK on success
- */
-bmp_result bmp_decode_trans(bmp_image *bmp, uint32_t transparent_colour);
-
-/**
- * Finds the closest BMP within an ICO collection
- *
- * This function finds the BMP with dimensions as close to a specified set
- * as possible from the images in the collection.
- *
- * \param ico the ICO collection to examine
- * \param width the preferred width (0 to use ICO header width)
- * \param height the preferred height (0 to use ICO header height)
- */
-bmp_image *ico_find(ico_collection *ico, uint16_t width, uint16_t height);
-
-/**
- * Finalise a BMP prior to destruction.
- *
- * \param bmp the BMP image to finalise.
- */
-void bmp_finalise(bmp_image *bmp);
-
-/**
- * Finalise an ICO prior to destruction.
- *
- * \param ico the ICO image to finalise,
- */
-void ico_finalise(ico_collection *ico);
-
-#endif

include/renderd7/external/libnsbmp/log.h

@@ -1,27 +0,0 @@
-/*
- * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
- * Copyright 2004 John Tytgat <John.Tytgat@aaug.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- * Licenced under the MIT License,
- *                http://www.opensource.org/licenses/mit-license.php
- */
-
-#include <stdio.h>
-
-#ifndef _LIBNSBMP_LOG_H_
-#define _LIBNSBMP_LOG_H_
-
-#ifdef NDEBUG
-#  define LOG(x) ((void) 0)
-#else
-#  ifdef __GNUC__
-#    define LOG(x) do { printf x, fputc('\n', stdout)); } while (0)
-#  elif defined(__CC_NORCROFT)
-#    define LOG(x) do { printf x, fputc('\n', stdout)); } while (0)
-#  else
-#    define LOG(x) do { printf x, fputc('\n', stdout)); } while (0)
-#  endif
-#endif
-
-#endif

include/renderd7/global_db.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <renderd7/renderd7.hpp>
+#include <renderd7/external/json.hpp>
+
+// Outdated HidApi (HidV2Patched)
+extern u32 d7_hDown;
+extern u32 d7_hHeld;
+extern u32 d7_hUp;
+extern u32 d7_hRepeat;  // Inofficial lol
+extern touchPosition d7_touch;
+
+// Outdated Screens
+extern C3D_RenderTarget *Top;
+extern C3D_RenderTarget *TopRight;
+extern C3D_RenderTarget *Bottom;
+
+// Modern Global Api
+extern int rd7_max_objects;
+extern bool rd7_do_splash;
+extern bool rd7_enable_scene_system;
+extern bool rd7_debugging;
+extern C3D_RenderTarget *rd7_top;
+extern C3D_RenderTarget *rd7_top_right;
+extern C3D_RenderTarget *rd7_bottom;
+
+// Draw2
+extern float rd7_draw2_tsm;

include/renderd7/ini.hpp

@@ -1,58 +1,50 @@
 #ifndef INI_INI_H_
 #define INI_INI_H_
 
-#include <string>
-#include <sstream>
 #include <algorithm>
-#include <utility>
-#include <unordered_map>
-#include <vector>
-#include <memory>
-#include <fstream>
-#include <sys/stat.h>
 #include <cctype>
+#include <fstream>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <sys/stat.h>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
-namespace INI
+namespace INI {
-{
+namespace INIStringUtil {
-	namespace INIStringUtil
+const char *const whitespaceDelimiters = " \t\n\r\f\v";
-	{
+inline void trim(std::string &str) {
-		const char* const whitespaceDelimiters = " \t\n\r\f\v";
-		inline void trim(std::string& str)
-		{
   str.erase(str.find_last_not_of(whitespaceDelimiters) + 1);
   str.erase(0, str.find_first_not_of(whitespaceDelimiters));
-		}
+}
 #ifndef INI_CASE_SENSITIVE
-		inline void toLower(std::string& str)
+inline void toLower(std::string &str) {
-		{
   std::transform(str.begin(), str.end(), str.begin(), [](const char c) {
     return static_cast<const char>(std::tolower(c));
   });
-		}
+}
 #endif
-		inline void replace(std::string& str, std::string const& a, std::string const& b)
+inline void replace(std::string &str, std::string const &a,
-		{
+                    std::string const &b) {
-			if (!a.empty())
+  if (!a.empty()) {
-			{
     std::size_t pos = 0;
-				while ((pos = str.find(a, pos)) != std::string::npos)
+    while ((pos = str.find(a, pos)) != std::string::npos) {
-				{
       str.replace(pos, a.size(), b);
       pos += b.size();
     }
   }
-		}
+}
 #ifdef _WIN32
-		const char* const endl = "\r\n";
+const char *const endl = "\r\n";
 #else
-		const char* const endl = "\n";
+const char *const endl = "\n";
 #endif
-	};
+}; // namespace INIStringUtil
 
-	template<typename T>
+template <typename T> class INIMap {
-	class INIMap
+private:
-	{
-	private:
   using T_DataIndexMap = std::unordered_map<std::string, std::size_t>;
   using T_DataItem = std::pair<std::string, T>;
   using T_DataContainer = std::vector<T_DataItem>;
@@ -61,33 +53,29 @@ namespace INI
   T_DataIndexMap dataIndexMap;
   T_DataContainer data;
 
-		inline std::size_t setEmpty(std::string& key)
+  inline std::size_t setEmpty(std::string &key) {
-		{
     std::size_t index = data.size();
     dataIndexMap[key] = index;
     data.emplace_back(key, T());
     return index;
   }
 
-	public:
+public:
   using const_iterator = typename T_DataContainer::const_iterator;
 
-		INIMap() { }
+  INIMap() {}
 
-		INIMap(INIMap const& other)
+  INIMap(INIMap const &other) {
-		{
     std::size_t data_size = other.data.size();
-			for (std::size_t i = 0; i < data_size; ++i)
+    for (std::size_t i = 0; i < data_size; ++i) {
-			{
+      auto const &key = other.data[i].first;
-				auto const& key = other.data[i].first;
+      auto const &obj = other.data[i].second;
-				auto const& obj = other.data[i].second;
       data.emplace_back(key, obj);
     }
     dataIndexMap = T_DataIndexMap(other.dataIndexMap);
   }
 
-		T& operator[](std::string key)
+  T &operator[](std::string key) {
-		{
     INIStringUtil::trim(key);
 #ifndef INI_CASE_SENSITIVE
     INIStringUtil::toLower(key);
@@ -97,70 +85,57 @@ namespace INI
     std::size_t index = (hasIt) ? it->second : setEmpty(key);
     return data[index].second;
   }
-		T get(std::string key) const
+  T get(std::string key) const {
-		{
     INIStringUtil::trim(key);
 #ifndef INI_CASE_SENSITIVE
     INIStringUtil::toLower(key);
 #endif
     auto it = dataIndexMap.find(key);
-			if (it == dataIndexMap.end())
+    if (it == dataIndexMap.end()) {
-			{
       return T();
     }
     return T(data[it->second].second);
   }
-		bool has(std::string key) const
+  bool has(std::string key) const {
-		{
     INIStringUtil::trim(key);
 #ifndef INI_CASE_SENSITIVE
     INIStringUtil::toLower(key);
 #endif
     return (dataIndexMap.count(key) == 1);
   }
-		void set(std::string key, T obj)
+  void set(std::string key, T obj) {
-		{
     INIStringUtil::trim(key);
 #ifndef INI_CASE_SENSITIVE
     INIStringUtil::toLower(key);
 #endif
     auto it = dataIndexMap.find(key);
-			if (it != dataIndexMap.end())
+    if (it != dataIndexMap.end()) {
-			{
       data[it->second].second = obj;
-			}
+    } else {
-			else
-			{
       dataIndexMap[key] = data.size();
       data.emplace_back(key, obj);
     }
   }
-		void set(T_MultiArgs const& multiArgs)
+  void set(T_MultiArgs const &multiArgs) {
-		{
+    for (auto const &it : multiArgs) {
-			for (auto const& it : multiArgs)
+      auto const &key = it.first;
-			{
+      auto const &obj = it.second;
-				auto const& key = it.first;
-				auto const& obj = it.second;
       set(key, obj);
     }
   }
-		bool remove(std::string key)
+  bool remove(std::string key) {
-		{
     INIStringUtil::trim(key);
 #ifndef INI_CASE_SENSITIVE
     INIStringUtil::toLower(key);
 #endif
     auto it = dataIndexMap.find(key);
-			if (it != dataIndexMap.end())
+    if (it != dataIndexMap.end()) {
-			{
       std::size_t index = it->second;
       data.erase(data.begin() + index);
       dataIndexMap.erase(it);
-				for (auto& it2 : dataIndexMap)
+      for (auto &it2 : dataIndexMap) {
-				{
+        auto &vi = it2.second;
-					auto& vi = it2.second;
+        if (vi > index) {
-					if (vi > index)
-					{
           vi--;
         }
       }
@@ -168,58 +143,46 @@ namespace INI
     }
     return false;
   }
-		void clear()
+  void clear() {
-		{
     data.clear();
     dataIndexMap.clear();
   }
-		std::size_t size() const
+  std::size_t size() const { return data.size(); }
-		{
-			return data.size();
-		}
   const_iterator begin() const { return data.begin(); }
   const_iterator end() const { return data.end(); }
-	};
+};
 
-	using INIStructure = INIMap<INIMap<std::string>>;
+using INIStructure = INIMap<INIMap<std::string>>;
 
-	namespace INIParser
+namespace INIParser {
-	{
+using T_ParseValues = std::pair<std::string, std::string>;
-		using T_ParseValues = std::pair<std::string, std::string>;
 
-		enum class PDataType : char
+enum class PDataType : char {
-		{
   PDATA_NONE,
   PDATA_COMMENT,
   PDATA_SECTION,
   PDATA_KEYVALUE,
   PDATA_UNKNOWN
-		};
+};
 
-		inline PDataType parseLine(std::string line, T_ParseValues& parseData)
+inline PDataType parseLine(std::string line, T_ParseValues &parseData) {
-		{
   parseData.first.clear();
   parseData.second.clear();
   INIStringUtil::trim(line);
-			if (line.empty())
+  if (line.empty()) {
-			{
     return PDataType::PDATA_NONE;
   }
   char firstCharacter = line[0];
-			if (firstCharacter == ';')
+  if (firstCharacter == ';') {
-			{
     return PDataType::PDATA_COMMENT;
   }
-			if (firstCharacter == '[')
+  if (firstCharacter == '[') {
-			{
     auto commentAt = line.find_first_of(';');
-				if (commentAt != std::string::npos)
+    if (commentAt != std::string::npos) {
-				{
       line = line.substr(0, commentAt);
     }
     auto closingBracketAt = line.find_last_of(']');
-				if (closingBracketAt != std::string::npos)
+    if (closingBracketAt != std::string::npos) {
-				{
       auto section = line.substr(1, closingBracketAt - 1);
       INIStringUtil::trim(section);
       parseData.first = section;
@@ -229,8 +192,7 @@ namespace INI
   auto lineNorm = line;
   INIStringUtil::replace(lineNorm, "\\=", "  ");
   auto equalsAt = lineNorm.find_first_of('=');
-			if (equalsAt != std::string::npos)
+  if (equalsAt != std::string::npos) {
-			{
     auto key = line.substr(0, equalsAt);
     INIStringUtil::trim(key);
     INIStringUtil::replace(key, "\\=", "=");
@@ -241,21 +203,19 @@ namespace INI
     return PDataType::PDATA_KEYVALUE;
   }
   return PDataType::PDATA_UNKNOWN;
-		}
+}
-	};
+}; // namespace INIParser
 
-	class INIReader
+class INIReader {
-	{
+public:
-	public:
   using T_LineData = std::vector<std::string>;
   using T_LineDataPtr = std::shared_ptr<T_LineData>;
 
-	private:
+private:
   std::ifstream fileReadStream;
   T_LineDataPtr lineData;
 
-		T_LineData readFile()
+  T_LineData readFile() {
-		{
     std::string fileContents;
     fileReadStream.seekg(0, std::ios::end);
     fileContents.resize(fileReadStream.tellg());
@@ -264,23 +224,19 @@ namespace INI
     fileReadStream.read(&fileContents[0], fileSize);
     fileReadStream.close();
     T_LineData output;
-			if (fileSize == 0)
+    if (fileSize == 0) {
-			{
       return output;
     }
     std::string buffer;
     buffer.reserve(50);
-			for (std::size_t i = 0; i < fileSize; ++i)
+    for (std::size_t i = 0; i < fileSize; ++i) {
-			{
+      char &c = fileContents[i];
-				char& c = fileContents[i];
+      if (c == '\n') {
-				if (c == '\n')
-				{
         output.emplace_back(buffer);
         buffer.clear();
         continue;
       }
-				if (c != '\0' && c != '\r')
+      if (c != '\0' && c != '\r') {
-				{
         buffer += c;
       }
     }
@@ -288,45 +244,36 @@ namespace INI
     return output;
   }
 
-	public:
+public:
-		INIReader(std::string const& filename, bool keepLineData = false)
+  INIReader(std::string const &filename, bool keepLineData = false) {
-		{
     fileReadStream.open(filename, std::ios::in | std::ios::binary);
-			if (keepLineData)
+    if (keepLineData) {
-			{
       lineData = std::make_shared<T_LineData>();
     }
   }
-		~INIReader() { }
+  ~INIReader() {}
 
-		bool operator>>(INIStructure& data)
+  bool operator>>(INIStructure &data) {
-		{
+    if (!fileReadStream.is_open()) {
-			if (!fileReadStream.is_open())
-			{
       return false;
     }
     T_LineData fileLines = readFile();
     std::string section;
     bool inSection = false;
     INIParser::T_ParseValues parseData;
-			for (auto const& line : fileLines)
+    for (auto const &line : fileLines) {
-			{
       auto parseResult = INIParser::parseLine(line, parseData);
-				if (parseResult == INIParser::PDataType::PDATA_SECTION)
+      if (parseResult == INIParser::PDataType::PDATA_SECTION) {
-				{
         inSection = true;
         data[section = parseData.first];
-				}
+      } else if (inSection &&
-				else if (inSection && parseResult == INIParser::PDataType::PDATA_KEYVALUE)
+                 parseResult == INIParser::PDataType::PDATA_KEYVALUE) {
-				{
+        auto const &key = parseData.first;
-					auto const& key = parseData.first;
+        auto const &value = parseData.second;
-					auto const& value = parseData.second;
         data[section][key] = value;
       }
-				if (lineData && parseResult != INIParser::PDataType::PDATA_UNKNOWN)
+      if (lineData && parseResult != INIParser::PDataType::PDATA_UNKNOWN) {
-				{
+        if (parseResult == INIParser::PDataType::PDATA_KEYVALUE && !inSection) {
-					if (parseResult == INIParser::PDataType::PDATA_KEYVALUE && !inSection)
-					{
           continue;
         }
         lineData->emplace_back(line);
@@ -334,90 +281,69 @@ namespace INI
     }
     return true;
   }
-		T_LineDataPtr getLines()
+  T_LineDataPtr getLines() { return lineData; }
-		{
+};
-			return lineData;
-		}
-	};
 
-	class INIGenerator
+class INIGenerator {
-	{
+private:
-	private:
   std::ofstream fileWriteStream;
 
-	public:
+public:
   bool prettyPrint = false;
 
-		INIGenerator(std::string const& filename)
+  INIGenerator(std::string const &filename) {
-		{
     fileWriteStream.open(filename, std::ios::out | std::ios::binary);
   }
-		~INIGenerator() { }
+  ~INIGenerator() {}
 
-		bool operator<<(INIStructure const& data)
+  bool operator<<(INIStructure const &data) {
-		{
+    if (!fileWriteStream.is_open()) {
-			if (!fileWriteStream.is_open())
-			{
       return false;
     }
-			if (!data.size())
+    if (!data.size()) {
-			{
       return true;
     }
     auto it = data.begin();
-			for (;;)
+    for (;;) {
-			{
+      auto const &section = it->first;
-				auto const& section = it->first;
+      auto const &collection = it->second;
-				auto const& collection = it->second;
+      fileWriteStream << "[" << section << "]";
-				fileWriteStream
+      if (collection.size()) {
-					<< "["
-					<< section
-					<< "]";
-				if (collection.size())
-				{
         fileWriteStream << INIStringUtil::endl;
         auto it2 = collection.begin();
-					for (;;)
+        for (;;) {
-					{
           auto key = it2->first;
           INIStringUtil::replace(key, "=", "\\=");
           auto value = it2->second;
           INIStringUtil::trim(value);
-						fileWriteStream
+          fileWriteStream << key << ((prettyPrint) ? " = " : "=") << value;
-							<< key
+          if (++it2 == collection.end()) {
-							<< ((prettyPrint) ? " = " : "=")
-							<< value;
-						if (++it2 == collection.end())
-						{
             break;
           }
           fileWriteStream << INIStringUtil::endl;
         }
       }
-				if (++it == data.end())
+      if (++it == data.end()) {
-				{
         break;
       }
       fileWriteStream << INIStringUtil::endl;
-				if (prettyPrint)
+      if (prettyPrint) {
-				{
         fileWriteStream << INIStringUtil::endl;
       }
     }
     return true;
   }
-	};
+};
 
-	class INIWriter
+class INIWriter {
-	{
+private:
-	private:
   using T_LineData = std::vector<std::string>;
   using T_LineDataPtr = std::shared_ptr<T_LineData>;
 
   std::string filename;
 
-		T_LineData getLazyOutput(T_LineDataPtr const& lineData, INIStructure& data, INIStructure& original)
+  T_LineData getLazyOutput(T_LineDataPtr const &lineData, INIStructure &data,
-		{
+                           INIStructure &original) {
     T_LineData output;
     INIParser::T_ParseValues parseData;
     std::string sectionCurrent;
@@ -426,67 +352,49 @@ namespace INI
     bool discardNextEmpty = false;
     bool writeNewKeys = false;
     std::size_t lastKeyLine = 0;
-			for (auto line = lineData->begin(); line != lineData->end(); ++line)
+    for (auto line = lineData->begin(); line != lineData->end(); ++line) {
-			{
+      if (!writeNewKeys) {
-				if (!writeNewKeys)
-				{
         auto parseResult = INIParser::parseLine(*line, parseData);
-					if (parseResult == INIParser::PDataType::PDATA_SECTION)
+        if (parseResult == INIParser::PDataType::PDATA_SECTION) {
-					{
+          if (parsingSection) {
-						if (parsingSection)
-						{
             writeNewKeys = true;
             parsingSection = false;
             --line;
             continue;
           }
           sectionCurrent = parseData.first;
-						if (data.has(sectionCurrent))
+          if (data.has(sectionCurrent)) {
-						{
             parsingSection = true;
             continueToNextSection = false;
             discardNextEmpty = false;
             output.emplace_back(*line);
             lastKeyLine = output.size();
-						}
+          } else {
-						else
-						{
             continueToNextSection = true;
             discardNextEmpty = true;
             continue;
           }
-					}
+        } else if (parseResult == INIParser::PDataType::PDATA_KEYVALUE) {
-					else if (parseResult == INIParser::PDataType::PDATA_KEYVALUE)
+          if (continueToNextSection) {
-					{
-						if (continueToNextSection)
-						{
             continue;
           }
-						if (data.has(sectionCurrent))
+          if (data.has(sectionCurrent)) {
-						{
+            auto &collection = data[sectionCurrent];
-							auto& collection = data[sectionCurrent];
+            auto const &key = parseData.first;
-							auto const& key = parseData.first;
+            auto const &value = parseData.second;
-							auto const& value = parseData.second;
+            if (collection.has(key)) {
-							if (collection.has(key))
-							{
               auto outputValue = collection[key];
-								if (value == outputValue)
+              if (value == outputValue) {
-								{
                 output.emplace_back(*line);
-								}
+              } else {
-								else
-								{
                 INIStringUtil::trim(outputValue);
                 auto lineNorm = *line;
                 INIStringUtil::replace(lineNorm, "\\=", "  ");
                 auto equalsAt = lineNorm.find_first_of('=');
                 auto valueAt = lineNorm.find_first_not_of(
-										INIStringUtil::whitespaceDelimiters,
+                    INIStringUtil::whitespaceDelimiters, equalsAt + 1);
-										equalsAt + 1
-									);
                 std::string outputLine = line->substr(0, valueAt);
-									if (prettyPrint && equalsAt + 1 == valueAt)
+                if (prettyPrint && equalsAt + 1 == valueAt) {
-									{
                   outputLine += " ";
                 }
                 outputLine += outputValue;
@@ -495,98 +403,72 @@ namespace INI
               lastKeyLine = output.size();
             }
           }
-					}
+        } else {
-					else
+          if (discardNextEmpty && line->empty()) {
-					{
-						if (discardNextEmpty && line->empty())
-						{
             discardNextEmpty = false;
-						}
+          } else if (parseResult != INIParser::PDataType::PDATA_UNKNOWN) {
-						else if (parseResult != INIParser::PDataType::PDATA_UNKNOWN)
-						{
             output.emplace_back(*line);
           }
         }
       }
-				if (writeNewKeys || std::next(line) == lineData->end())
+      if (writeNewKeys || std::next(line) == lineData->end()) {
-				{
         T_LineData linesToAdd;
-					if (data.has(sectionCurrent) && original.has(sectionCurrent))
+        if (data.has(sectionCurrent) && original.has(sectionCurrent)) {
-					{
+          auto const &collection = data[sectionCurrent];
-						auto const& collection = data[sectionCurrent];
+          auto const &collectionOriginal = original[sectionCurrent];
-						auto const& collectionOriginal = original[sectionCurrent];
+          for (auto const &it : collection) {
-						for (auto const& it : collection)
-						{
             auto key = it.first;
-							if (collectionOriginal.has(key))
+            if (collectionOriginal.has(key)) {
-							{
               continue;
             }
             auto value = it.second;
             INIStringUtil::replace(key, "=", "\\=");
             INIStringUtil::trim(value);
-							linesToAdd.emplace_back(
+            linesToAdd.emplace_back(key + ((prettyPrint) ? " = " : "=") +
-								key + ((prettyPrint) ? " = " : "=") + value
+                                    value);
-							);
           }
         }
-					if (!linesToAdd.empty())
+        if (!linesToAdd.empty()) {
-					{
+          output.insert(output.begin() + lastKeyLine, linesToAdd.begin(),
-						output.insert(
+                        linesToAdd.end());
-							output.begin() + lastKeyLine,
-							linesToAdd.begin(),
-							linesToAdd.end()
-						);
         }
-					if (writeNewKeys)
+        if (writeNewKeys) {
-					{
           writeNewKeys = false;
           --line;
         }
       }
     }
-			for (auto const& it : data)
+    for (auto const &it : data) {
-			{
+      auto const &section = it.first;
-				auto const& section = it.first;
+      if (original.has(section)) {
-				if (original.has(section))
-				{
         continue;
       }
-				if (prettyPrint && output.size() > 0 && !output.back().empty())
+      if (prettyPrint && output.size() > 0 && !output.back().empty()) {
-				{
         output.emplace_back();
       }
       output.emplace_back("[" + section + "]");
-				auto const& collection = it.second;
+      auto const &collection = it.second;
-				for (auto const& it2 : collection)
+      for (auto const &it2 : collection) {
-				{
         auto key = it2.first;
         auto value = it2.second;
         INIStringUtil::replace(key, "=", "\\=");
         INIStringUtil::trim(value);
-					output.emplace_back(
+        output.emplace_back(key + ((prettyPrint) ? " = " : "=") + value);
-						key + ((prettyPrint) ? " = " : "=") + value
-					);
       }
     }
     return output;
   }
 
-	public:
+public:
   bool prettyPrint = false;
 
-		INIWriter(std::string const& filename)
+  INIWriter(std::string const &filename) : filename(filename) {}
-		: filename(filename)
+  ~INIWriter() {}
-		{
-		}
-		~INIWriter() { }
 
-		bool operator<<(INIStructure& data)
+  bool operator<<(INIStructure &data) {
-		{
     struct stat buf;
     bool fileExists = (stat(filename.c_str(), &buf) == 0);
-			if (!fileExists)
+    if (!fileExists) {
-			{
       INIGenerator generator(filename);
       generator.prettyPrint = prettyPrint;
       return generator << data;
@@ -596,27 +478,21 @@ namespace INI
     bool readSuccess = false;
     {
       INIReader reader(filename, true);
-				if ((readSuccess = reader >> originalData))
+      if ((readSuccess = reader >> originalData)) {
-				{
         lineData = reader.getLines();
       }
     }
-			if (!readSuccess)
+    if (!readSuccess) {
-			{
       return false;
     }
     T_LineData output = getLazyOutput(lineData, data, originalData);
     std::ofstream fileWriteStream(filename, std::ios::out | std::ios::binary);
-			if (fileWriteStream.is_open())
+    if (fileWriteStream.is_open()) {
-			{
+      if (output.size()) {
-				if (output.size())
-				{
         auto line = output.begin();
-					for (;;)
+        for (;;) {
-					{
           fileWriteStream << *line;
-						if (++line == output.end())
+          if (++line == output.end()) {
-						{
             break;
           }
           fileWriteStream << INIStringUtil::endl;
@@ -626,54 +502,44 @@ namespace INI
     }
     return false;
   }
-	};
+};
 
-	class INIFile
+class INIFile {
-	{
+private:
-	private:
   std::string filename;
 
-	public:
+public:
-		INIFile(std::string const& filename)
+  INIFile(std::string const &filename) : filename(filename) {}
-		: filename(filename)
-		{ }
 
-		~INIFile() { }
+  ~INIFile() {}
 
-		bool read(INIStructure& data) const
+  bool read(INIStructure &data) const {
-		{
+    if (data.size()) {
-			if (data.size())
-			{
       data.clear();
     }
-			if (filename.empty())
+    if (filename.empty()) {
-			{
       return false;
     }
     INIReader reader(filename);
     return reader >> data;
   }
-		bool generate(INIStructure const& data, bool pretty = false) const
+  bool generate(INIStructure const &data, bool pretty = false) const {
-		{
+    if (filename.empty()) {
-			if (filename.empty())
-			{
       return false;
     }
     INIGenerator generator(filename);
     generator.prettyPrint = pretty;
     return generator << data;
   }
-		bool write(INIStructure& data, bool pretty = false) const
+  bool write(INIStructure &data, bool pretty = false) const {
-		{
+    if (filename.empty()) {
-			if (filename.empty())
-			{
       return false;
     }
     INIWriter writer(filename);
     writer.prettyPrint = pretty;
     return writer << data;
   }
-	};
+};
-}
+} // namespace INI
 
 #endif

include/renderd7/internal_db.hpp

@@ -0,0 +1,55 @@
+#pragma once
+#include <renderd7/renderd7.hpp>
+#include <renderd7/external/json.hpp>
+#include <renderd7/global_db.hpp>
+
+#define CFGVER "0"
+
+#ifndef V_RD7BTIME
+#define V_RD7BTIME "SUBMODULE"
+#endif
+#ifndef V_RD7CSTRING
+#define V_RD7CSTRING "SUBMODULE"
+#endif
+
+/// Base ///
+extern std::string rd7i_app_name;
+extern std::string rd7i_config_path;
+extern nlohmann::json rd7i_config;
+extern u8 rd7i_console_model;
+extern u8 rd7i_system_region;
+extern bool rd7i_is_citra;
+extern bool rd7i_settings;
+extern R7Vec2 rd7i_hid_touch_pos;
+extern C2D_TextBuf rd7i_text_buffer;
+extern C2D_TextBuf rd7i_d2_dimbuf;
+extern C2D_Font rd7i_base_font;
+extern bool rd7i_is_ndsp;
+extern bool rd7i_running;
+extern std::unique_ptr<RenderD7::Scene> rd7i_fade_scene;
+extern std::vector<std::unique_ptr<RenderD7::Ovl>> rd7i_overlays;
+extern unsigned int rd7i_frames;
+extern u64 rd7i_last_time;
+extern float rd7i_framerate;
+extern u32 rd7i_mt_color;
+extern u32 rd7i_mt_txtcolor;
+extern bool rd7i_mt_screen;
+extern float rd7i_mt_txtSize;
+extern bool rd7i_metrikd;
+extern bool rd7i_ftraced;
+extern bool rd7i_current_screen;
+extern u64 rd7i_delta_time;
+extern u64 rd7i_last_tm;
+extern float rd7i_dtm;
+extern float rd7i_time;
+extern bool rd7i_fadeout;
+extern bool rd7i_fadein;
+extern bool rd7i_fadeout2; 
+extern bool rd7i_fadein2;
+extern int rd7i_fadealpha;
+extern int rd7i_fadecolor;
+extern bool rd7i_wait_fade;
+extern bool rd7i_fade_exit;
+extern bool rd7i_fade_scene_wait;
+extern bool rd7i_idb_running;
+extern bool rd7i_graphics_on;

include/renderd7/lang.hpp

@@ -1,16 +1,20 @@
 #pragma once
+// clang-format off
 #include <string>
 #include <renderd7/external/json.hpp>
+// clang-format on
 
-/// RenderD7::Lang
+namespace RenderD7 {
-namespace RenderD7::Lang
+namespace Lang {
-{
+/// @brief Get 3ds System lang! [en] by default
-    /// Get the 3ds System Language
+/// @return Sytemlang as string
-    std::string getSys();
+std::string getSys();
-    /// Get a translated string
+/// @brief Get The Translation String
-    /// \param key The Key so the code can find your string
+/// @param key Key of Translation
-    std::string get(const std::string &key);
+/// @return The Translated String
-        /// Load the lang file from dir structure en/app.json for sample
+std::string get(const std::string &key);
-        /// \param lang the folder name en, fr, de ... . I prefer geSys()
+/// @brief Load A Language json
-	void load(const std::string &lang);
+/// @param lang The Language Key [en], [de], etc, or getSys()
-} /// RenderD7::Lang
+void load(const std::string &lang);
+} // namespace Lang
+} // namespace RenderD7

include/renderd7/log.hpp

@@ -5,26 +5,29 @@
 #include <time.h>
 #include <unistd.h>
 
-/** Log Class */
+/// @brief Log Class
-class Log
+class Log {
-{
+public:
-	public:
+  /// @brief Constructor
-                /** Construct */
   Log();
-                /** Deconstruct */
+  /// @brief Deconstructor
   ~Log();
-                /// Init the log file
+  /// @brief Init the Logger
-                /// \param filename name for the file
+  /// @param filename Filename[_data_time.log]
   void Init(const char *filename);
-                /// Write Text to logfile
+  /// @brief Write a String to the File
-                /// \param debug_text your text
+  /// @param debug_text string
   void Write(std::string debug_text);
-                /// Get the date
+  /// @brief Get the Date
+  /// @return Date as string fmt[data_time]
   std::string logDate(void);
-                /// Format to logstyle
+  /// @brief Format a string like sprintf
-                /// \param fmt_str the formatted style
+  /// @param fmt_str the string wich defines the fmt
-		std::string format(const std::string& fmt_str, ...);
+  /// @param ... Additional Data
-	private:
+  /// @return Formatted String
+  std::string format(const std::string &fmt_str, ...);
+
+private:
   /// \param filename the name of the logfile
   std::string filename;
 };

include/renderd7/music/Mp3.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <renderd7/music/Music.hpp>
+#include <fstream>
+
+#include <mpg123.h>
+
+namespace RenderD7 {
+    class Mp3Decoder : public MusicDecoder {
+        public:
+        Mp3Decoder() {}
+        ~Mp3Decoder() {}
+
+        int _init(const std::string& path, MusicMeta& meta) override;
+        unsigned int _getSampleRate() override;
+        unsigned char _getChannels() override;
+        size_t _getBufSize() override;
+        unsigned long long _decode(signed short* buf_addr) override;
+        void _deinit() override;
+        size_t _getFileSamples() override;
+
+        private:
+        mpg123_handle *hnd = nullptr;
+        size_t buf_size = 0;
+        long rate = 0;
+        int channels = 0;
+    };
+}

include/renderd7/music/Music.hpp

@@ -0,0 +1,90 @@
+// RenderD7 Music Backend
+#pragma once
+
+#include <string>
+
+namespace RenderD7 {
+class MusicMeta {
+ public:
+  MusicMeta() {
+    ititle = "Unknown";
+    ialbum = "Unknown";
+    iyear = "Unknown";
+    iname = "Unknown";
+    ipath = "Unknown";
+    iartist = "Unknown";
+    imdt = "Unknown";
+  }
+  ~MusicMeta() {}
+  std::string name() { return iname; }
+  std::string album() { return ialbum; }
+  std::string year() { return iyear; }
+  std::string title() { return ititle; }
+  std::string path() { return ipath; }
+  std::string artist() { return iartist; }
+  std::string mdt() { return imdt; }
+
+  void name(std::string name) { iname = name; }
+  void album(std::string album) { ialbum = album; }
+  void year(std::string year) { iyear = year; }
+  void title(std::string title) { ititle = title; }
+  void path(std::string path) { ipath = path; }
+  void artist(std::string artist) { iartist = artist; }
+  void mdt(std::string mdt) { imdt = mdt; }
+
+ private:
+  std::string ititle = "";
+  std::string ialbum = "";
+  std::string iyear = "";
+  std::string iname = "";
+  std::string ipath = "";
+  std::string iartist = "";
+  std::string imdt = "";
+};
+
+// Template Class for Decoders
+class MusicDecoder {
+ public:
+  MusicDecoder() = default;
+  virtual ~MusicDecoder() {}
+
+  static void LoadFile(const std::string &path);
+  static void CleanUp();
+
+  static int init(const std::string &path, MusicMeta &meta) {
+    return decoder->_init(path, meta);
+  }
+  static unsigned int getSampleRate() { return decoder->_getSampleRate(); }
+  static unsigned char getChannels() { return decoder->_getChannels(); }
+  static size_t getBufSize() { return decoder->_getBufSize(); }
+  static unsigned long long decode(signed short *buf_addr) {
+    return decoder->_decode(buf_addr);
+  }
+  static void deinit() { decoder->_deinit(); }
+  static size_t getFileSamples() { return decoder->_getFileSamples(); }
+
+  static MusicDecoder *decoder;
+
+ protected:
+  virtual int _init(const std::string &path, MusicMeta &meta) = 0;
+  virtual unsigned int _getSampleRate() = 0;
+  virtual unsigned char _getChannels() = 0;
+  virtual size_t _getBufSize() = 0;
+  virtual unsigned long long _decode(signed short *buf_addr) = 0;
+  virtual void _deinit() = 0;
+  virtual size_t _getFileSamples() = 0;
+};
+
+namespace MusicPlayer {
+void PlayFile(const std::string &path);
+void Play();
+void Pause();
+void Stop();
+bool IsPlaying();
+bool IsRunning();
+int PosCurrent();
+int Total();
+int SampleRate();
+MusicMeta GetMeta();
+}  // namespace MusicPlayer
+}  // namespace RenderD7

include/renderd7/music/Vorbis.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <renderd7/music/Music.hpp>
+#include <fstream>
+
+#include <tremor/ivorbiscodec.h>
+#include <tremor/ivorbisfile.h>
+
+namespace RenderD7 {
+    class VorbisDecoder : public MusicDecoder {
+        public:
+        VorbisDecoder() {}
+        ~VorbisDecoder() {}
+
+        int _init(const std::string& path, MusicMeta& meta) override;
+        unsigned int _getSampleRate() override;
+        unsigned char _getChannels() override;
+        size_t _getBufSize() override;
+        unsigned long long _decode(signed short* buf_addr) override;
+        void _deinit() override;
+        size_t _getFileSamples() override;
+
+        private:
+        OggVorbis_File vorbis_file;
+        vorbis_info *vi;
+        FILE* f; // Only used cause required by lib
+        const size_t buf_size = 8 * 4096;
+    };
+}

include/renderd7/nimg.hpp

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <vector>
+#include <cstdint>
+#include <iostream>
+
+#define NPI_NIMG_ (uint32_t)0x4e494d47 // Magic: NIMG
+
+/**
+ * NIMG Format Value Description
+ * int format
+ * 0 = rgba32
+ * 1 = rgb24 (3x8bit)
+ */
+
+/**
+ * NIMG Compression Value Description
+ * int compression
+ * 0 = no compression
+ * 1 = npi_simple_compress (RLE Style)
+ */
+
+namespace RenderD7
+{
+    struct nimg
+    {
+        unsigned int magic; // Magic number defaults do NPI_NIMG_
+        int width;
+        int height;
+        int format;
+        int compression;
+        std::vector<unsigned char> pixel_buffer;
+
+        nimg(int w = 0, int h = 0, int fmt = 0, int cmp = 0)
+        {
+            magic = NPI_NIMG_;
+            width = w;
+            height = h;
+            format = fmt;
+            compression = cmp;
+            pixel_buffer.resize((w*h)*(format ? 3 : 4));
+        }
+    };
+    nimg NIMG_Load(std::string path);
+    nimg NIMG_LoadFromMem(unsigned char* buffer, size_t bf_size);
+    void NIMG_Save(nimg image, std::string path);
+}

include/renderd7/nimg_engine.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <renderd7/nimg.hpp>
+
+namespace RenderD7
+{
+    class NIMG_Engine
+    {
+        public:
+        NIMG_Engine(int w, int h);
+        NIMG_Engine();
+        ~NIMG_Engine();
+        nimg& GetImage() { return image; }
+        void load_file(const std::string& path);
+        void load_nimg(const std::string& path);
+
+        // Rendering
+        void draw_pixel(int x, int y, unsigned int color);
+        void draw_rect(int x, int y, int w, int h, unsigned int color, int t = 1);
+        void draw_rect_solid(int x, int y, int w, int h, unsigned int color);
+        void flip(bool h, bool v);
+
+        private:
+        nimg image;
+    };
+}

include/renderd7/parameter.hpp

@@ -1,60 +1,58 @@
 #pragma once
 #include <tuple>
 
-namespace RenderD7{
+namespace RenderD7 {
-    class Parameter
+class Parameter {
-    {
+private:
-    private:
   using id = size_t;
 
-        template<typename T>
+  template <typename T> struct type {
-        struct type { static void id() { } };
+    static void id() {}
+  };
 
-        template<typename T>
+  template <typename T> static id type_id() {
-        static id type_id() { return reinterpret_cast<id>(&type<T>::id); }
+    return reinterpret_cast<id>(&type<T>::id);
+  }
 
-        template<typename T>
+  template <typename T> using decay = typename std::decay<T>::type;
-        using decay = typename std::decay<T>::type;
 
-        template<typename T>
+  template <typename T>
-        using none = typename std::enable_if<!std::is_same<Parameter, T>::value>::type;
+  using none =
+      typename std::enable_if<!std::is_same<Parameter, T>::value>::type;
 
-        struct base
+  struct base {
-        {
+    virtual ~base() {}
-            virtual ~base() { }
     virtual bool is(id) const = 0;
     virtual base *copy() const = 0;
   } *p = nullptr;
 
-        template<typename T>
+  template <typename T> struct data : base, std::tuple<T> {
-        struct data : base, std::tuple<T>
-        {
     using std::tuple<T>::tuple;
 
     T &get() & { return std::get<0>(*this); }
-            T const &get() const& { return std::get<0>(*this); }
+    T const &get() const & { return std::get<0>(*this); }
 
     bool is(id i) const override { return i == type_id<T>(); }
     base *copy() const override { return new data{get()}; }
   };
 
-        template<typename T>
+  template <typename T> T &stat() { return static_cast<data<T> &>(*p).get(); }
-        T &stat() { return static_cast<data<T>&>(*p).get(); }
 
-        template<typename T>
+  template <typename T> T const &stat() const {
-        T const &stat() const { return static_cast<data<T> const&>(*p).get(); }
+    return static_cast<data<T> const &>(*p).get();
+  }
 
-        template<typename T>
+  template <typename T> T &dyn() { return dynamic_cast<data<T> &>(*p).get(); }
-        T &dyn() { return dynamic_cast<data<T>&>(*p).get(); }
 
-        template<typename T>
+  template <typename T> T const &dyn() const {
-        T const &dyn() const { return dynamic_cast<data<T> const&>(*p).get(); }
+    return dynamic_cast<data<T> const &>(*p).get();
+  }
 
-    public:
+public:
   /**
    * @brief Default constructor
    */
-         Parameter() { }
+  Parameter() {}
 
   /**
    * @brief Destructs the Parameter
@@ -71,42 +69,50 @@ namespace RenderD7{
    * @brief Const copy constructor
    * @param s The Parameter to copy
    */
-        Parameter(Parameter const &s) : p{s.p->copy()} { }
+  Parameter(Parameter const &s) : p{s.p->copy()} {}
 
   /**
    * @brief Initializes the Parameter with the given value
    * @param x The value to initialize the Parameter with
    */
-        template<typename T, typename U = decay<T>, typename = none<U>>
+  template <typename T, typename U = decay<T>, typename = none<U>>
-        Parameter(T &&x) : p{new data<U>{std::forward<T>(x)}} { }
+  Parameter(T &&x) : p{new data<U>{std::forward<T>(x)}} {}
 
   /**
    * @brief Overloads the assignment operator
    * @param s The value to set the Parameter to
    */
-        Parameter &operator=(Parameter s) { swap(*this, s); return *this; }
+  Parameter &operator=(Parameter s) {
+    swap(*this, s);
+    return *this;
+  }
 
   friend void swap(Parameter &s, Parameter &r) { std::swap(s.p, r.p); }
 
   /**
    * @brief Clears the Parameter
    */
-        void clear() { delete p; p = nullptr; }
+  void clear() {
+    delete p;
+    p = nullptr;
+  }
 
   /**
    * @brief Checks whether the Parameter is the given type
    * @tparam T The type to check
    * @return   Whether the Parameter has the given type or not
    */
-        template<typename T>
+  template <typename T> bool is() const {
-        bool is() const { return p ? p->is(type_id<T>()) : false; }
+    return p ? p->is(type_id<T>()) : false;
+  }
 
   /**
    * @brief Returns the value of the Parameter
    * @tparam T The type of the Parameter
    * @return The value of the Parameter
-         * @warning If the type of the Parameter doesn't match the type of it's stored value, it will result in undefined behaviour.
+   * @warning If the type of the Parameter doesn't match the type of it's stored
+   * value, it will result in undefined behaviour.
    */
-        template<typename T> T &get() & { return stat<T>(); }
+  template <typename T> T &get() & { return stat<T>(); }
-    };
+};
-} 
+} // namespace RenderD7

include/renderd7/renderd7.hpp

@@ -1,448 +1,243 @@
 #pragma once
+/// c++ Includes
+#include <algorithm>
+#include <codecvt>
+#include <cstring>
+#include <filesystem>
+#include <functional>
+#include <iostream>
+#include <locale>
+#include <map>
+#include <memory>
+#include <random>
+#include <stack>
+#include <string>
+#include <vector>
+/// c includes
+#include <dirent.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+/// 3ds Includes
 #include <3ds.h>
 #include <citro2d.h>
 #include <citro3d.h>
-#include <memory>
+/// RenderD7 Includes
-#include <stack>
+#include <renderd7/Color.hpp>
-#include <string>
+#include <renderd7/FunctionTrace.hpp>
-#include <functional>
+#include <renderd7/Hardware.hpp>
-#include <map>
+#include <renderd7/Memory.hpp>
-#include <vector>
+#include <renderd7/Ovl.hpp>
-#include <dirent.h>
+#include <renderd7/ResultDecoder.hpp>
-#include <unistd.h>
+#include <renderd7/Screen.hpp>
-#include <stdio.h>
+#include <renderd7/Security.hpp>
-#include <cstring>
+#include <renderd7/Sheet.hpp>
-#include <random>
+#include <renderd7/Sprite.hpp>
-#include <sys/stat.h>
+#include <renderd7/SpriteAnimation.hpp>
-#include <algorithm>
+#include <renderd7/Tasks.hpp>
-#include <iostream>
+#include <renderd7/Time.hpp>
-#include <filesystem>
-#include <locale>
-#include <time.h>
-
-#include <codecvt>
-
 #include <renderd7/external/lodepng.h>
+#include <renderd7/ini.hpp>
 #include <renderd7/lang.hpp>
 #include <renderd7/parameter.hpp>
-#include <renderd7/thread.hpp>
-#include <renderd7/ini.hpp>
 #include <renderd7/stringtool.hpp>
-#include <renderd7/Clock.hpp>
+#include <renderd7/thread.hpp>
-#include <renderd7/bmp.hpp>
-#include <renderd7/bmpconverter.hpp>
 
-extern "C"
+#define RENDERD7VSTRING "0.9.5"
-{
-    #include <renderd7/external/fs.h>
-}
 
-#define RENDERD7VSTRING "0.8.0"
-#define CHANGELOG "0.8.0: Implement BitmapPrinter\n0.7.3: Implement Over Render Overlay Framework\n0.7.2: Implement MT to csv file saving. Add RGB2HEX. \n0.7.1: Add the New Overlay Handler. Its Just in code and does nothing yet. \n0.7.0: Made Big Progress In the MT Ovl but it still crashes On a Scnd C3D_FrameEnd(). Implement 800px but doesn't work that good. \n0.6.2: Fix Crash when exiting trouth Home Menu.  \n0.6.10: rewrite Threadsystem, Improve framerate\n0.6.02: Fix Code in lang.hpp\nadd Draw Text Left Function.\nadd changelog\n0.6.01: add Threading system."
 #define DEFAULT_CENTER 0.5f
 
-extern C3D_RenderTarget* Top;
+/// @param rd7_do_splash Config Value To Enable RenderD7 Splash
-extern C3D_RenderTarget* TopRight;
+extern bool rd7_do_splash;
-extern C3D_RenderTarget* Bottom;
+/// @param rd7_enable_memtrack Config Value to Track Mem Allocations
-
+extern bool rd7_enable_memtrack;
-extern u32 d7_hDown;
+/// @param rd7_max_objects Config Param for C2D Mac objects
-extern u32 d7_hHeld;
+extern int rd7_max_objects;
-extern u32 d7_hUp;
+/// @param rd7_enable_scene_system Enable/Disable Scene System (for example for your own implementations)
-extern touchPosition d7_touch;
+extern bool rd7_enable_scene_system;
-
-extern std::string dspststus;
 
 /// RenderD7
-namespace RenderD7
+namespace RenderD7 {
-{
+/// @brief Get Deltatime
-    float GetDeltaTime();
+/// @return Deltatime
-    enum kbd{
+float GetDeltaTime();
-         SWKBD,
-         BKBD
-    };
-    enum kbd_type
-    {
-         NUMPAD,
-         STANDARD
-    };
-    struct TObject
-    {
-        int x; //Position X
-        int y; //Position Y
-        int w; //Button Width
-        int h; //Button Height
-        std::string text = ""; //Text
-        float correctx = 0; //Correct X Position
-        float correcty = 0; //Correct Y Position
-        float txtsize = 0.7f;  //Set Text Size
-    };
-    /// Set current RenderScreen
-    /// \param target The RenderTarget Top, Bottom
-    void OnScreen(C3D_RenderTarget *target);
-    /** The Spritesheet Class */
-    class Sheet
-    {
-        public:
-        /// Construct sheet
-        Sheet();
-        // Deconstruct sheet
-        ~Sheet();
-        /// Load a Sritesheet
-        /// \param path Path to the Spritesheet (.t3x)
-        Result Load(const char *path);
-        /// Unload the Spritesheet
-        void Free();
-        /// The Spritesheet
-        C2D_SpriteSheet spritesheet;
-    };
-    /// Image Class
-    class Image
-    {
-        public:
-        ~Image();
 
-        void Unload();
+/// @brief A Button
-        /// Load Image from Png
+struct TObject {
-        /// \param path path to png file
+  int x;                 ///< Position X
-        void LoadPng(const std::string path);
+  int y;                 ///< Position Y
-        /// Load the Image from buffer
+  int w;                 ///< Button Width
-        /// \param buffer the frame buffer
+  int h;                 ///< Button Height
-        void LoadPFromBuffer(const std::vector<u8> &buffer);
+  std::string text = ""; ///< Text
-        void LoadFromBitmap(BMP bitmap);
+  float txtsize = 0.7f;  ///< Set Text Size
-        /// Draw the Image directly
+};
-        /// \param x The x position
+/// @brief Scene Class
-        /// \param y the y position
+class Scene {
-        /// \param scaleX x scale from 0.0 to 1.0
+public:
-        /// \param scaleY y scale from 0.0 to 1.0
+  /// @brief Stack of the Scenes
-        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;
-    };
-    /// 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);
-        bool Draw();
-        void SetCenter(float x, float y);
-        void SetPos(float x, float y);
-        void SetScale(float x, float y);
-        void SetRotation(float rotation);
-        void Rotate(float speed);
-        float getWidth();
-        float getHeigh();
-        float getPosX();
-        float getPosY();
-        private:
-        C2D_ImageTint tint;
-        C2D_Sprite sprite;
-    };
-
-    class Scene {
-    public:
   static std::stack<std::unique_ptr<Scene>> scenes;
+  /// @brief Deconstructor
   virtual ~Scene() {}
-    	virtual void Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition touch) = 0;
+  virtual void Logic() = 0;
+  /// @brief Draw Func to Override
   virtual void Draw() const = 0;
-        //virtual void Ovl() const = 0;
+  /// @brief Push a Scene to Stack
+  /// @param scene Scene to Push
+  /// @param fade FadeEffect (Not Correctly Implementet yet)
   static void Load(std::unique_ptr<Scene> scene, bool fade = false);
+  /// @brief Go Back a Scene
   static void Back();
+  /// @brief do the Draw (Called in RenderD7::MainLoop())
   static void doDraw();
-        static void doLogic(u32 hDown, u32 hHeld, u32 hUp, touchPosition touch);
+  static void doLogic();
-        //static void HandleOvl();
+};
-    };
 
-    class RSettings : public RenderD7::Scene
+/// @brief Integrated Setting Menu of RenderD7
-    {
+class RSettings : public RenderD7::Scene {
-    private:
+private:
+  /// @brief State (Define for Menus)
   enum RState {
     RSETTINGS,
-            RINFO
+    RINFO,
+    RSERVICES,
+    RMCONFIG,
+    RFTRACE,
+    RUI7,
+    RCREDITS
   };
+
+  /// @param shared_request Defines requests from Draw to Logic
+  /// As it is not planned to make Draw non const you'll need
+  /// A map of data or bool values that are mutable ake
+  /// editable by const functions
+  mutable std::map<unsigned int, unsigned int> shared_request;
+  /// @param m_state Current menu State (Default=MainMenu aka RSETTINGS)
   RenderD7::RSettings::RState m_state = RenderD7::RSettings::RState::RSETTINGS;
 
-        std::string rd7srstate = "false";
+  /// @brief Position in FTrace Menu
-        std::string csvstate = "false";
+  int ftrace_index = 0;
+
+  /// @param mtovlstate State of Metricks Overlay
   std::string mtovlstate = "false";
-        std::string fpsstate = "60";
+  /// @param mtscreenstate Screen the Overlay is Set to
   std::string mtscreenstate = "Top";
-        std::string mttxtcolstate = "#ffffff";
+  std::string kbd_test;
-        std::string mtcola = "255";
+  bool statemtold = false;
-        std::string mttxtcola = "255";
+  bool stateftold = false;
 
-        
+public:
-        std::vector<RenderD7::TObject> buttons = 
+  /// @brief Constructor
-        {
-            {20, 35, 120, 35, "RD7SR", -11, 10},
-            {20, 85, 120, 35, "MT_CSV", -15, 9},
-            {20, 135, 120, 35, "MT_OVL", -19, 10},
-            {20, 185, 120, 35, "FPS", 6, 10},
-            {180, 35, 120, 35, "MTSCREEN", -29, 10},
-            {180, 85, 120, 35, "DSPERR", -13, 10},
-            {180, 135, 120, 35, "INFO", 2, 10},
-            {180, 185, 120, 35, "", -13, 10}
-        };
-    public:
   RSettings();
+  /// @brief Override for Draw
+  /// @param
   void Draw(void) const override;
+  /// @brief Deconstructor
   ~RSettings();
-        void Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition touch) override;
-    };
-
-    void LoadSettings();
-
-    class Ovl {
-        public:
-        virtual ~Ovl(){}
-        virtual void Draw() const = 0;
-        virtual void Logic() = 0;
-        inline bool IsKilled() {return this->iskilled; }
-        inline void Kill() { iskilled = true; }
-        private:
-        bool iskilled = false;
-    };
-
-    class DSP_NF : public RenderD7::Ovl
-    {
-        public:
-        DSP_NF();
-        void Draw(void) const override;
   void Logic() override;
-        private:
+};
-        int msgposy = 240;
-        int delay = 0;
-    };
 
-    class Toast : public RenderD7::Ovl
+/// @brief Show Up the RenderD7-Settings Menu
-    {
+void LoadSettings();
-        public:
+/// @brief Get's The Programs Time running
-        Toast(std::string head, std::string msg);
+/// @return Time Running
-        void Draw(void) const override;
+float GetTime();
-        void Logic() override;
+/// @brief Get Framerate as Number
-        private:
+/// @return FPS
-        std::string head, msg;
+int GetFps();
-        int msgposy = 240;
-        int delay = 0;
-    };
 
-    void AddOvl(std::unique_ptr<RenderD7::Ovl> scene);
+/// @brief Get A Rendom Int
-    namespace Color
+/// @param b From
-    {
+/// @param e To
-        struct rgba
+/// @return Random Int
-        {
+int GetRandomInt(int b, int e);
-            u8 r, g, b, a;
+/// @brief DrawMetrikOvl (YOUR OWN RISK)
-        };
+void DrawMetrikOvl();
-        class RGBA{
+/// @brief Draw Image from RenderD7 Sheet
-            public:
+/// @param sheet Spritesheet
-            RGBA(u8 r, u8 g, u8 b, u8 a) : m_r(r),m_g(g),m_b(b),m_a(a){}
+/// @param index Image index Value
-            u32 toRGBA() const {return (m_r << 24) | (m_g << 16) | (m_b << 8) | m_a;}
+/// @param x Pos X
+/// @param y Pos Y
+/// @param scaleX Scale on X-Axis
+/// @param scaleY Scale on Y-Axis
+/// @return success ?
+bool DrawImageFromSheet(RenderD7::Sheet *sheet, size_t index, float x, float y,
+                        float scaleX = 1.0, float scaleY = 1.0);
+/// @brief Fade In
+/// @param duration Duration in Frames
+void FadeIn();
+/// @brief Fade Out
+/// @param duration Duration in Frames
+void FadeOut();
+/// @brief Display Fade Effects
+void FadeDisplay();
 
-            u8 m_r, m_g ,m_b, m_a;
+/// @brief Loads a font
-        };
+/// @param path path to font (bcfnt)
-        std::string RGB2Hex(int r, int g, int b);
+/// @return link to C2D_Font Object
-        u32 Hex(const std::string color, u8 a = 255);
+C2D_Font LoadFont(const std::string& path);
-    }
-    int GetRandomInt(int b, int e);
-    void DrawMetrikOvl();
-    bool DrawImageFromSheet(RenderD7::Sheet* sheet, size_t index, float x, float y, float scaleX = 1.0, float scaleY = 1.0);
-    namespace Error
-    {
-        void DisplayError(std::string toptext, std::string errortext, int timesec = 3);
-        void DisplayFatalError(std::string toptext, std::string errortext);
-    }
-    namespace Init
-    {
-        Result Main(std::string app_name = "RD7Game");
-        Result Reload();
-        void Graphics();
-        void NdspFirm(bool useit = false);
-    }
-    namespace Exit
-    {
-        void Main();
-        void NdspFirm();
-        void Graphics();
-    }
-    namespace Msg
-    {
-        void Display(std::string titletxt, std::string subtext, C3D_RenderTarget *target);
-        void DisplayWithProgress(std::string titletext, std::string subtext, float current, float total, u32 prgbarcolor);
-    }
 
-    namespace Convert
+namespace Init {
-    {
+/// @brief Init Default RenderD7
-        inline float StringtoFloat(std::string inp){return std::atof(inp.c_str());}
+/// @param app_name Name of Your App
-        inline int StringtoInt(std::string inp){return std::atoi(inp.c_str());}
+/// @return ResCode
-        inline bool FloatToBool(float inp){if(inp == 1)return true; else return false;}
+Result Main(std::string app_name = "RD7Game");
-    }
+/// @brief Init Minimal RenderD7 (For better Hax2.x support)
+/// @param app_name Name of Your App
+/// @return ResCode
+Result Minimal(std::string app_name = "RD7Game");
+/// @brief Reload the Graphics Engine
+/// @return ResCode
+Result Reload();
+/// @brief Init Graphics Only (NOT SUPPORTET use Reload)
+void Graphics();
+/// @brief Init Ndsp for Sounds
+void NdspFirm();
+} // namespace Init
 
-    struct DirContent
+namespace Convert {
-    {
+/// @brief Convert a String to Flaot
-        std::string name;
+/// @param inp Input String
-        std::string path;
+/// @return Float
-        bool isDir;
+inline float StringtoFloat(std::string inp) { return std::atof(inp.c_str()); }
-    };
+/// @brief Convert String to Int
+/// @param inp Input String
+/// @return Int
+inline int StringtoInt(std::string inp) { return std::atoi(inp.c_str()); }
+/// @brief Convert a Float to Bool
+/// @param inp Input Float
+/// @return Bool
+inline bool FloatToBool(float inp) { return (inp == 1 ? true : false); }
+} // namespace Convert
 
-    namespace FS
+namespace FS {
-    {
+/// @brief Check if File exists
-        bool FileExist(const std::string& path);
+/// @param path Path to the File
-    }
+/// @return exists or not
+bool FileExist(const std::string &path);
+} // namespace FS
 
-    bool IsNdspInit();
+/// @brief Check if Ndsp is Init
-    void SetupLog(void);
+/// @return is or not
-    std::string GetFramerate();
+bool IsNdspInit();
-    bool MainLoop();
+/// @brief Get Current Framerate as String
-    void ExitApp();
+/// @return Framerate String
+std::string GetFramerate();
+/// @brief MainLoop of RenderD7s
+/// @return Is Still Running or not
+bool MainLoop();
+/// @brief Exit App (brak the MainLoop)
+void ExitApp();
 
-    void ClearTextBufs(void);
+/// @brief Clear the Citro2D TextBuffers
+/// @param
+void ClearTextBufs(void);
 
-    std::string Kbd(int lenght, SwkbdType tp);
+/// @brief Draw Overlays And end the Frame. DO NEVER USE C3D_FRAMEEND cause it
-    bool DrawRect(float x, float y, float w, float h, u32 color);
+/// breaks Overlay crash Security
-    bool DrawNFRect(float p1x, float p1y, float w, float h, u32 color, float scale = 1);
+void FrameEnd();
-    bool DrawPx(float x, float y, u32 color);
-    void DrawTextCentered(float x, float y, float size, u32 color, std::string Text, int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-	void DrawText(float x, float y, float size, u32 color, std::string Text, int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-    void DrawTextLeft(float x, float y, float size, u32 color, std::string Text, int maxWidth = 0, int maxHeight = 0, C2D_Font fnt = nullptr);
-	float GetTextWidth(float size, std::string Text, C2D_Font fnt = nullptr);
-	void GetTextSize(float size, float *width, float *height, std::string Text, C2D_Font fnt = nullptr);
-	float GetTextHeight(float size, std::string Text, C2D_Font fnt = nullptr);
-    Result loadFont(C2D_Font &fnt, const char * Path = "");
-	Result unloadFont(C2D_Font &fnt);
-    bool DrawCircle(float x, float y, float radius, u32 color);
-    bool DrawImage(C2D_Image img, float x, float y, float scaleX = 1.0f, float scaleY = 1.0f);
-    void FrameEnd();
-    void ToggleRD7SR();
-    bool IsRD7SR();
 
-    class SpriteSheetAnimation : public RenderD7::Sprite
+/// @brief Returns App Working Directory path
-    {
+/// @return AppDir Path
-        public:
+std::string GetAppDirectory();
-        SpriteSheetAnimation();
+} // namespace RenderD7
-        ~SpriteSheetAnimation();
-        void Setup(RenderD7::Sheet *sheet, size_t imagecount, size_t startimage, float frame_begin, float frame_finish);
-        void Play(float timespeed);
-        private:
-        size_t images;
-        size_t imgs = 0;
-        float D_totaltime;
-        RenderD7::Sheet *sheet;
-        float time;
-    };
-    
-
-    struct TLBtn
-    {
-        int x; //Position X
-        int y; //Position Y
-        int w; //Button Width
-        int h; //Button Height
-    };
-
-    struct ScrollList1 
-    {
-        std::string Text = "";
-    };
-
-    struct ScrollList2 
-    {
-        float x;
-        float y;
-        float w;
-        float h;
-        std::string Text = "";
-    };
-    /*enum ListType
-    {
-        ONE,
-        TWO
-    };*/
-    void DrawList1(RenderD7::ScrollList1 &l, float txtsize, C3D_RenderTarget *t);
-    void DrawTObjects(std::vector<RenderD7::TObject> tobjects, u32 color, u32 txtcolor,  int selection = -1, u32 selbgcolor = RenderD7::Color::Hex("#2D98AF"), u32 selcolor = RenderD7::Color::Hex("#000000"));
-    void DrawSTObject(std::vector<RenderD7::TObject> tobject, int tobjectindex, u32 color, u32 txtcolor);
-    bool touchTObj(touchPosition touch, RenderD7::TObject button);
-    bool touchTLBtn(touchPosition touch, RenderD7::TLBtn button);
-    void DrawTLBtns(std::vector<RenderD7::TLBtn> btns, u32 color,  int selection = -1, u32 selbgcolor = RenderD7::Color::Hex("#2D98AF"), u32 selcolor = RenderD7::Color::Hex("#000000"));
-    
-    struct Checkbox
-    {
-        float x, y, s;
-        bool is_chexked = false;
-        u32 outcol, incol, chcol;
-    };
-    void DrawCheckbox(Checkbox box);
-    std::string FormatString(std::string fmt_str, ...);
-    std::string GetTimeStr(void);
-    class Console
-    {
-         public:
-           Console();
-           Console(int x, int y, int w, int h, u8 a = 255);
-           Console(int x, int y, int w, int h, RenderD7::Color::rgba col);
-           Console(int x, int y, int w, int h, std::string name, RenderD7::Color::rgba col = {255, 255, 255, 255}, RenderD7::Color::rgba barcol = {0, 0, 0, 255}, RenderD7::Color::rgba outlinecol = {222, 222, 222, 255});
-           void On(C3D_RenderTarget *t_cscreen);
-           bool Update();
-           ~Console();
-         private:
-           std::vector<std::string> m_lines;
-           int x, y, w, h;
-           std::string m_name = "";
-           C3D_RenderTarget *cscreen;
-           bool m_nconsole = false;
-           bool m_mconsole = false;
-           RenderD7::Color::rgba color = {255, 255, 255, 255};
-           RenderD7::Color::rgba outlinecol = {222, 222, 222, 255};
-           RenderD7::Color::rgba barcolor = {0, 0, 0, 255};
-    };
-
-    bool NameIsEndingWith(const std::string &name, const std::vector<std::string> &extensions);
-    void GetDirContentsExt(std::vector<RenderD7::DirContent> &dircontent, const std::vector<std::string> &extensions);
-    void GetDirContents(std::vector<RenderD7::DirContent> &dircontent);
-
-    class BitmapPrinter
-    {
-        public:
-        BitmapPrinter(int w, int h);
-        ~BitmapPrinter();
-        bool DecodeFile(std::string file);
-        
-        bool DecodeMem(std::vector<unsigned char> buffer);
-        void DrawPixel(int x, int y, u8 b, u8 g, u8 r, u8 a);
-        void DrawRect(int x, int y, int w, int h, u8 line_w, u8 b, u8 g, u8 r, u8 a);
-        void DrawRectFilled(int x, int y, int w, int h, u8 b, u8 g, u8 r, u8 a);
-        void UsePreMap(BMP map);
-        void UsePrePrintMap(BitmapPrinter printmap);
-        BMP GetBitmap(){ return bitmap; }
-        void SaveBmp(std::string name);
-        void SavePng(std::string name);
-
-        void CreateScreen(C3D_RenderTarget *target);
-        void DrawScreen(int framerate);
-        void Clear(u8 b = 0, u8 g = 0, u8 r = 0, u8 a = 255);
-        void ClearBlank();
-        RenderD7::Image GetImage();
-        private:
-        int frame = 0;
-        RenderD7::Image renderframe;
-        bool isscreen = false;
-        C3D_RenderTarget* targetr;
-        BMP bitmap = NULL;
-        BMP blank = NULL;
-    };
-} /// RenderD7

include/renderd7/renderd7_logo.hpp

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

include/renderd7/sound.hpp

@@ -10,19 +10,21 @@ public:
   /// \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);
+  sound(const std::string &path, int channel = 1, bool toloop = false);
-        /** deconstruct the sound */
+  /// @brief Deconstructor
   ~sound();
-        /** play the sound */
+  /// @brief Play the sound
   void play();
-        /** stop the sound */
+  /// @brief Stop the sound
   void stop();
 
 private:
-	/// \param dataSize the Size of the filedata
+  /// \param dataSize Size of the filedata
   u32 dataSize;
+  /// \param waveBuf For ndsp
   ndspWaveBuf waveBuf;
-	u8* data = NULL;
+  /// \param data Memmory data of the sound
+  uint8_t *data = NULL;
+  /// \param chnl Channel of the sound
   int chnl;
 };
-

include/renderd7/stringtool.hpp

@@ -1,11 +1,103 @@
-template<class T>
+#pragma once
-T GetFileName(T const & path, T const & delims = "/\\")
+#include <iomanip>
-{
+#include <iostream>
+#include <sstream>
+#include <string>
+
+namespace RenderD7 {
+/// @brief Check if A String ends with
+/// @param name Input String
+/// @param extensions Extensions to Check for
+/// @return Ends with or not
+inline bool NameIsEndingWith(const std::string &name,
+                             const std::vector<std::string> &extensions) {
+  if (name.substr(0, 2) == "._") return false;
+
+  if (name.size() == 0) return false;
+
+  if (extensions.size() == 0) return true;
+
+  for (int i = 0; i < (int)extensions.size(); i++) {
+    const std::string ext = extensions.at(i);
+    if (strcasecmp(name.c_str() + name.size() - ext.size(), ext.c_str()) == 0)
+      return true;
+  }
+
+  return false;
+}
+/// @brief Format Milliseconds to clean string (Stolen from one of my Mc
+/// Plugins)
+/// @param t_time Time in ms
+/// @return String
+inline std::string MsTimeFmt(float t_time, bool dems = false) {
+  std::ostringstream oss;
+
+  if (t_time < 0.001f) {
+    oss << std::fixed << std::setprecision(2) << t_time * 1000.0f << "ns";
+  } else if (t_time < 1.0f) {
+    oss << std::fixed << std::setprecision(2) << t_time << "ms";
+  } else if (t_time < 60000.0f) {
+    int seconds = static_cast<int>(t_time / 1000.0f);
+    float milliseconds = t_time - (seconds * 1000.0f);
+
+    if (seconds > 0) {
+      oss << seconds << "s ";
+    }
+    if (!dems)
+      oss << std::fixed << std::setprecision(2) << milliseconds << "ms";
+  } else {
+    int minutes = static_cast<int>(t_time / 60000.0f);
+    int seconds = static_cast<int>((t_time - (minutes * 60000.0f)) / 1000.0f);
+    float milliseconds = t_time - (minutes * 60000.0f) - (seconds * 1000.0f);
+
+    oss << minutes << "m ";
+    if (seconds > 0 || milliseconds > 0.0f) {
+      oss << seconds << "s ";
+    }
+    if (milliseconds > 0.0f && !dems) {
+      oss << std::fixed << std::setprecision(2) << milliseconds << "ms";
+    }
+  }
+
+  return oss.str();
+}
+
+inline std::string FormatBytes(int bytes) {
+  char out[32];
+
+  if (bytes == 1)
+    snprintf(out, sizeof(out), "%d Byte", bytes);
+
+  else if (bytes < 1024)
+    snprintf(out, sizeof(out), "%d Bytes", bytes);
+
+  else if (bytes < 1024 * 1024)
+    snprintf(out, sizeof(out), "%.1f KB", (float)bytes / 1024);
+
+  else if (bytes < 1024 * 1024 * 1024)
+    snprintf(out, sizeof(out), "%.1f MB", (float)bytes / 1024 / 1024);
+
+  else
+    snprintf(out, sizeof(out), "%.1f GB", (float)bytes / 1024 / 1024 / 1024);
+
+  return out;
+}
+}  // namespace RenderD7
+
+template <class T>
+T GetFileName(T const &path, T const &delims = "/\\") {
   return path.substr(path.find_last_of(delims) + 1);
 }
-template<class T>
+template <class T>
-T remove_ext(T const & filename)
+T remove_ext(T const &filename) {
-{
   typename T::size_type const p(filename.find_last_of('.'));
   return p > 0 && p != T::npos ? filename.substr(0, p) : filename;
 }
+
+template <typename T>
+std::string Int_To_Hex(T i) {
+  std::stringstream stream;
+  stream << "0x" << std::setfill('0') << std::setw(sizeof(T) * 2) << std::hex
+         << i;
+  return stream.str();
+}

include/renderd7/thread.hpp

@@ -2,35 +2,20 @@
 #include <3ds.h>
 #include <atomic>
 #include <functional>
-#include <string>
 #include <renderd7/parameter.hpp>
+#include <string>
 
 using CTRU_Thread = Thread;
 
 #define THREAD_STACK_SIZE 0x1000
 
 namespace RenderD7 {
-    namespace Threads
+class Thread {
-    {
+public:
-        inline bool threadrunning = false;
-
-        struct Thread
-        {
-            Handle handle;
-            void (*ep)(void);
-            bool finished;
-            void* stacktop;
-        };
-
-        bool Create();
-        bool Join();
-        void Exit();
-    }
-    class Thread {
-    public:
   /**
    * @brief Default constructor
-         * @note This should only be called when calling m3d::Thread::initialize() before calling m3d::Thread::start()
+   * @note This should only be called when calling m3d::Thread::initialize()
+   * before calling m3d::Thread::start()
    */
   Thread();
 
@@ -40,11 +25,18 @@ namespace RenderD7 {
    * @param t_parameter The parameter to pass to the function
    * @param t_autostart Whether the thread should start instantly
    * @param t_detached  Whether the thread starts detached or not
-         * @param t_stackSize The stacksize allocated for the thread in bytes (rounded to multiples of 8 bytes)
+   * @param t_stackSize The stacksize allocated for the thread in bytes (rounded
-         * @note t_function needs to be of type `void` and take one (and only one) parameter of type m3d::Parameter
+   * to multiples of 8 bytes)
-         * @warning If the thread priority is lower than the priority of the calling thread, the thread will never get executed. Use m3d::Thread::getCurrentPriority() to get the priority of the current thread
+   * @note t_function needs to be of type `void` and take one (and only one)
+   * parameter of type m3d::Parameter
+   * @warning If the thread priority is lower than the priority of the calling
+   * thread, the thread will never get executed. Use
+   * m3d::Thread::getCurrentPriority() to get the priority of the current thread
    */
-        Thread(std::function<void(RenderD7::Parameter)> t_function, RenderD7::Parameter t_parameter = nullptr, bool t_autostart = false, bool t_detached = false, unsigned long long int t_stackSize = 4 * 1024);
+  Thread(std::function<void(RenderD7::Parameter)> t_function,
+         RenderD7::Parameter t_parameter = nullptr, bool t_autostart = false,
+         bool t_detached = false,
+         unsigned long long int t_stackSize = 4 * 1024);
 
   /**
    * @brief Destructs the thread
@@ -57,15 +49,24 @@ namespace RenderD7 {
    * @param t_parameter The parameter to pass to the function
    * @param t_autostart Whether the thread should start instantly
    * @param t_detached  Whether the thread starts detached or not
-         * @param t_stackSize The stacksize allocated for the thread in bytes (rounded to multiples of 8 bytes)
+   * @param t_stackSize The stacksize allocated for the thread in bytes (rounded
-         * @note t_function needs to be of type `void` and take one (and only one) parameter of type m3d::Parameter
+   * to multiples of 8 bytes)
-         * @warning If the thread priority is lower than the priority of the calling thread, the thread will never get executed. Use m3d::Thread::getCurrentPriority() to get the priority of the current thread
+   * @note t_function needs to be of type `void` and take one (and only one)
+   * parameter of type m3d::Parameter
+   * @warning If the thread priority is lower than the priority of the calling
+   * thread, the thread will never get executed. Use
+   * m3d::Thread::getCurrentPriority() to get the priority of the current thread
    */
-        void initialize(std::function<void(RenderD7::Parameter)> t_function, RenderD7::Parameter t_parameter = nullptr, bool t_autostart = false, bool t_detached = false, unsigned long long int t_stackSize = 4 * 1024);
+  void initialize(std::function<void(RenderD7::Parameter)> t_function,
+                  RenderD7::Parameter t_parameter = nullptr,
+                  bool t_autostart = false, bool t_detached = false,
+                  unsigned long long int t_stackSize = 4 * 1024);
 
   /**
-         * @brief Sets the size of the stack that gets allocated for the next thread that get's started
+   * @brief Sets the size of the stack that gets allocated for the next thread
-         * @param t_stackSize The allocated space in bytes (rounded to multiples of 8 bytes)
+   * that get's started
+   * @param t_stackSize The allocated space in bytes (rounded to multiples of 8
+   * bytes)
    */
   void setStackSize(unsigned long long int t_stackSize);
 
@@ -91,7 +92,9 @@ namespace RenderD7 {
   /**
    * @brief Puts the thread to sleep
    *
-         * This is needed if you have multiple threads running at the same time. It doesn't affect the execution-time of the thread, it just makes it possible for the other threads to get their chance to shine.
+   * This is needed if you have multiple threads running at the same time. It
+   * doesn't affect the execution-time of the thread, it just makes it possible
+   * for the other threads to get their chance to shine.
    */
   static void sleep();
 
@@ -101,19 +104,19 @@ namespace RenderD7 {
    */
   static void sleep(int t_milliseconds);
 
-    private:
+private:
   struct ThreadData {
     RenderD7::Parameter m_parameter;
     std::function<void(RenderD7::Parameter)> m_function;
-            std::atomic<bool>* m_running;
+    std::atomic<bool> *m_running;
   };
 
-        static void threadFunction(void* t_arg);
+  static void threadFunction(void *t_arg);
   /* data */
   int m_priority, m_stackSize;
   bool m_started;
   std::atomic<bool> m_running;
   RenderD7::Thread::ThreadData m_data;
   CTRU_Thread m_thread;
-    };
+};
-}
+} // namespace RenderD7

include/renderd7/tween.hpp

@@ -1,17 +0,0 @@
-#include <renderd7/Clock.hpp>
-
-namespace rnd7{
-    enum class TweenType : int {Position = 1, Color, Alpha};
-
-    enum class TweenLoop : int {None = 1, Loop = 2,};
-
-    enum class TweenDirection : int {Current, Forward, Backward};
-
-    enum class TweenState : int {Playing = 1, Stopped};
-    class Tween
-    {
-        public:
-        Tween(float from, float to, float duration, TweenLoop loop, TweenState state);
-
-    };
-}

not_functional/Flac.cpp

@@ -0,0 +1,52 @@
+#include <renderd7/music/Flac.hpp>
+#ifdef RENDERD7_MUSICDEC
+#define DR_FLAC_IMPLEMENTATION
+#include <renderd7/external/dr_flac.h>
+
+int rd7i_check_flac(const std::string &path) {
+  int err = -1;
+	drflac* flac = drflac_open_file(path.c_str(), NULL);
+
+	if(flac != NULL)
+		err = 0;
+
+	drflac_close(flac);
+	return err;
+}
+
+namespace RenderD7 {
+int FlacDecoder::_init(const std::string &path, MusicMeta& meta) {
+  meta.path(path);
+  if(path.find_last_of('/') != path.npos)
+    meta.name(path.substr(path.find_last_of('/')));
+  else
+    meta.name(path);
+  flac = drflac_open_file(path.c_str(), NULL);
+  return flac == NULL ? -1 : 0;
+}
+
+unsigned int FlacDecoder::_getSampleRate() { return flac->sampleRate; }
+
+unsigned char FlacDecoder::_getChannels() { return flac->channels; }
+
+size_t FlacDecoder::_getBufSize() { return buf_size; }
+
+unsigned long long FlacDecoder::_decode(signed short*buf_addr) {
+  unsigned long long bsf = (unsigned long long)buf_size/(unsigned long long)flac->channels;
+  
+  unsigned long long samples_read = drflac_read_pcm_frames_s16(flac, bsf, buf_addr);
+  samples_read *= (unsigned long long)flac->channels;
+
+  return samples_read;
+}
+
+void FlacDecoder::_deinit() {
+  drflac_close(flac);
+}
+
+size_t FlacDecoder::_getFileSamples() {
+  return flac->totalPCMFrameCount * (size_t)flac->channels;
+}
+
+} // namespace RenderD7
+#endif

not_functional/Flac.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <renderd7/music/Music.hpp>
+#include <fstream>
+
+#include <renderd7/external/dr_flac.h>
+
+namespace RenderD7 {
+    class FlacDecoder : public MusicDecoder {
+        public:
+        FlacDecoder() {}
+        ~FlacDecoder() {}
+
+        int _init(const std::string& pat, MusicMeta& meta) override;
+        unsigned int _getSampleRate() override;
+        unsigned char _getChannels() override;
+        size_t _getBufSize() override;
+        unsigned long long _decode(signed short* buf_addr) override;
+        void _deinit() override;
+        size_t _getFileSamples() override;
+
+        private:
+        drflac* flac;
+        const size_t buf_size = 16 * 1024;
+    };
+}

not_functional/MUSIC.md

@@ -0,0 +1,40 @@
+# Copy of removed Music.cpp file loaders
+```
+#include <renderd7/music/Flac.hpp>
+#include <renderd7/music/Wav.hpp>
+ // "RIFF"
+/*case 0x46464952:
+// "riff"
+case 0x66666972:
+// "RIFX"
+case 0x58464952:
+// "RF64"
+case 0x34364652:
+// "FORM"
+case 0x4D524F46:
+  decoder = new WavDecoder();
+  if (init(path, rd7i_mp_internal_data.meta)) {
+    MusicDecoder::CleanUp();
+    return;
+  }
+  break;*/
+// Flac
+/*case 0x43614c66:
+  decoder = new FlacDecoder();
+  if (init(path, rd7i_mp_internal_data.meta)) {
+    RenderD7::PushMessage(
+        RenderD7::Message("Music Player", "Failed to load FLAC"));
+    MusicDecoder::CleanUp();
+    return;
+  }
+  break;*/
+
+// The other one
+/*else if (rd7i_check_flac(path) == 0) {
+        decoder = new FlacDecoder();
+        if (init(path, rd7i_mp_internal_data.meta)) {
+          MusicDecoder::CleanUp();
+          return;
+        }
+      }*/
+```

not_functional/Wav.cpp

@@ -0,0 +1,41 @@
+#include <renderd7/music/Wav.hpp>
+
+#ifdef RENDERD7_MUSICDEC
+#define DR_WAV_IMPLEMENTATION
+#include <renderd7/external/dr_wav.h>
+
+namespace RenderD7 {
+int WavDecoder::_init(const std::string &path, MusicMeta& meta) {
+  meta.path(path);
+  if(path.find_last_of('/') != path.npos)
+    meta.name(path.substr(path.find_last_of('/')));
+  else
+    meta.name(path);
+  return !drwav_init_file(&wav, path.c_str(), NULL);
+}
+
+unsigned int WavDecoder::_getSampleRate() { return wav.sampleRate; }
+
+unsigned char WavDecoder::_getChannels() { return wav.channels; }
+
+size_t WavDecoder::_getBufSize() { return buf_size; }
+
+unsigned long long WavDecoder::_decode(signed short*buf_addr) {
+  unsigned long long bsf = (unsigned long long)buf_size/(unsigned long long)wav.channels;
+  
+  unsigned long long samples_read = drwav_read_pcm_frames(&wav, bsf, buf_addr);
+  samples_read *= (unsigned long long)wav.channels;
+
+  return samples_read;
+}
+
+void WavDecoder::_deinit() {
+  drwav_uninit(&wav);
+}
+
+size_t WavDecoder::_getFileSamples() {
+  return wav.totalPCMFrameCount * (size_t)wav.channels;
+}
+
+} // namespace RenderD7
+#endif

not_functional/Wav.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <renderd7/music/Music.hpp>
+#include <fstream>
+
+#include <renderd7/external/dr_wav.h>
+
+namespace RenderD7 {
+    class WavDecoder : public MusicDecoder {
+        public:
+        WavDecoder() {}
+        ~WavDecoder() {}
+
+        int _init(const std::string& path, MusicMeta& meta) override;
+        unsigned int _getSampleRate() override;
+        unsigned char _getChannels() override;
+        size_t _getBufSize() override;
+        unsigned long long _decode(signed short* buf_addr) override;
+        void _deinit() override;
+        size_t _getFileSamples() override;
+
+        private:
+        drwav wav;
+        const size_t buf_size = 16 * 1024;
+    };
+}

rd7tf/Makefile

@@ -0,0 +1,278 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#nicetest
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/3ds_rules
+
+#---------------------------------------------------------------------------------
+# 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
+# GRAPHICS is a list of directories containing graphics files
+# GFXBUILD is the directory where converted graphics files will be placed
+#   If set to $(BUILD), it will statically link in the converted
+#   files as if they were data files.
+#
+# NO_SMDH: if set to anything, no SMDH file is generated.
+# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional)
+# APP_TITLE is the name of the app stored in the SMDH file (Optional)
+# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional)
+# APP_AUTHOR is the author of the app stored in the SMDH file (Optional)
+# ICON is the filename of the icon (.png), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.png
+#     - icon.png
+#     - <libctru folder>/default_icon.png
+
+#---------------------------------------------------------------------------------
+# External tools
+#---------------------------------------------------------------------------------
+ifeq ($(OS),Windows_NT)
+MAKEROM 	?= C:/devkitpro/tools/bin/makerom.exe
+BANNERTOOL 	?= C:/devkitpro/tools/bin/bannertool.exe
+
+else
+MAKEROM 	?= makerom
+BANNERTOOL 	?= bannertool
+
+endif
+
+# 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 := unk
+
+#---------------------------------------------------------------------------------
+# Version number
+#---------------------------------------------------------------------------------
+
+VERSION_MAJOR := 1
+
+VERSION_MINOR := 0
+
+VERSION_MICRO := 0
+
+
+#---------------------------------------------------------------------------------
+# Make Sure to Change this paths if your Submodule
+# is located somewhere else
+# Using ../ cause rd7tf is shipped with the RenderD7
+# Repository!
+RENDERD7_SRC := ../source ../external ../source/music
+RENDERD7_INC := ../include
+# Libraries used for RenderD7
+# if you already use -lm, -lctru etc place a # before -lm
+RENDERD7_LIBS := -lcurl -lm -lcitro2dd -lcitro3d -lctru
+TARGET		:=	rd7tf
+BUILD		:=	build
+SOURCES		:=	source $(RENDERD7_SRC)
+DATA		:=	data
+INCLUDES	:=	source $(RENDERD7_INC)
+GRAPHICS	:=	gfx
+#GFXBUILD	:=	$(BUILD)
+ROMFS		:=	romfs
+GFXBUILD	:=	$(ROMFS)/gfx
+APP_AUTHOR	:=	NPI-D7
+APP_DESCRIPTION := RenderD7 Test Framework
+ICON		:=	app/icon.png
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
+
+CFLAGS	:=	-g -Wall -Wno-psabi -O2 -mword-relocations \
+			-DV_STRING=\"$(GIT_VER)\" \
+			-DV_TIME=\"$(TIME_TIME)\" \
+			-ffunction-sections \
+			$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -D__3DS__ -D_GNU_SOURCE=1
+
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++20 
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+LIBS	:= -lstdc++ $(RENDERD7_LIBS) 
+
+
+#---------------------------------------------------------------------------------
+# 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 OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+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)))
+GFXFILES	:=	$(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.t3s)))
+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
+#---------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------
+ifeq ($(GFXBUILD),$(BUILD))
+#---------------------------------------------------------------------------------
+export T3XFILES :=  $(GFXFILES:.t3s=.t3x)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+export ROMFS_T3XFILES	:=	$(patsubst %.t3s, $(GFXBUILD)/%.t3x, $(GFXFILES))
+export T3XHFILES		:=	$(patsubst %.t3s, $(BUILD)/%.h, $(GFXFILES))
+#---------------------------------------------------------------------------------
+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) $(SHLISTFILES:.shlist=_shbin.h) \
+			$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+export _3DSXDEPS	:=	$(if $(NO_SMDH),,$(OUTPUT).smdh)
+
+ifeq ($(strip $(ICON)),)
+	icons := $(wildcard *.png)
+	ifneq (,$(findstring $(TARGET).png,$(icons)))
+		export APP_ICON := $(TOPDIR)/$(TARGET).png
+	else
+		ifneq (,$(findstring icon.png,$(icons)))
+			export APP_ICON := $(TOPDIR)/icon.png
+		endif
+	endif
+else
+	export APP_ICON := $(TOPDIR)/$(ICON)
+endif
+
+ifeq ($(strip $(NO_SMDH)),)
+	export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
+ifneq ($(ROMFS),)
+	export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
+endif
+
+.PHONY: all clean
+
+#---------------------------------------------------------------------------------
+all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).elf $(TARGET).3dsx $(TARGET).cia $(TARGET).smdh app/*.bin 
+	@rm -fr $(OUTDIR)
+
+#---------------------------------------------------------------------------------
+send:
+	@3dslink -a $(IP) $(TARGET).3dsx
+#---------------------------------------------------------------------------------
+run:
+	@flatpak run org.citra_emu.citra $(TARGET).3dsx
+#---------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------
+3dsx: $(BUILD)
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile 3dsx
+
+#---------------------------------------------------------------------------------
+$(GFXBUILD)/%.t3x	$(BUILD)/%.h	:	%.t3s
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	$(DEVKITPRO)/tools/bin/tex3ds -i $< -H $(BUILD)/$*.h -d $(DEPSDIR)/$*.d -o $(GFXBUILD)/$*.t3x
+
+#---------------------------------------------------------------------------------
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+
+#---------------------------------------------------------------------------------
+else
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all: $(OUTPUT).elf $(OUTPUT).3dsx
+
+$(OUTPUT).elf	:	$(OFILES)
+$(OUTPUT).3dsx	:   $(_3DSXDEPS)
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h :	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+#---------------------------------------------------------------------------------
+.PRECIOUS	:	%.t3x %.shbin
+#---------------------------------------------------------------------------------
+%.t3x.o	%_t3x.h :	%.t3x
+#---------------------------------------------------------------------------------
+	$(SILENTMSG) $(notdir $<)
+	$(bin2o)
+
+#---------------------------------------------------------------------------------
+%.shbin.o %_shbin.h : %.shbin
+#---------------------------------------------------------------------------------
+	$(SILENTMSG) $(notdir $<)
+	$(bin2o)
+
+-include $(DEPSDIR)/*.d
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------

rd7tf/clean.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+#Clean old build
+echo "Cleaning..."
+make clean
+rm -rf libs/*
+cd ..
+make clean
+echo "Done!"

rd7tf/gfx/sprites.t3s

@@ -0,0 +1,6 @@
+--atlas -f rgba -z auto
+
+renderd7.png
+folder.png
+default_icon.png
+unk_icon.png

rd7tf/romfs/gfx/Leere Datei

@@ -0,0 +1 @@
+vcx

rd7tf/romfs/lang/de/app.json

@@ -0,0 +1,5 @@
+{
+    "LOADINGFILES": "Lade Dateien ...",
+    "MENU": "Menü",
+    "LOADING": "Lade ..."
+}

rd7tf/romfs/lang/en/app.json

@@ -0,0 +1,5 @@
+{
+    "LOADINGFILES": "Loading Files ...",
+    "MENU": "Menu",
+    "LOADING": "Loading ..."
+}

rd7tf/source/main.cpp

@@ -0,0 +1,52 @@
+#include "scene.hpp"
+#include "renderd7/music/Music.hpp"
+
+void ColorThemeSample() {
+  RenderD7::ColorNew(RD7Color_Text, RenderD7::Color::Hex("#000000", 255)); 
+  RenderD7::ColorNew(RD7Color_TextDisabled, RenderD7::Color::Hex("#212121", 200));
+  RenderD7::ColorNew(RD7Color_Text2, RenderD7::Color::Hex("#ffffff", 255));        
+  RenderD7::ColorNew(RD7Color_Background, RenderD7::Color::Hex("#eeeeee", 170));   
+  RenderD7::ColorNew(RD7Color_Header, RenderD7::Color::Hex("#222222", 190));       
+  RenderD7::ColorNew(RD7Color_Selector, RenderD7::Color::Hex("#4444dd", 200));
+  RenderD7::ColorNew(RD7Color_SelectorFade, RenderD7::Color::Hex("#7777dd", 200));
+  RenderD7::ColorNew(RD7Color_List0, RenderD7::Color::Hex("#555555", 130));
+  RenderD7::ColorNew(RD7Color_List1, RenderD7::Color::Hex("#777777", 130));
+  RenderD7::ColorNew(RD7Color_MessageBackground, RenderD7::Color::Hex("#222222", 180));
+  RenderD7::ColorNew(RD7Color_Button, RenderD7::Color::Hex("#4444dd", 150));
+  RenderD7::ColorNew(RD7Color_ButtonHovered, RenderD7::Color::Hex("#6666dd", 150));
+  RenderD7::ColorNew(RD7Color_ButtonDisabled, RenderD7::Color::Hex("#2222dd", 150));
+  RenderD7::ColorNew(RD7Color_ButtonActive, RenderD7::Color::Hex("#7777dd", 150));
+  RenderD7::ColorNew(RD7Color_Checkmark, RenderD7::Color::Hex("#4444dd", 130));
+  RenderD7::ColorNew(RD7Color_FrameBg, RenderD7::Color::Hex("#555555", 160));
+  RenderD7::ColorNew(RD7Color_FrameBgHovered, RenderD7::Color::Hex("#777777", 160));
+  RenderD7::ColorNew(RD7Color_Progressbar, RenderD7::Color::Hex("#4444dd", 200));
+}
+
+extern void IdbServer();
+
+int main() {
+  rd7_enable_memtrack = true;
+  rd7_do_splash = true;
+  RenderD7::Ftrace::Beg("app", "app_init");
+  RenderD7::Init::Main("rd7tf");
+  RenderD7::FadeIn();
+  //RenderD7::InlineAssert(1 == 2, "1 is not 2!");
+  //IdbServer();
+  ColorThemeSample();
+  RenderD7::Init::NdspFirm();
+  RenderD7::Scene::Load(std::make_unique<Sample>());
+  RenderD7::Ftrace::End("app", "app_init");
+  while (RenderD7::MainLoop()) {
+    RenderD7::OnScreen(Top);
+    RenderD7::Ftrace::Beg("app", "app_mainloop");
+    if (d7_hDown & KEY_START) {
+      RenderD7::FadeOut();
+      RenderD7::ExitApp();
+    }
+    RenderD7::OnScreen(Top);
+    RenderD7::FrameEnd();
+    RenderD7::Ftrace::End("app", "app_mainloop");
+  }
+
+  return 0;
+}

rd7tf/source/scene.cpp

@@ -0,0 +1,132 @@
+#include "scene.hpp"
+
+#include <cmath>
+
+static float MakeOffset(float x) {
+  float y = cos(x) * 42;
+  return y - floor(y);
+}
+
+static void Wave(int index, R7Vec2 position, R7Vec2 size, float time,
+                 bool dbg) {
+  float offset = MakeOffset(index) * 62;
+  float x_position =
+      position.x + size.x / 8 * ((index % 11) - 1) + cos(offset + time) * 10;
+  float y_position = position.y + size.y / 8 * (index / 11) + 40 +
+                     sin(offset + time) * 10 + 30;
+  float color_effect = 1 - exp(-(index / 11) / 3.0f);
+
+  // As this is 3ds dont go out of the box
+  int shrink = 0;
+  if (y_position >= position.y + size.y - 90) {
+    shrink = y_position - (position.y + size.y - 90);
+  }
+  // Just to make sure...
+  y_position = std::min(y_position, position.y + size.y - (90 - shrink));
+
+  if (dbg)
+    RenderD7::Draw2::TriangleLined(
+        R7Vec2(x_position, y_position),
+        R7Vec2(x_position + 300, y_position + (90 - shrink)),
+        R7Vec2(x_position - 300, y_position + (90 - shrink)),
+        RenderD7::Color::RGBA(.94f - .17f * color_effect,
+                              .61f - .25f * color_effect,
+                              .36f + .38f * color_effect)
+            .toRGBA());
+  else
+    RenderD7::Draw2::TriangleSolid(
+        R7Vec2(x_position, y_position),
+        R7Vec2(x_position + 300, y_position + (90 - shrink)),
+        R7Vec2(x_position - 300, y_position + (90 - shrink)),
+        RenderD7::Color::RGBA(.94f - .17f * color_effect,
+                              .61f - .25f * color_effect,
+                              .36f + .38f * color_effect)
+            .toRGBA());
+}
+
+void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) {
+  RenderD7::Draw2::RectFilledSolid(position, size, 0xff64c9fd);
+  int i = 0;
+  for (; i < 44; i++) Wave(i, position, size, time, dbg);
+}
+
+R7Vec2 testv2 = R7Vec2(48, 48);
+
+R7Vec2 grid_display_entry(void* data, R7Vec2 pos) {
+  auto img = reinterpret_cast<RenderD7::Image*>(data);
+  RenderD7::Draw2::Image(img, pos);
+  RenderD7::Draw2::RFS(pos, testv2, RenderD7::Color::Hex("#0000ff", 140));
+  return testv2;
+}
+
+std::vector<RenderD7::Image*> imgdb;
+
+Sample::Sample() {
+  /*RenderD7::Image* im = new RenderD7::Image();
+  im->load("romfs:/icons/icon.png");
+  for(int i = 0; i < 64; i++) 
+    imgdb.push_back(im);*/
+  auto t = RenderD7::FileSystem::GetDirContent("sdmc:/music/");
+  for(const auto& it : t)
+    names.push_back(it.path);
+}
+
+Sample::~Sample() {
+  // Here you can clear your data
+}
+
+void Sample::Draw() const {
+  // Draw Things to Screen:
+  // Step 1 -> Select Screen
+  RenderD7::OnScreen(Top);
+  // Step 2 -> Draw Things
+  // The hbloader Triangle Wave
+  DrawWave(R7Vec2(0, 0), R7Vec2(400, 240), RenderD7::GetTime(),
+           debug_background);
+  // For Example A Rect with Draw2 and StyleColorApi
+  // And the RFS Wrapper for RectFilledSolid lol
+  /*RenderD7::Draw2::RFS(R7Vec2(0, 0), R7Vec2(400, 20),
+                       RenderD7::StyleColor(RD7Color_Header));
+  // As the Top bar is Dark you need TextColor2
+  RenderD7::RedirectColor(RD7Color_Text, RD7Color_Text2);
+  RenderD7::Draw2::Text(R7Vec2(5, 2), "RenderD7 - Test Framework");
+  RenderD7::Draw2::Text(R7Vec2(395, 2), RENDERD7VSTRING,
+                        RD7TextFlags_AlignRight);
+  RenderD7::UndoColorEdit(RD7Color_Text);*/
+  if (UI7::BeginMenu("RenderD7 Test Framework")) {
+    UI7::SetCursorPos(R7Vec2(395, 2));
+    UI7::Label(RenderD7::FormatBytes(RenderD7::Memory::GetCurrent()), RD7TextFlags_AlignRight);
+    UI7::RestoreCursor();
+    //UI7::Grid("Files", R7Vec2(390, 210), grid_display_entry, reinterpret_cast<void**>(imgdb.data()), imgdb.size());
+    UI7::BrowserList(names, sel);
+    UI7::EndMenu();
+  }
+  RenderD7::OnScreen(Bottom);
+  if (UI7::BeginMenu("Control Center")) {
+    if (UI7::Button("RenderD7 Settings"))
+      shared_requests[1U] = 1U;  // Request a Toggle
+    UI7::SameLine();
+    if (UI7::Button("Test Message"))
+      shared_requests[2U] = 1U;  // Request Test Msg
+    UI7::Checkbox("Debug BG", debug_background);
+    UI7::SameLine();
+    UI7::Checkbox("RD7-Debug", rd7_debugging);
+    UI7::InputText("Search", search__, "Tap Here");
+    UI7::EndMenu();
+  }
+}
+
+void Sample::Logic() {
+  for (const auto& it : shared_requests) {
+    if (it.first == 1U) {
+      if (it.second) RenderD7::LoadSettings();
+    } else if (it.first == 2U) {
+      if (it.second)
+        RenderD7::PushMessage(RenderD7::Message(
+            "Test Message", "Button Bressed\nBest Msg Handler..."));
+    }
+  }
+  // Make sure to clear after processing!!!;
+  shared_requests.clear();
+  if (d7_hDown & KEY_B) debug_background = !debug_background;
+}

rd7tf/source/scene.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <rd7.hpp>
+
+class Sample : public RenderD7::Scene {
+public:
+  Sample();
+  ~Sample();
+
+  void Draw() const override;
+  void Logic() override;
+
+private:
+  // Just as the RD7 Settings Shows here as example
+  // by using a mutale map you're able to process
+  // requests from the const Draw function in the
+  // Logic Function! you could also create lots of
+  // mutable bool or make all Variables mutable but
+  // i think seperating draw and logic is better
+  // editable map  request_id    data/operation
+  mutable std::map<unsigned int, unsigned int> shared_requests;
+  // For Checkbox its best to use mutable
+  mutable bool debug_background = false;
+  mutable std::string search__ = "";
+  mutable std::vector<std::string> names;
+  mutable int sel;
+};