Moved lots of code into an implementation folder.

Source/DFPSR/api/bufferAPI.cpp

@@ -24,7 +24,7 @@
 #include <fstream>
 #include "bufferAPI.h"
 #include "stringAPI.h"
-#include "../math/scalar.h"
+#include "../implementation/math/scalar.h"
 #include "../base/SafePointer.h"
 
 namespace dsr {

Source/DFPSR/api/drawAPI.cpp

@@ -23,8 +23,8 @@
 //    distribution.
 
 #include "imageAPI.h"
-#include "../math/scalar.h"
-#include "../image/PackOrder.h"
+#include "../implementation/math/scalar.h"
+#include "../implementation/image/PackOrder.h"
 #include <limits>
 
 namespace dsr {

Source/DFPSR/api/drawAPI.h

@@ -25,7 +25,7 @@
 #ifndef DFPSR_API_DRAW
 #define DFPSR_API_DRAW
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 
 namespace dsr {
 

Source/DFPSR/api/filterAPI.cpp

@@ -29,7 +29,7 @@
 #include "filterAPI.h"
 #include "imageAPI.h"
 #include "drawAPI.h"
-#include "../image/PackOrder.h"
+#include "../implementation/image/PackOrder.h"
 #include "../base/simd.h"
 
 namespace dsr {

Source/DFPSR/api/filterAPI.h

@@ -25,7 +25,7 @@
 #ifndef DFPSR_API_FILTER
 #define DFPSR_API_FILTER
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include <functional>
 
 namespace dsr {

Source/DFPSR/api/fontAPI.cpp

@@ -23,8 +23,8 @@
 
 #include "fontAPI.h"
 #include "imageAPI.h"
-#include "../font/Font.h"
-#include "../font/defaultFont.h"
+#include "../implementation/font/Font.h"
+#include "../implementation/font/defaultFont.h"
 
 namespace dsr {
 

Source/DFPSR/api/fontAPI.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_FONT
 #define DFPSR_API_FONT
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include "stringAPI.h"
 
 namespace dsr {

Source/DFPSR/api/guiAPI.cpp

@@ -26,7 +26,7 @@
 
 #include "guiAPI.h"
 #include "timeAPI.h"
-#include "../gui/DsrWindow.h"
+#include "../implementation/gui/DsrWindow.h"
 #include "fileAPI.h"
 
 using namespace dsr;

Source/DFPSR/api/guiAPI.h

@@ -27,9 +27,9 @@
 
 #include "../base/Handle.h"
 #include "../api/stringAPI.h"
-#include "../image/Image.h"
-#include "../gui/InputEvent.h"
-#include "../gui/VisualTheme.h"
+#include "../implementation/image/Image.h"
+#include "../implementation/gui/InputEvent.h"
+#include "../implementation/gui/VisualTheme.h"
 
 // createBackendWindow should be implemented outside of the core framework
 //   Choose one of the window backends in SDK/native to compile and link with your application.

Source/DFPSR/api/imageAPI.cpp

@@ -29,8 +29,8 @@
 #include "imageAPI.h"
 #include "drawAPI.h"
 #include "fileAPI.h"
-#include "../image/stbImage/stbImageWrapper.h"
-#include "../math/scalar.h"
+#include "../implementation/image/stbImage/stbImageWrapper.h"
+#include "../implementation/math/scalar.h"
 #include "../settings.h"
 
 namespace dsr {

Source/DFPSR/api/imageAPI.h

@@ -28,10 +28,10 @@
 #ifndef DFPSR_API_IMAGE
 #define DFPSR_API_IMAGE
 
-#include "../image/Image.h"
-#include "../image/Color.h"
+#include "../implementation/image/Image.h"
+#include "../implementation/image/Color.h"
+#include "../implementation/math/scalar.h"
 #include "../base/heap.h"
-#include "../math/scalar.h"
 
 namespace dsr {
 

Source/DFPSR/api/mediaMachineAPI.cpp

@@ -24,8 +24,8 @@
 #define DSR_INTERNAL_ACCESS
 
 #include "mediaMachineAPI.h"
-#include "../machine/VirtualMachine.h"
-#include "../machine/mediaFilters.h"
+#include "../implementation/machine/VirtualMachine.h"
+#include "../implementation/machine/mediaFilters.h"
 #include "../api/imageAPI.h"
 #include "../api/drawAPI.h"
 #include "../api/filterAPI.h"

Source/DFPSR/api/mediaMachineAPI.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_API_MEDIA_MACHINE
 #define DFPSR_API_MEDIA_MACHINE
 
-#include "../image/Image.h"
+#include "../implementation/image/Image.h"
 #include "../base/Handle.h"
 #include "../math/FixedPoint.h"
 

Source/DFPSR/api/modelAPI.cpp

@@ -26,9 +26,9 @@
 #include "modelAPI.h"
 #include "imageAPI.h"
 #include "drawAPI.h"
-#include "../render/model/Model.h"
-#include <limits>
+#include "../implementation/render/model/Model.h"
 #include "../base/virtualStack.h"
+#include <limits>
 
 #define MUST_EXIST(OBJECT, METHOD) if (OBJECT.isNull()) { throwError("The " #OBJECT " handle was null in " #METHOD "\n"); }
 

Source/DFPSR/api/modelAPI.h

@@ -25,9 +25,9 @@
 #define DFPSR_API_MODEL
 
 #include "../math/FVector.h"
-#include "../image/Texture.h"
-#include "../render/Camera.h"
-#include "../render/ResourcePool.h"
+#include "../implementation/image/Texture.h"
+#include "../implementation/render/Camera.h"
+#include "../implementation/render/ResourcePool.h"
 
 // TODO: Create a folder with types.
 namespace dsr {
@@ -36,7 +36,7 @@ namespace dsr {
 	using Model = Handle<ModelImpl>;
 }
 
-#include "../render/model/format/dmf1.h"
+#include "../implementation/render/model/format/dmf1.h"
 
 namespace dsr {
 	// A handle to a multi-threaded rendering context.

Source/DFPSR/api/textureAPI.cpp

@@ -25,7 +25,6 @@
 #include "textureAPI.h"
 #include "imageAPI.h"
 #include "filterAPI.h"
-			#include "drawAPI.h"
 
 namespace dsr {
 

Source/DFPSR/api/textureAPI.h

@@ -87,8 +87,8 @@
 #ifndef DFPSR_API_TEXTURE
 #define DFPSR_API_TEXTURE
 
-#include "../image/Texture.h"
-#include "../image/Image.h"
+#include "../implementation/image/Texture.h"
+#include "../implementation/image/Image.h"
 #ifndef NDEBUG
 	#include "../api/stringAPI.h"
 #endif

Source/DFPSR/base/simd3D.h

@@ -21,6 +21,8 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
+// TODO: Replace simd3D.h with templates in the math folder using noSimd.h.
+
 #include "simd.h"
 #include "../math/FVector.h"
 

Source/DFPSR/base/threading.cpp

@@ -23,7 +23,7 @@
 
 #include "threading.h"
 #include "virtualStack.h"
-#include "../math/scalar.h"
+#include "../implementation/math/scalar.h"
 
 // Get settings from here.
 #include "../settings.h"

Source/DFPSR/implementation/README.md

@@ -0,0 +1,3 @@
+# The implementation folder
+To clearly define what is a part of the external interface to the framework, the code that is mainly for internal use is placed within this implementation folder.
+While you can include headers directly from the implementation by controlling exactly which version of the library you use, it should be kept to a minimum because it may break backward compatibility without warning in new releases.

Source/DFPSR/font/Font.cpp → Source/DFPSR/implementation/font/Font.cpp

@@ -23,8 +23,8 @@
 
 #include <cstdint>
 #include "Font.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/font/Font.h → Source/DFPSR/implementation/font/Font.h

@@ -24,11 +24,11 @@
 #ifndef DFPSR_GUI_FONT
 #define DFPSR_GUI_FONT
 
-#include "../base/Handle.h"
-#include "../api/stringAPI.h"
-#include "../api/imageAPI.h"
-#include "../math/IRect.h"
-#include "../math/IVector.h"
+#include "../../base/Handle.h"
+#include "../../api/stringAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../math/IRect.h"
+#include "../../math/IVector.h"
 
 namespace dsr {
 

Source/DFPSR/gui/BackendWindow.h → Source/DFPSR/implementation/gui/BackendWindow.h

@@ -27,9 +27,9 @@
 #include <cstdint>
 #include <memory>
 #include "InputEvent.h"
-#include "../api/imageAPI.h"
-#include "../api/stringAPI.h"
-#include "../collection/List.h"
+#include "../../api/imageAPI.h"
+#include "../../api/stringAPI.h"
+#include "../../collection/List.h"
 
 namespace dsr {
 

Source/DFPSR/gui/DsrWindow.cpp → Source/DFPSR/implementation/gui/DsrWindow.cpp

@@ -35,9 +35,9 @@
 // <<<< Include new components here
 
 #include "../math/scalar.h"
-#include "../math/IVector.h"
-#include "../api/imageAPI.h"
-#include "../api/filterAPI.h"
+#include "../../math/IVector.h"
+#include "../../api/imageAPI.h"
+#include "../../api/filterAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/gui/DsrWindow.h → Source/DFPSR/implementation/gui/DsrWindow.h

@@ -25,9 +25,9 @@
 #ifndef DFPSR_GUI_DSRWINDOW
 #define DFPSR_GUI_DSRWINDOW
 
-#include "../gui/VisualComponent.h"
-#include "../gui/BackendWindow.h"
-#include "../api/stringAPI.h"
+#include "VisualComponent.h"
+#include "BackendWindow.h"
+#include "../../api/stringAPI.h"
 
 // The DSR window is responsible for connecting visual interfaces with the backend window.
 //   An optional depth buffer is allocated on demand when requested, and kept until the window resizes.

Source/DFPSR/gui/FlexRegion.h → Source/DFPSR/implementation/gui/FlexRegion.h

@@ -25,10 +25,10 @@
 #define DFPSR_GUI_FLEXREGION
 
 #include <cstdint>
-#include "../math/IVector.h"
-#include "../math/IRect.h"
+#include "../../math/IVector.h"
+#include "../../math/IRect.h"
 #include "../math/scalar.h"
-#include "../api/stringAPI.h"
+#include "../../api/stringAPI.h"
 #include "../persistent/ClassFactory.h"
 
 namespace dsr {

Source/DFPSR/gui/InputEvent.h → Source/DFPSR/implementation/gui/InputEvent.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_GUI_INPUT_EVENT
 #define DFPSR_GUI_INPUT_EVENT
 
-#include "../math/IVector.h"
+#include "../../math/IVector.h"
 #include <functional>
 
 namespace dsr {

Source/DFPSR/gui/VisualComponent.h → Source/DFPSR/implementation/gui/VisualComponent.h

@@ -30,8 +30,8 @@
 #include "InputEvent.h"
 #include "componentStates.h"
 #include "VisualTheme.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/VisualTheme.cpp → Source/DFPSR/implementation/gui/VisualTheme.cpp

@@ -23,11 +23,11 @@
 
 #include <cstdint>
 #include "VisualTheme.h"
-#include "../api/fileAPI.h"
-#include "../api/imageAPI.h"
-#include "../api/drawAPI.h"
-#include "../api/mediaMachineAPI.h"
-#include "../api/configAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/drawAPI.h"
+#include "../../api/mediaMachineAPI.h"
+#include "../../api/configAPI.h"
 #include "../persistent/atomic/PersistentImage.h"
 
 namespace dsr {

Source/DFPSR/gui/VisualTheme.h → Source/DFPSR/implementation/gui/VisualTheme.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_GUI_VISUALTHEME
 #define DFPSR_GUI_VISUALTHEME
 
-#include "../api/mediaMachineAPI.h"
+#include "../../api/mediaMachineAPI.h"
 #include "componentStates.h"
 
 namespace dsr {

Source/DFPSR/gui/components/Button.h → Source/DFPSR/implementation/gui/components/Button.h

@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_BUTTON
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/components/Label.h → Source/DFPSR/implementation/gui/components/Label.h

@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_LABEL
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/components/ListBox.h → Source/DFPSR/implementation/gui/components/ListBox.h

@@ -26,7 +26,7 @@
 
 #include "../VisualComponent.h"
 #include "helpers/ScrollBarImpl.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/components/Menu.h → Source/DFPSR/implementation/gui/components/Menu.h

@@ -25,7 +25,7 @@
 #define DFPSR_GUI_COMPONENT_MENU
 
 #include "../VisualComponent.h"
-#include "../../api/fontAPI.h"
+#include "../../../api/fontAPI.h"
 
 namespace dsr {
 

Source/DFPSR/gui/components/Picture.cpp → Source/DFPSR/implementation/gui/components/Picture.cpp

@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "Picture.h"
-#include "../../api/filterAPI.h"
+#include "../../../api/filterAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/gui/components/TextBox.h → Source/DFPSR/implementation/gui/components/TextBox.h

@@ -26,8 +26,8 @@
 
 #include "../VisualComponent.h"
 #include "helpers/ScrollBarImpl.h"
-#include "../../api/fontAPI.h"
-#include "../../math/LVector.h"
+#include "../../../api/fontAPI.h"
+#include "../../../math/LVector.h"
 
 namespace dsr {
 

Source/DFPSR/image/Color.h → Source/DFPSR/implementation/image/Color.h

@@ -25,7 +25,7 @@
 #define DFPSR_IMAGE_COLOR
 
 #include <cstdint>
-#include "../api/stringAPI.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/Image.h → Source/DFPSR/implementation/image/Image.h

@@ -26,8 +26,8 @@
 #define DFPSR_IMAGE_TYPES
 
 #include "PackOrder.h"
-#include "../math/IRect.h"
-#include "../api/bufferAPI.h"
+#include "../../math/IRect.h"
+#include "../../api/bufferAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/ImageLoader.h → Source/DFPSR/implementation/image/ImageLoader.h

@@ -25,7 +25,7 @@
 #define DFPSR_IMAGE_LOADER
 
 #include "Image.h"
-#include "../base/text.h"
+#include "../../api/stringAPI.h"
 #include <cstdio>
 
 namespace dsr {

Source/DFPSR/image/PackOrder.h → Source/DFPSR/implementation/image/PackOrder.h

@@ -26,9 +26,9 @@
 
 #include <cstdint>
 #include "Color.h"
-#include "../base/endian.h"
-#include "../base/noSimd.h"
-#include "../api/stringAPI.h"
+#include "../../base/endian.h"
+#include "../../base/noSimd.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/Texture.h → Source/DFPSR/implementation/image/Texture.h

@@ -26,8 +26,8 @@
 #define DFPSR_TEXTURE_TYPES
 
 #include "Image.h"
-#include "../base/noSimd.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
-#include "../base/DsrTraits.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
+#include "../../base/noSimd.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
+#include "../../base/DsrTraits.h" // Scalar versions of the SIMD functions for creating template functions both with and without SIMD.
 #include "../math/scalar.h"
 
 namespace dsr {

Source/DFPSR/image/stbImage/stbImageWrapper.cpp → Source/DFPSR/implementation/image/stbImage/stbImageWrapper.cpp

@@ -7,7 +7,7 @@
 
 #include "stbImageWrapper.h"
 
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 
 namespace dsr {
 

Source/DFPSR/image/stbImage/stbImageWrapper.h → Source/DFPSR/implementation/image/stbImage/stbImageWrapper.h

@@ -2,8 +2,8 @@
 #ifndef DFPSR_API_IMAGE_STB_WRAPPER
 #define DFPSR_API_IMAGE_STB_WRAPPER
 
-#include "../../image/Image.h"
-#include "../../api/stringAPI.h"
+#include "../Image.h"
+#include "../../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/machine/VirtualMachine.cpp → Source/DFPSR/implementation/machine/VirtualMachine.cpp

@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "VirtualMachine.h"
-#include "../api/timeAPI.h"
+#include "../../api/timeAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/machine/VirtualMachine.h → Source/DFPSR/implementation/machine/VirtualMachine.h

@@ -25,9 +25,9 @@
 #define DFPSR_VIRTUAL_MACHINE
 
 #include <cstdint>
-#include "../math/FixedPoint.h"
-#include "../collection/Array.h"
-#include "../collection/List.h"
+#include "../../math/FixedPoint.h"
+#include "../../collection/Array.h"
+#include "../../collection/List.h"
 
 // Flags
 //#define VIRTUAL_MACHINE_PROFILE // Enable profiling

Source/DFPSR/machine/mediaFilters.cpp → Source/DFPSR/implementation/machine/mediaFilters.cpp

@@ -22,8 +22,8 @@
 //    distribution.
 
 #include "mediaFilters.h"
-#include "../base/simd.h"
-#include "../api/drawAPI.h"
+#include "../../base/simd.h"
+#include "../../api/drawAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/machine/mediaFilters.h → Source/DFPSR/implementation/machine/mediaFilters.h

@@ -24,8 +24,8 @@
 #ifndef DFPSR_MEDIA_FILTERS
 #define DFPSR_MEDIA_FILTERS
 
-#include "../api/imageAPI.h"
-#include "../math/FixedPoint.h"
+#include "../../api/imageAPI.h"
+#include "../../math/FixedPoint.h"
 
 namespace dsr {
 

Source/DFPSR/math/scalar.h → Source/DFPSR/implementation/math/scalar.h

@@ -24,7 +24,7 @@
 #ifndef DFPSR_MATH_SCALAR
 #define DFPSR_MATH_SCALAR
 
-#include "../base/noSimd.h"
+#include "../../base/noSimd.h"
 
 namespace dsr {
 

Source/DFPSR/persistent/ClassFactory.h → Source/DFPSR/implementation/persistent/ClassFactory.h

@@ -24,9 +24,9 @@
 #ifndef DFPSR_PERSISTENT_CLASSFACTORY
 #define DFPSR_PERSISTENT_CLASSFACTORY
 
-#include "../api/stringAPI.h"
-#include "../api/fileAPI.h"
-#include "../collection/List.h"
+#include "../../api/stringAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../collection/List.h"
 #include <memory>
 
 namespace dsr {

Source/DFPSR/persistent/atomic/PersistentImage.cpp → Source/DFPSR/implementation/persistent/atomic/PersistentImage.cpp

@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "PersistentImage.h"
-#include "../../api/fileAPI.h"
+#include "../../../api/fileAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/persistent/atomic/PersistentImage.h → Source/DFPSR/implementation/persistent/atomic/PersistentImage.h

@@ -25,7 +25,7 @@
 #define DFPSR_GUI_PERSISTENTIMAGE
 
 #include "../ClassFactory.h"
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 
 namespace dsr {
 

Source/DFPSR/persistent/atomic/PersistentStringList.cpp → Source/DFPSR/implementation/persistent/atomic/PersistentStringList.cpp

@@ -22,7 +22,7 @@
 //    distribution.
 
 #include "PersistentStringList.h"
-#include "../../collection/List.h"
+#include "../../../collection/List.h"
 
 using namespace dsr;
 

Source/DFPSR/render/Camera.h → Source/DFPSR/implementation/render/Camera.h

@@ -26,10 +26,10 @@
 
 #include <cstdint>
 #include <cassert>
-#include "../math/FVector.h"
-#include "../math/LVector.h"
-#include "../math/FPlane3D.h"
-#include "../math/Transform3D.h"
+#include "../../math/FVector.h"
+#include "../../math/LVector.h"
+#include "../../math/FPlane3D.h"
+#include "../../math/Transform3D.h"
 #include "../math/scalar.h"
 #include "constants.h"
 #include "ProjectedPoint.h"

Source/DFPSR/render/ITriangle2D.cpp → Source/DFPSR/implementation/render/ITriangle2D.cpp

@@ -23,7 +23,7 @@
 
 #include "ITriangle2D.h"
 #include "../math/scalar.h"
-#include "../math/FMatrix2x2.h"
+#include "../../math/FMatrix2x2.h"
 #include <algorithm>
 
 using namespace dsr;

Source/DFPSR/render/ITriangle2D.h → Source/DFPSR/implementation/render/ITriangle2D.h

@@ -27,9 +27,9 @@
 #include <cstdint>
 #include <cassert>
 #include "ProjectedPoint.h"
-#include "../math/FVector.h"
-#include "../math/IVector.h"
-#include "../math/IRect.h"
+#include "../../math/FVector.h"
+#include "../../math/IVector.h"
+#include "../../math/IRect.h"
 #include "constants.h"
 
 namespace dsr {

Source/DFPSR/render/ProjectedPoint.h → Source/DFPSR/implementation/render/ProjectedPoint.h

@@ -25,8 +25,8 @@
 #define DFPSR_RENDER_PROJECTEDPOINT
 
 #include <cstdint>
-#include "../math/FVector.h"
-#include "../math/LVector.h"
+#include "../../math/FVector.h"
+#include "../../math/LVector.h"
 
 namespace dsr {
 

Source/DFPSR/render/ResourcePool.cpp → Source/DFPSR/implementation/render/ResourcePool.cpp

@@ -23,9 +23,9 @@
 
 #include "ResourcePool.h"
 #include "../image/stbImage/stbImageWrapper.h"
-#include "../api/fileAPI.h"
-#include "../api/imageAPI.h"
-#include "../api/textureAPI.h"
+#include "../../api/fileAPI.h"
+#include "../../api/imageAPI.h"
+#include "../../api/textureAPI.h"
 
 using namespace dsr;
 

Source/DFPSR/render/ResourcePool.h → Source/DFPSR/implementation/render/ResourcePool.h

@@ -25,8 +25,8 @@
 #define DFPSR_RENDER_RESOURCE_POOL
 
 #include "../image/Texture.h"
-#include "../collection/List.h"
-#include "../api/stringAPI.h"
+#include "../../collection/List.h"
+#include "../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/render/model/Model.cpp → Source/DFPSR/implementation/render/model/Model.cpp

@@ -25,9 +25,9 @@
 
 #include "Model.h"
 #include "../constants.h"
-#include "../../api/imageAPI.h"
-#include "../../api/textureAPI.h"
-#include "../../base/virtualStack.h"
+#include "../../../api/imageAPI.h"
+#include "../../../api/textureAPI.h"
+#include "../../../base/virtualStack.h"
 
 using namespace dsr;
 

Source/DFPSR/render/model/Model.h → Source/DFPSR/implementation/render/model/Model.h

@@ -25,13 +25,13 @@
 #define DFPSR_RENDER_MODEL_POLYGONMODEL
 
 #include <cstdint>
-#include "../../api/stringAPI.h"
+#include "../../../api/stringAPI.h"
 #include "../../image/Texture.h"
 #include "../shader/Shader.h"
 #include "../Camera.h"
 #include "../ResourcePool.h"
 #include "../renderCore.h"
-#include "../../math/FVector.h"
+#include "../../../math/FVector.h"
 
 namespace dsr {
 

Source/DFPSR/render/model/format/dmf1.cpp → Source/DFPSR/implementation/render/model/format/dmf1.cpp

@@ -21,7 +21,7 @@
 //    3. This notice may not be removed or altered from any source
 //    distribution.
 
-#include "../../../api/modelAPI.h"
+#include "../../../../api/modelAPI.h"
 #include "../Model.h" // TODO: Only use the public API
 
 using namespace dsr;

Source/DFPSR/render/model/format/dmf1.h → Source/DFPSR/implementation/render/model/format/dmf1.h

@@ -25,7 +25,7 @@
 #define DFPSR_RENDER_MODEL_IMPORT_DMF1
 
 #include "../../ResourcePool.h"
-#include "../../../api/stringAPI.h"
+#include "../../../../api/stringAPI.h"
 
 namespace dsr {
 

Source/DFPSR/render/renderCore.cpp → Source/DFPSR/implementation/render/renderCore.cpp

@@ -23,7 +23,7 @@
 
 #include <cassert>
 #include "renderCore.h"
-#include "../base/virtualStack.h"
+#include "../../base/virtualStack.h"
 #include "shader/RgbaMultiply.h"
 #include "constants.h"
 

Source/DFPSR/render/renderCore.h → Source/DFPSR/implementation/render/renderCore.h

@@ -27,8 +27,8 @@
 #include <cstdint>
 #include "Camera.h"
 #include "shader/Shader.h"
-#include "../base/threading.h"
-#include "../collection/List.h"
+#include "../../base/threading.h"
+#include "../../collection/List.h"
 
 namespace dsr {
 

Source/DFPSR/render/shader/fillerTemplates.h → Source/DFPSR/implementation/render/shader/fillerTemplates.h

@@ -25,7 +25,7 @@
 #define DFPSR_RENDER_FILLER_TEMPLATES
 
 #include <cstdint>
-#include "../../api/imageAPI.h"
+#include "../../../api/imageAPI.h"
 #include "../ITriangle2D.h"
 #include "shaderTypes.h"