diff --git a/openVulkanoCpp/AR/ArConstans.hpp b/openVulkanoCpp/AR/ArConstans.hpp index 569d3a5..6a8fc57 100644 --- a/openVulkanoCpp/AR/ArConstans.hpp +++ b/openVulkanoCpp/AR/ArConstans.hpp @@ -9,7 +9,7 @@ #include "Math/Math.hpp" #include "Math/Range.hpp" -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArConstants final { diff --git a/openVulkanoCpp/AR/ArDepthFormat.hpp b/openVulkanoCpp/AR/ArDepthFormat.hpp index 2dee19d..11600f1 100644 --- a/openVulkanoCpp/AR/ArDepthFormat.hpp +++ b/openVulkanoCpp/AR/ArDepthFormat.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArDepthFormat final { diff --git a/openVulkanoCpp/AR/ArFrame.cpp b/openVulkanoCpp/AR/ArFrame.cpp index 8b63aa4..2f2aeb6 100644 --- a/openVulkanoCpp/AR/ArFrame.cpp +++ b/openVulkanoCpp/AR/ArFrame.cpp @@ -8,7 +8,7 @@ #include "ArSession.hpp" #include "ArRecorder.hpp" -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { float ArFrame::GetConfidenceNormalisationFactor() const { diff --git a/openVulkanoCpp/AR/ArFrame.hpp b/openVulkanoCpp/AR/ArFrame.hpp index 38e32cd..0712fbe 100644 --- a/openVulkanoCpp/AR/ArFrame.hpp +++ b/openVulkanoCpp/AR/ArFrame.hpp @@ -16,7 +16,7 @@ #include #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArSession; diff --git a/openVulkanoCpp/AR/ArFrameMetadata.cpp b/openVulkanoCpp/AR/ArFrameMetadata.cpp index fbea473..82c27df 100644 --- a/openVulkanoCpp/AR/ArFrameMetadata.cpp +++ b/openVulkanoCpp/AR/ArFrameMetadata.cpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { namespace { diff --git a/openVulkanoCpp/AR/ArFrameMetadata.hpp b/openVulkanoCpp/AR/ArFrameMetadata.hpp index d0dd39e..bb63466 100644 --- a/openVulkanoCpp/AR/ArFrameMetadata.hpp +++ b/openVulkanoCpp/AR/ArFrameMetadata.hpp @@ -10,7 +10,7 @@ #include "Math/CameraIntrinsic.hpp" #include "Math/Timestamp.hpp" -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { struct ArFrameMetadata { diff --git a/openVulkanoCpp/AR/ArRecorder.cpp b/openVulkanoCpp/AR/ArRecorder.cpp index d702740..24f413f 100644 --- a/openVulkanoCpp/AR/ArRecorder.cpp +++ b/openVulkanoCpp/AR/ArRecorder.cpp @@ -21,7 +21,7 @@ #define TURBO_JPEG //#endif -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { namespace { diff --git a/openVulkanoCpp/AR/ArRecorder.hpp b/openVulkanoCpp/AR/ArRecorder.hpp index f107af8..68bd15b 100644 --- a/openVulkanoCpp/AR/ArRecorder.hpp +++ b/openVulkanoCpp/AR/ArRecorder.hpp @@ -16,13 +16,13 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IEventHandler; class MultiPartArchiveWriter; } -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArSession; class ArFrame; diff --git a/openVulkanoCpp/AR/ArSession.cpp b/openVulkanoCpp/AR/ArSession.cpp index 8003e49..cbf3395 100644 --- a/openVulkanoCpp/AR/ArSession.cpp +++ b/openVulkanoCpp/AR/ArSession.cpp @@ -17,7 +17,7 @@ #endif #endif -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { std::vector> ArSession::sessions; std::weak_ptr ArSession::nativeSession; diff --git a/openVulkanoCpp/AR/ArSession.hpp b/openVulkanoCpp/AR/ArSession.hpp index 19b3f18..209c728 100644 --- a/openVulkanoCpp/AR/ArSession.hpp +++ b/openVulkanoCpp/AR/ArSession.hpp @@ -19,7 +19,7 @@ #include #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArSession; class ArFrame; diff --git a/openVulkanoCpp/AR/ArSessionMetadata.cpp b/openVulkanoCpp/AR/ArSessionMetadata.cpp index de67b75..3704666 100644 --- a/openVulkanoCpp/AR/ArSessionMetadata.cpp +++ b/openVulkanoCpp/AR/ArSessionMetadata.cpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { ArSessionMetadata ArSessionMetadata::FromXML(const std::string& filePath) { diff --git a/openVulkanoCpp/AR/ArSessionMetadata.hpp b/openVulkanoCpp/AR/ArSessionMetadata.hpp index 8a1931a..8e756c2 100644 --- a/openVulkanoCpp/AR/ArSessionMetadata.hpp +++ b/openVulkanoCpp/AR/ArSessionMetadata.hpp @@ -10,7 +10,7 @@ #include "AR/ArDepthFormat.hpp" #include "Math/Range.hpp" -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { struct ArSessionMetadata { diff --git a/openVulkanoCpp/AR/ArTrackingState.hpp b/openVulkanoCpp/AR/ArTrackingState.hpp index fa38d10..29bf304 100644 --- a/openVulkanoCpp/AR/ArTrackingState.hpp +++ b/openVulkanoCpp/AR/ArTrackingState.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArTrackingState final { diff --git a/openVulkanoCpp/AR/ArType.hpp b/openVulkanoCpp/AR/ArType.hpp index c81650a..4ef1298 100644 --- a/openVulkanoCpp/AR/ArType.hpp +++ b/openVulkanoCpp/AR/ArType.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { class ArType final { diff --git a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.cpp b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.cpp index 6c7928d..4bd95b7 100644 --- a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.cpp +++ b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.cpp @@ -6,7 +6,7 @@ #include "ArSessionArCore.h" -namespace openVulkanoCpp::AR::ArCore +namespace OpenVulkano::AR::ArCore { std::shared_ptr ArSessionArCore::Create(const ArSessionConfig& config) { diff --git a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h index 8aaef53..349d384 100644 --- a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h +++ b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h @@ -11,7 +11,7 @@ // Define the class of the native AR session to be used #define NATIVE_AR_SESSION_CLASS ArCore::ArSessionArCore -namespace openVulkanoCpp::AR::ArCore +namespace OpenVulkano::AR::ArCore { class ArSessionArCore : public ArSession { diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.h b/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.h index 125bda4..ba8fb3c 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.h @@ -10,7 +10,7 @@ #import -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { class ArSessionArKitInternal; diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.mm b/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.mm index 0cf3b7c..de56bc9 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.mm +++ b/openVulkanoCpp/AR/Provider/ArKit/ArFrameArKit.mm @@ -14,7 +14,7 @@ #import #import -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { namespace { diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.h b/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.h index fa47c7a..293ef17 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.h @@ -11,7 +11,7 @@ #include "ArSessionArKitInternal.h" @interface ArKitDelegate : NSObject -- (id)initWithFrameHandler:(openVulkanoCpp::AR::ArKit::ArSessionArKitInternal*)session; +- (id)initWithFrameHandler:(OpenVulkano::AR::ArKit::ArSessionArKitInternal*)session; - (void)session:(ARSession *)session didUpdateFrame:(ARFrame *)frame; - (void)sessionWasInterrupted:(ARSession *)session; - (void)sessionInterruptionEnded:(ARSession *)session; diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.mm b/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.mm index a7ddc6f..95221dc 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.mm +++ b/openVulkanoCpp/AR/Provider/ArKit/ArKitDelegate.mm @@ -8,10 +8,10 @@ @implementation ArKitDelegate { - openVulkanoCpp::AR::ArKit::ArSessionArKitInternal* m_arSession; + OpenVulkano::AR::ArKit::ArSessionArKitInternal* m_arSession; } -- (id)initWithFrameHandler:(openVulkanoCpp::AR::ArKit::ArSessionArKitInternal*)session +- (id)initWithFrameHandler:(OpenVulkano::AR::ArKit::ArSessionArKitInternal*)session { m_arSession = session; return self; diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.h b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.h index 6cbf147..bbbf256 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.h @@ -11,7 +11,7 @@ // Define the class of the native AR session to be used #define NATIVE_AR_SESSION_CLASS ArKit::ArSessionArKit -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { /** * This is just a helper intermediate class. diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.mm b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.mm index 6014f52..be1ebb4 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.mm +++ b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKit.mm @@ -7,7 +7,7 @@ #include "ArSessionArKit.h" #include "ArSessionArKitInternal.h" -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { namespace { diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.h b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.h index fb596bd..ab550bd 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.h @@ -15,7 +15,7 @@ @class ArKitDelegate; -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { class ArSessionArKitInternal final : public ArSessionArKit, public std::enable_shared_from_this { diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.mm b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.mm index 4c4beda..a0dec5a 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.mm +++ b/openVulkanoCpp/AR/Provider/ArKit/ArSessionArKitInternal.mm @@ -21,7 +21,7 @@ #define VALIDATE_SESSION(s) if(s != m_arSession) { Logger::AR->warn("ARSession does not match."); return; } -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { namespace { diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h b/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h index b80e4af..4ec2fb2 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h @@ -10,7 +10,7 @@ #import -namespace openVulkanoCpp::AR::ArKit +namespace OpenVulkano::AR::ArKit { inline ArTrackingState GetArTrackingState(ARCamera* camera) { diff --git a/openVulkanoCpp/AR/Provider/ArSessionNull.hpp b/openVulkanoCpp/AR/Provider/ArSessionNull.hpp index bd5e821..921b17f 100644 --- a/openVulkanoCpp/AR/Provider/ArSessionNull.hpp +++ b/openVulkanoCpp/AR/Provider/ArSessionNull.hpp @@ -11,7 +11,7 @@ // Define the class of the native AR session to be used #define NATIVE_AR_SESSION_CLASS ArSessionNull -namespace openVulkanoCpp::AR +namespace OpenVulkano::AR { struct ArSessionNull final { diff --git a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.cpp b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.cpp index 1d60d4a..24adfdc 100644 --- a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.cpp +++ b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.cpp @@ -6,7 +6,7 @@ #include "ArSessionStream.h" -namespace openVulkanoCpp::AR::Network +namespace OpenVulkano::AR::Network { ArSessionStream::ArSessionStream(const std::string& serverAddress, std::optional requestConfig) : ArSession({}) diff --git a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h index 21004cd..045374f 100644 --- a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h +++ b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h @@ -8,7 +8,7 @@ #include "AR/ArSession.hpp" -namespace openVulkanoCpp::AR::Network +namespace OpenVulkano::AR::Network { class ArSessionStream final : public ArSession { diff --git a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.cpp b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.cpp index ad35554..ec77265 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.cpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.cpp @@ -8,7 +8,7 @@ #include "ArSessionPlayback.hpp" #include "Base/BlockProfiler.hpp" -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { ArFramePlayback::ArFramePlayback(const std::shared_ptr& session, ArPlaybackReader& frameReader) : ArFrame(session, frameReader.GetNextFrameId()) diff --git a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp index 058bc64..0fceaa8 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp @@ -9,7 +9,7 @@ #include "AR/ArFrame.hpp" #include "ArPlaybackReader.hpp" -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { class ArSessionPlayback; diff --git a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.cpp b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.cpp index b8edada..94ffce3 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.cpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.cpp @@ -9,7 +9,7 @@ #if __has_include("turbojpeg.h") #include -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { ColorImg ArPlaybackReader::ReadColorImage() { @@ -44,7 +44,7 @@ namespace openVulkanoCpp::AR::Playback #define STB_IMAGE_IMPLEMENTATION #include -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { ColorImg ArPlaybackReader::ReadColorImage() { diff --git a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp index 176c1ff..7644ee6 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { struct DepthImage { diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp index 72a61aa..bfe6126 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp @@ -9,7 +9,7 @@ #include "Base/Logger.hpp" #include -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { ArSessionPlayback::ArSessionPlayback(const std::string& recordingPath, bool autoAdvance) : ArSession(ArSessionMetadata(recordingPath)), recordingPath(recordingPath), autoAdvance(autoAdvance), playbackReader(recordingPath) diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp index ef1f62d..b506082 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.hpp @@ -10,7 +10,7 @@ #include "ArPlaybackReader.hpp" #include "Math/Timestamp.hpp" -namespace openVulkanoCpp::AR::Playback +namespace OpenVulkano::AR::Playback { class ArSessionPlayback final : public ArSession, public std::enable_shared_from_this { diff --git a/openVulkanoCpp/Base/AppEvents.cpp b/openVulkanoCpp/Base/AppEvents.cpp index 58c7bd6..b75fbbd 100644 --- a/openVulkanoCpp/Base/AppEvents.cpp +++ b/openVulkanoCpp/Base/AppEvents.cpp @@ -6,7 +6,7 @@ #include "AppEvents.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { Event<> AppEvents::OnWillResignActive; Event<> AppEvents::OnDidEnterBackground; diff --git a/openVulkanoCpp/Base/AppEvents.hpp b/openVulkanoCpp/Base/AppEvents.hpp index bc761df..fb94160 100644 --- a/openVulkanoCpp/Base/AppEvents.hpp +++ b/openVulkanoCpp/Base/AppEvents.hpp @@ -8,7 +8,7 @@ #include "Event.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { struct AppEvents { diff --git a/openVulkanoCpp/Base/BlockProfiler.hpp b/openVulkanoCpp/Base/BlockProfiler.hpp index 386d415..f93b965 100644 --- a/openVulkanoCpp/Base/BlockProfiler.hpp +++ b/openVulkanoCpp/Base/BlockProfiler.hpp @@ -8,7 +8,7 @@ #include "Logger.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class BlockProfiler final { diff --git a/openVulkanoCpp/Base/EngineConfiguration.hpp b/openVulkanoCpp/Base/EngineConfiguration.hpp index 19d49f3..3e18c83 100644 --- a/openVulkanoCpp/Base/EngineConfiguration.hpp +++ b/openVulkanoCpp/Base/EngineConfiguration.hpp @@ -10,7 +10,7 @@ #include #undef max -namespace openVulkanoCpp +namespace openVulkano { class EngineConfiguration { diff --git a/openVulkanoCpp/Base/EngineConstants.hpp b/openVulkanoCpp/Base/EngineConstants.hpp index 4b4ecec..49cbf00 100644 --- a/openVulkanoCpp/Base/EngineConstants.hpp +++ b/openVulkanoCpp/Base/EngineConstants.hpp @@ -2,9 +2,9 @@ #include #include //TODO replace with external fmt -namespace openVulkanoCpp +namespace openVulkano { - inline const char* ENGINE_NAME = "openVulkanoCpp"; + inline const char* ENGINE_NAME = "OpenVulkano"; struct EngineVersion { diff --git a/openVulkanoCpp/Base/Event.cpp b/openVulkanoCpp/Base/Event.cpp index e2358a6..a8c1aaf 100644 --- a/openVulkanoCpp/Base/Event.cpp +++ b/openVulkanoCpp/Base/Event.cpp @@ -6,7 +6,7 @@ #include "Event.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { std::vector INamedEventProcessor::processors; } \ No newline at end of file diff --git a/openVulkanoCpp/Base/Event.hpp b/openVulkanoCpp/Base/Event.hpp index e4df9cf..82035ee 100644 --- a/openVulkanoCpp/Base/Event.hpp +++ b/openVulkanoCpp/Base/Event.hpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IEventHandler { diff --git a/openVulkanoCpp/Base/FrameMetadata.hpp b/openVulkanoCpp/Base/FrameMetadata.hpp index 1b3c6c3..597eb60 100644 --- a/openVulkanoCpp/Base/FrameMetadata.hpp +++ b/openVulkanoCpp/Base/FrameMetadata.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { class FrameMetadata final { diff --git a/openVulkanoCpp/Base/ICloseable.hpp b/openVulkanoCpp/Base/ICloseable.hpp index 27fb326..07f143a 100644 --- a/openVulkanoCpp/Base/ICloseable.hpp +++ b/openVulkanoCpp/Base/ICloseable.hpp @@ -1,6 +1,6 @@ #pragma once -namespace openVulkanoCpp +namespace OpenVulkano { class ICloseable { diff --git a/openVulkanoCpp/Base/IGraphicsApp.hpp b/openVulkanoCpp/Base/IGraphicsApp.hpp index d533476..259f9f7 100644 --- a/openVulkanoCpp/Base/IGraphicsApp.hpp +++ b/openVulkanoCpp/Base/IGraphicsApp.hpp @@ -11,7 +11,7 @@ #include "Version.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class IGraphicsAppManager; diff --git a/openVulkanoCpp/Base/IGraphicsAppManager.hpp b/openVulkanoCpp/Base/IGraphicsAppManager.hpp index 635a00e..536c6b5 100644 --- a/openVulkanoCpp/Base/IGraphicsAppManager.hpp +++ b/openVulkanoCpp/Base/IGraphicsAppManager.hpp @@ -2,7 +2,7 @@ #include #include "PlatformEnums.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class IWindow; class IGraphicsApp; diff --git a/openVulkanoCpp/Base/IPlatform.hpp b/openVulkanoCpp/Base/IPlatform.hpp index 8e3205b..d6c99d4 100644 --- a/openVulkanoCpp/Base/IPlatform.hpp +++ b/openVulkanoCpp/Base/IPlatform.hpp @@ -4,7 +4,7 @@ #include "ICloseable.hpp" #include "UI/IWindow.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class PlatformInitFailedException : public std::runtime_error { diff --git a/openVulkanoCpp/Base/ITickable.hpp b/openVulkanoCpp/Base/ITickable.hpp index e35de47..66a944e 100644 --- a/openVulkanoCpp/Base/ITickable.hpp +++ b/openVulkanoCpp/Base/ITickable.hpp @@ -1,6 +1,6 @@ #pragma once -namespace openVulkanoCpp +namespace OpenVulkano { class ITickable { diff --git a/openVulkanoCpp/Base/Logger.cpp b/openVulkanoCpp/Base/Logger.cpp index f34954b..debaa2a 100644 --- a/openVulkanoCpp/Base/Logger.cpp +++ b/openVulkanoCpp/Base/Logger.cpp @@ -18,7 +18,7 @@ #include #endif -namespace openVulkanoCpp +namespace OpenVulkano { constexpr size_t MAX_LOG_FILE_SIZE = 512_MiB; diff --git a/openVulkanoCpp/Base/Logger.hpp b/openVulkanoCpp/Base/Logger.hpp index 6cb4e18..efa2b03 100644 --- a/openVulkanoCpp/Base/Logger.hpp +++ b/openVulkanoCpp/Base/Logger.hpp @@ -11,7 +11,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { class Logger { //TODO add custom sink for in game/engine console diff --git a/openVulkanoCpp/Base/PlatformEnums.hpp b/openVulkanoCpp/Base/PlatformEnums.hpp index 8a13461..3a9cc3d 100644 --- a/openVulkanoCpp/Base/PlatformEnums.hpp +++ b/openVulkanoCpp/Base/PlatformEnums.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class RenderAPI { diff --git a/openVulkanoCpp/Base/Render/IRenderer.hpp b/openVulkanoCpp/Base/Render/IRenderer.hpp index 6ab8484..de12732 100644 --- a/openVulkanoCpp/Base/Render/IRenderer.hpp +++ b/openVulkanoCpp/Base/Render/IRenderer.hpp @@ -12,7 +12,7 @@ #include "Scene/UI/UI.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class IWindow; class IGraphicsAppManager; diff --git a/openVulkanoCpp/Base/ThreadBackgroundSleep.cpp b/openVulkanoCpp/Base/ThreadBackgroundSleep.cpp index 98d8683..6c0b21d 100644 --- a/openVulkanoCpp/Base/ThreadBackgroundSleep.cpp +++ b/openVulkanoCpp/Base/ThreadBackgroundSleep.cpp @@ -8,7 +8,7 @@ #include "Logger.hpp" #include "AppEvents.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { ThreadBackgroundSleep ThreadBackgroundSleep::INSTANCE; diff --git a/openVulkanoCpp/Base/ThreadBackgroundSleep.hpp b/openVulkanoCpp/Base/ThreadBackgroundSleep.hpp index d69c3bb..6d54ccf 100644 --- a/openVulkanoCpp/Base/ThreadBackgroundSleep.hpp +++ b/openVulkanoCpp/Base/ThreadBackgroundSleep.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IEventHandler; diff --git a/openVulkanoCpp/Base/Timer.hpp b/openVulkanoCpp/Base/Timer.hpp index 2c2a1fb..508f05a 100644 --- a/openVulkanoCpp/Base/Timer.hpp +++ b/openVulkanoCpp/Base/Timer.hpp @@ -2,7 +2,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { /** * \brief High-res timer diff --git a/openVulkanoCpp/Base/UI/BaseWindow.hpp b/openVulkanoCpp/Base/UI/BaseWindow.hpp index 7eba18c..95aab2b 100644 --- a/openVulkanoCpp/Base/UI/BaseWindow.hpp +++ b/openVulkanoCpp/Base/UI/BaseWindow.hpp @@ -8,7 +8,7 @@ #include "IWindow.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class BaseWindow : virtual public IWindow { diff --git a/openVulkanoCpp/Base/UI/IOpenGlWindow.hpp b/openVulkanoCpp/Base/UI/IOpenGlWindow.hpp index a79c004..4bb6118 100644 --- a/openVulkanoCpp/Base/UI/IOpenGlWindow.hpp +++ b/openVulkanoCpp/Base/UI/IOpenGlWindow.hpp @@ -8,7 +8,7 @@ #include "IWindow.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class IOpenGlWindow : virtual public IWindow { diff --git a/openVulkanoCpp/Base/UI/IVulkanWindow.hpp b/openVulkanoCpp/Base/UI/IVulkanWindow.hpp index b10dd46..7f629b1 100644 --- a/openVulkanoCpp/Base/UI/IVulkanWindow.hpp +++ b/openVulkanoCpp/Base/UI/IVulkanWindow.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IVulkanWindow : virtual public IWindow { diff --git a/openVulkanoCpp/Base/UI/IWindow.hpp b/openVulkanoCpp/Base/UI/IWindow.hpp index fa7af13..e685073 100644 --- a/openVulkanoCpp/Base/UI/IWindow.hpp +++ b/openVulkanoCpp/Base/UI/IWindow.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { enum WindowMode { diff --git a/openVulkanoCpp/Base/Utils.cpp b/openVulkanoCpp/Base/Utils.cpp index a7a8cd7..1ce3028 100644 --- a/openVulkanoCpp/Base/Utils.cpp +++ b/openVulkanoCpp/Base/Utils.cpp @@ -13,7 +13,7 @@ #endif #include -namespace openVulkanoCpp +namespace OpenVulkano { void Utils::SetThreadName(const std::string& name) { diff --git a/openVulkanoCpp/Base/Utils.hpp b/openVulkanoCpp/Base/Utils.hpp index 8975339..316ce9b 100644 --- a/openVulkanoCpp/Base/Utils.hpp +++ b/openVulkanoCpp/Base/Utils.hpp @@ -13,7 +13,7 @@ #include #include "Data/Containers/Array.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class Utils { diff --git a/openVulkanoCpp/Base/Version.cpp b/openVulkanoCpp/Base/Version.cpp index 8f02ab0..149ca06 100644 --- a/openVulkanoCpp/Base/Version.cpp +++ b/openVulkanoCpp/Base/Version.cpp @@ -13,7 +13,7 @@ #include #endif -namespace openVulkanoCpp +namespace OpenVulkano { namespace { @@ -134,7 +134,7 @@ namespace openVulkanoCpp } //region Compare functions - int Version::CompareBuildNr(const openVulkanoCpp::Version& other) const + int Version::CompareBuildNr(const OpenVulkano::Version& other) const { if (m_buildNumber == 0 || other.m_buildNumber == 0) return 0; if (m_buildNumber > other.m_buildNumber) return 1; @@ -169,7 +169,7 @@ namespace openVulkanoCpp return 0; } - int Version::Compare(const openVulkanoCpp::Version& other) + int Version::Compare(const OpenVulkano::Version& other) { int comp; if ((comp = CompareComponents(other)) != 0) return comp; diff --git a/openVulkanoCpp/Base/Version.hpp b/openVulkanoCpp/Base/Version.hpp index 0df4894..3d2a217 100644 --- a/openVulkanoCpp/Base/Version.hpp +++ b/openVulkanoCpp/Base/Version.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class Version { diff --git a/openVulkanoCpp/Controller/ArCameraController.cpp b/openVulkanoCpp/Controller/ArCameraController.cpp index 2e511c0..a0fc1d5 100644 --- a/openVulkanoCpp/Controller/ArCameraController.cpp +++ b/openVulkanoCpp/Controller/ArCameraController.cpp @@ -9,7 +9,7 @@ #include "Base/Logger.hpp" #include "Scene/Camera.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { ArCameraController::ArCameraController() = default; diff --git a/openVulkanoCpp/Controller/ArCameraController.hpp b/openVulkanoCpp/Controller/ArCameraController.hpp index d2818a9..607f331 100644 --- a/openVulkanoCpp/Controller/ArCameraController.hpp +++ b/openVulkanoCpp/Controller/ArCameraController.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace AR { diff --git a/openVulkanoCpp/Controller/CameraController.hpp b/openVulkanoCpp/Controller/CameraController.hpp index 652e896..aba113d 100644 --- a/openVulkanoCpp/Controller/CameraController.hpp +++ b/openVulkanoCpp/Controller/CameraController.hpp @@ -9,7 +9,7 @@ #include "Base/ITickable.hpp" #include "Base/ICloseable.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Scene { diff --git a/openVulkanoCpp/Controller/FreeCamCameraController.cpp b/openVulkanoCpp/Controller/FreeCamCameraController.cpp index 7ec09e4..911e07a 100644 --- a/openVulkanoCpp/Controller/FreeCamCameraController.cpp +++ b/openVulkanoCpp/Controller/FreeCamCameraController.cpp @@ -10,7 +10,7 @@ #include "Input/InputManager.hpp" #include "Input/InputKey.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { FreeCamCameraController::FreeCamCameraController(Scene::Camera* camera) : CameraController(camera) { diff --git a/openVulkanoCpp/Controller/FreeCamCameraController.hpp b/openVulkanoCpp/Controller/FreeCamCameraController.hpp index 307fd9b..ef163c1 100644 --- a/openVulkanoCpp/Controller/FreeCamCameraController.hpp +++ b/openVulkanoCpp/Controller/FreeCamCameraController.hpp @@ -9,7 +9,7 @@ #include "CameraController.hpp" #include "Math/Math.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Input { diff --git a/openVulkanoCpp/Data/Concurent/Containers/ThreadSafeMap.hpp b/openVulkanoCpp/Data/Concurent/Containers/ThreadSafeMap.hpp index 777362e..27d9339 100644 --- a/openVulkanoCpp/Data/Concurent/Containers/ThreadSafeMap.hpp +++ b/openVulkanoCpp/Data/Concurent/Containers/ThreadSafeMap.hpp @@ -10,7 +10,7 @@ #include #include "Data/Concurent/MutexProtectedObject.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { template class ThreadSafeMap diff --git a/openVulkanoCpp/Data/Concurent/MutexProtectedObject.hpp b/openVulkanoCpp/Data/Concurent/MutexProtectedObject.hpp index 64994c8..7f9f684 100644 --- a/openVulkanoCpp/Data/Concurent/MutexProtectedObject.hpp +++ b/openVulkanoCpp/Data/Concurent/MutexProtectedObject.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { template class MutexProtectedObject diff --git a/openVulkanoCpp/Data/Concurent/Spintex.hpp b/openVulkanoCpp/Data/Concurent/Spintex.hpp index ee9803a..98151ca 100644 --- a/openVulkanoCpp/Data/Concurent/Spintex.hpp +++ b/openVulkanoCpp/Data/Concurent/Spintex.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class Spintex { diff --git a/openVulkanoCpp/Data/Containers/Array.hpp b/openVulkanoCpp/Data/Containers/Array.hpp index ef2d7e9..936e5a3 100644 --- a/openVulkanoCpp/Data/Containers/Array.hpp +++ b/openVulkanoCpp/Data/Containers/Array.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { /** * Heap allocated array. For all these times you need a fixed size data structure, but don't know the size at compile time. diff --git a/openVulkanoCpp/Data/Containers/ChunkedArrayList.hpp b/openVulkanoCpp/Data/Containers/ChunkedArrayList.hpp index 9876ec3..504953e 100644 --- a/openVulkanoCpp/Data/Containers/ChunkedArrayList.hpp +++ b/openVulkanoCpp/Data/Containers/ChunkedArrayList.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { template class ChunkedArrayList diff --git a/openVulkanoCpp/Data/Containers/SharedDualTypeBuffer.hpp b/openVulkanoCpp/Data/Containers/SharedDualTypeBuffer.hpp index e3d2ec6..b282141 100644 --- a/openVulkanoCpp/Data/Containers/SharedDualTypeBuffer.hpp +++ b/openVulkanoCpp/Data/Containers/SharedDualTypeBuffer.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { template>> class SharedDualTypeBuffer diff --git a/openVulkanoCpp/Data/ReadOnlyAtomicArrayQueue.hpp b/openVulkanoCpp/Data/ReadOnlyAtomicArrayQueue.hpp index 68c3d1c..10f72f3 100644 --- a/openVulkanoCpp/Data/ReadOnlyAtomicArrayQueue.hpp +++ b/openVulkanoCpp/Data/ReadOnlyAtomicArrayQueue.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Data { diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp index 9a1428b..475026c 100644 --- a/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp +++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.cpp @@ -21,9 +21,9 @@ #pragma ide diagnostic ignored "cert-msc50-cpp" #pragma ide diagnostic ignored "cppcoreguidelines-narrowing-conversions" -using namespace openVulkanoCpp::Scene; -using namespace openVulkanoCpp::Input; -using namespace openVulkanoCpp::Math; +using namespace OpenVulkano::Scene; +using namespace OpenVulkano::Input; +using namespace OpenVulkano::Math; uint32_t GEOS = 3000, OBJECTS = 10000, DYNAMIC = 1000; @@ -31,7 +31,7 @@ class CubesExampleAppImpl final : public CubesExampleApp { Scene scene; PerspectiveCamera cam; - openVulkanoCpp::FreeCamCameraController camController; + OpenVulkano::FreeCamCameraController camController; Material mat; Shader shader; std::vector drawablesPool; @@ -40,11 +40,11 @@ class CubesExampleAppImpl final : public CubesExampleApp public: std::string GetAppName() override { return "ExampleApp"; } - openVulkanoCpp::Version GetAppVersion() override { return {"v1.0"}; } + OpenVulkano::Version GetAppVersion() override { return {"v1.0"}; } void Init() override { - auto engineConfig = openVulkanoCpp::EngineConfiguration::GetEngineConfiguration(); + auto engineConfig = OpenVulkano::EngineConfiguration::GetEngineConfiguration(); engineConfig->SetNumThreads(4); engineConfig->SetPreferFramebufferFormatSRGB(false); @@ -53,9 +53,9 @@ public: cam.Init(70, 16, 9, 0.1f, 100); scene.SetCamera(&cam); cam.SetMatrix(Utils::translate(Matrix4f(1), Vector3f_SIMD(0,0,-10))); - shader.AddShaderProgram(openVulkanoCpp::ShaderProgramType::VERTEX, "Shader/basic"); - shader.AddShaderProgram(openVulkanoCpp::ShaderProgramType::FRAGMENT, "Shader/basic"); - shader.AddVertexInputDescription(openVulkanoCpp::Vertex::GetVertexInputDescription()); + shader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/basic"); + shader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/basic"); + shader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription()); drawablesPool.resize(GEOS); for(uint32_t i = 0; i < GEOS; i++) { @@ -92,12 +92,12 @@ public: void Close() override{} }; -openVulkanoCpp::IGraphicsApp* CubesExampleApp::Create() +OpenVulkano::IGraphicsApp* CubesExampleApp::Create() { return new CubesExampleAppImpl(); } -std::unique_ptr CubesExampleApp::CreateUnique() +std::unique_ptr CubesExampleApp::CreateUnique() { return std::make_unique(); } diff --git a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp index ad9ce8d..0b502d9 100644 --- a/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp +++ b/openVulkanoCpp/ExampleApps/CubesExampleApp.hpp @@ -9,10 +9,10 @@ #include "Base/IGraphicsApp.hpp" #include -class CubesExampleApp : public openVulkanoCpp::IGraphicsApp +class CubesExampleApp : public OpenVulkano::IGraphicsApp { public: - static openVulkanoCpp::IGraphicsApp* Create(); + static OpenVulkano::IGraphicsApp* Create(); - static std::unique_ptr CreateUnique(); + static std::unique_ptr CreateUnique(); }; diff --git a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.cpp b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.cpp index 6f85eb3..108c5bf 100644 --- a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.cpp +++ b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.cpp @@ -8,7 +8,7 @@ #include "Base/Logger.hpp" #include -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { void ControllerGLFW::Init(int joystickId) { diff --git a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp index d3ec59f..34fcff2 100644 --- a/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/InputDeviceGLFW.hpp @@ -11,7 +11,7 @@ #include "Input/InputDeviceMouse.hpp" #include "Input/InputDeviceController.hpp" -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { class KeyboardGLFW final : public Input::InputDeviceKeyboard { diff --git a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp index 2122560..eadc109 100644 --- a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp @@ -9,7 +9,7 @@ #include "Input/InputKey.hpp" #include -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { struct KeyboardInputMapping { diff --git a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp index 2f1d11b..951da93 100644 --- a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp +++ b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.cpp @@ -12,7 +12,7 @@ static_assert(GLFW_JOYSTICK_LAST == 15); // if this fails, please update it and resize the controllers array accordingly as GLFW_JOYSTICK_LAST + 1 -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { constexpr KeyboardInputMapping keyboardMapping = KeyboardInputMapping(); diff --git a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp index f055ec2..2e9a2b9 100644 --- a/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/InputProviderGLFW.hpp @@ -12,7 +12,7 @@ #include "InputDeviceGLFW.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace GLFW { diff --git a/openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp b/openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp index 886a316..ed9c892 100644 --- a/openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp +++ b/openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp @@ -11,7 +11,7 @@ #include "Host/PlatformProducer.hpp" #include -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { namespace { diff --git a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp index 5f18062..09d2a65 100644 --- a/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp @@ -11,7 +11,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IWindow; diff --git a/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp b/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp index f542e59..5ed3a99 100644 --- a/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp +++ b/openVulkanoCpp/Host/GLFW/WindowGLFW.cpp @@ -8,9 +8,9 @@ #include "Base/Logger.hpp" #include -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { - WindowGLFW::WindowGLFW(openVulkanoCpp::GLFW::InputProviderGLFW& inputProvider) + WindowGLFW::WindowGLFW(OpenVulkano::GLFW::InputProviderGLFW& inputProvider) : inputProvider(inputProvider) {} diff --git a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp index 1192c3c..709468a 100644 --- a/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp +++ b/openVulkanoCpp/Host/GLFW/WindowGLFW.hpp @@ -15,7 +15,7 @@ struct GLFWmonitor; struct GLFWwindow; -namespace openVulkanoCpp::GLFW +namespace OpenVulkano::GLFW { class WindowGLFW final : virtual public BaseWindow, virtual public IVulkanWindow, virtual public IOpenGlWindow { diff --git a/openVulkanoCpp/Host/GraphicsAppManager.cpp b/openVulkanoCpp/Host/GraphicsAppManager.cpp index beee441..4643d16 100644 --- a/openVulkanoCpp/Host/GraphicsAppManager.cpp +++ b/openVulkanoCpp/Host/GraphicsAppManager.cpp @@ -13,9 +13,9 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { - GraphicsAppManager::GraphicsAppManager(openVulkanoCpp::IGraphicsApp* app, RenderAPI::RenderApi renderApi) + GraphicsAppManager::GraphicsAppManager(OpenVulkano::IGraphicsApp* app, RenderAPI::RenderApi renderApi) : app(app), renderApi(renderApi) { Utils::SetThreadName("Main"); @@ -165,13 +165,13 @@ namespace openVulkanoCpp } } - void GraphicsAppManager::OnWindowMinimize(openVulkanoCpp::IWindow* window) + void GraphicsAppManager::OnWindowMinimize(OpenVulkano::IWindow* window) { if (window != this->window) return; Pause(); } - void GraphicsAppManager::OnWindowRestore(openVulkanoCpp::IWindow* window) + void GraphicsAppManager::OnWindowRestore(OpenVulkano::IWindow* window) { if (window != this->window) return; Resume(); @@ -188,14 +188,14 @@ namespace openVulkanoCpp //TODO save window pos } - void GraphicsAppManager::OnWindowResize(openVulkanoCpp::IWindow* window, const uint32_t newWidth, const uint32_t newHeight) + void GraphicsAppManager::OnWindowResize(OpenVulkano::IWindow* window, const uint32_t newWidth, const uint32_t newHeight) { if(window != this->window) return; if (window->GetWidth() != newWidth || window->GetHeight() != newHeight) window->SetSize(newWidth, newHeight); renderer->Resize(newWidth, newHeight); } - void GraphicsAppManager::OnWindowClose(openVulkanoCpp::IWindow* window) + void GraphicsAppManager::OnWindowClose(OpenVulkano::IWindow* window) { window->SetWindowHasBeenDestroyed(); if (window != this->window) return; diff --git a/openVulkanoCpp/Host/GraphicsAppManager.hpp b/openVulkanoCpp/Host/GraphicsAppManager.hpp index 7bba1a8..9e53818 100644 --- a/openVulkanoCpp/Host/GraphicsAppManager.hpp +++ b/openVulkanoCpp/Host/GraphicsAppManager.hpp @@ -15,7 +15,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class IPlatform; diff --git a/openVulkanoCpp/Host/ImGuiImplOpenVulkano.cpp b/openVulkanoCpp/Host/ImGuiImplOpenVulkano.cpp index 389cce9..e89ef03 100644 --- a/openVulkanoCpp/Host/ImGuiImplOpenVulkano.cpp +++ b/openVulkanoCpp/Host/ImGuiImplOpenVulkano.cpp @@ -8,11 +8,11 @@ #include "Base/FrameMetadata.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { ImGuiImplOpenVulkano ImGuiImplOpenVulkano::INSTANCE{}; - void ImGuiImplOpenVulkano::Init(openVulkanoCpp::IWindow* window) + void ImGuiImplOpenVulkano::Init(OpenVulkano::IWindow* window) { ImGuiIO& io = ImGui::GetIO(); IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!"); diff --git a/openVulkanoCpp/Host/ImGuiImplOpenVulkano.hpp b/openVulkanoCpp/Host/ImGuiImplOpenVulkano.hpp index 81bdc30..a330dfd 100644 --- a/openVulkanoCpp/Host/ImGuiImplOpenVulkano.hpp +++ b/openVulkanoCpp/Host/ImGuiImplOpenVulkano.hpp @@ -8,7 +8,7 @@ #include "Base/UI/IWindow.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class ImGuiImplOpenVulkano { diff --git a/openVulkanoCpp/Host/Linux/SystemInfo.cpp b/openVulkanoCpp/Host/Linux/SystemInfo.cpp index 7d1826f..b15545c 100644 --- a/openVulkanoCpp/Host/Linux/SystemInfo.cpp +++ b/openVulkanoCpp/Host/Linux/SystemInfo.cpp @@ -15,7 +15,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/Host/PlatformProducer.cpp b/openVulkanoCpp/Host/PlatformProducer.cpp index 9b5c4b9..f9e6d1f 100644 --- a/openVulkanoCpp/Host/PlatformProducer.cpp +++ b/openVulkanoCpp/Host/PlatformProducer.cpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/Host/PlatformProducer.hpp b/openVulkanoCpp/Host/PlatformProducer.hpp index 7ded1cf..8a14e8f 100644 --- a/openVulkanoCpp/Host/PlatformProducer.hpp +++ b/openVulkanoCpp/Host/PlatformProducer.hpp @@ -9,7 +9,7 @@ #include "Base/PlatformEnums.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class IPlatform; class IRenderer; diff --git a/openVulkanoCpp/Host/SystemInfo.hpp b/openVulkanoCpp/Host/SystemInfo.hpp index dd6a34b..b480d09 100644 --- a/openVulkanoCpp/Host/SystemInfo.hpp +++ b/openVulkanoCpp/Host/SystemInfo.hpp @@ -9,7 +9,7 @@ #include "Base/Event.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { struct OsVersion { diff --git a/openVulkanoCpp/Host/Windows/SystemInfo.cpp b/openVulkanoCpp/Host/Windows/SystemInfo.cpp index 5a78208..0787450 100644 --- a/openVulkanoCpp/Host/Windows/SystemInfo.cpp +++ b/openVulkanoCpp/Host/Windows/SystemInfo.cpp @@ -13,7 +13,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/Host/iOS/NamedEventProcessor.h b/openVulkanoCpp/Host/iOS/NamedEventProcessor.h index 277f0c5..3a4f5a2 100644 --- a/openVulkanoCpp/Host/iOS/NamedEventProcessor.h +++ b/openVulkanoCpp/Host/iOS/NamedEventProcessor.h @@ -8,7 +8,7 @@ #include "Base/Event.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class NamedEventProcessor final : public INamedEventProcessor { diff --git a/openVulkanoCpp/Host/iOS/NamedEventProcessor.mm b/openVulkanoCpp/Host/iOS/NamedEventProcessor.mm index 61cc6ad..e4d3fa3 100644 --- a/openVulkanoCpp/Host/iOS/NamedEventProcessor.mm +++ b/openVulkanoCpp/Host/iOS/NamedEventProcessor.mm @@ -12,7 +12,7 @@ #import #import -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/Host/iOS/OpenVulkanoAppDelegate.mm b/openVulkanoCpp/Host/iOS/OpenVulkanoAppDelegate.mm index 3a60a1a..47188d2 100644 --- a/openVulkanoCpp/Host/iOS/OpenVulkanoAppDelegate.mm +++ b/openVulkanoCpp/Host/iOS/OpenVulkanoAppDelegate.mm @@ -11,7 +11,7 @@ #include "Host/SystemInfo.hpp" #include "Math/ByteSize.hpp" -using namespace openVulkanoCpp; +using namespace OpenVulkano; @interface OpenVulkanoAppDelegate () diff --git a/openVulkanoCpp/Host/iOS/OpenVulkanoViewController.mm b/openVulkanoCpp/Host/iOS/OpenVulkanoViewController.mm index b4305ad..4afc421 100644 --- a/openVulkanoCpp/Host/iOS/OpenVulkanoViewController.mm +++ b/openVulkanoCpp/Host/iOS/OpenVulkanoViewController.mm @@ -15,7 +15,7 @@ #pragma mark - #pragma mark OpenVulkanoViewController -using namespace openVulkanoCpp; +using namespace OpenVulkano; class ViewWindow final : public IVulkanWindow { diff --git a/openVulkanoCpp/Host/iOS/SystemInfo.mm b/openVulkanoCpp/Host/iOS/SystemInfo.mm index 00c36fa..9daaec3 100644 --- a/openVulkanoCpp/Host/iOS/SystemInfo.mm +++ b/openVulkanoCpp/Host/iOS/SystemInfo.mm @@ -16,7 +16,7 @@ #import #import -namespace openVulkanoCpp +namespace OpenVulkano { Event<> SystemInfo::OnLowPowerModeChanged; Event<> SystemInfo::OnBatteryStateChanged; diff --git a/openVulkanoCpp/IO/AppFolders.cpp b/openVulkanoCpp/IO/AppFolders.cpp index 537d19a..ade67b8 100644 --- a/openVulkanoCpp/IO/AppFolders.cpp +++ b/openVulkanoCpp/IO/AppFolders.cpp @@ -7,7 +7,7 @@ #include "AppFolders.hpp" #include "PlatformFolders.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { #ifdef __APPLE__ AppFolders AppFolders::INSTANCE = AppFolders(""); diff --git a/openVulkanoCpp/IO/AppFolders.hpp b/openVulkanoCpp/IO/AppFolders.hpp index 519f7c2..3ece18d 100644 --- a/openVulkanoCpp/IO/AppFolders.hpp +++ b/openVulkanoCpp/IO/AppFolders.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class AppFolders { diff --git a/openVulkanoCpp/IO/Archive/ArchiveBase.cpp b/openVulkanoCpp/IO/Archive/ArchiveBase.cpp index 995d564..40420fd 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveBase.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveBase.cpp @@ -7,7 +7,7 @@ #include "ArchiveBase.hpp" #include "LibArchiveHelper.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { ArchiveBase::ArchiveBase(archive* arch, archive_entry* archEntry, const std::shared_ptr& logger) : m_archive(arch), m_archiveEntry(archEntry), m_logger(logger) diff --git a/openVulkanoCpp/IO/Archive/ArchiveBase.hpp b/openVulkanoCpp/IO/Archive/ArchiveBase.hpp index ed3f9f9..9bbc7d5 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveBase.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveBase.hpp @@ -17,7 +17,7 @@ namespace spdlog class logger; } -namespace openVulkanoCpp +namespace OpenVulkano { class ArchiveBase { diff --git a/openVulkanoCpp/IO/Archive/ArchiveConfiguration.cpp b/openVulkanoCpp/IO/Archive/ArchiveConfiguration.cpp index 463d0eb..93c6ead 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveConfiguration.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveConfiguration.cpp @@ -8,7 +8,7 @@ #include "Base/Utils.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/IO/Archive/ArchiveConfiguration.hpp b/openVulkanoCpp/IO/Archive/ArchiveConfiguration.hpp index db6adfe..024d2e5 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveConfiguration.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveConfiguration.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { enum class ArchiveType { TAR = 0, CPIO, ISO, ZIP, XAR, SEVEN_ZIP, WARC, SHAR }; diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp index 66ad316..b0a118e 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp @@ -13,7 +13,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.hpp b/openVulkanoCpp/IO/Archive/ArchiveReader.hpp index e542adb..89ce49c 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.hpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class ArchiveReader final : public ArchiveBase { diff --git a/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp index ca34774..29902f4 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { ArchiveWriter::ArchiveWriter(const char* fileName, const std::shared_ptr& logger) : ArchiveWriter(fileName, ArchiveConfiguration::FromFileName(fileName), logger) diff --git a/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp index 21ba9b9..96e7ba6 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp @@ -10,7 +10,7 @@ #include "ArchiveConfiguration.hpp" #include "IArchiveWriter.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class MultiPartArchiveWriter; diff --git a/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp index 30978d1..cdac4b5 100644 --- a/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp @@ -9,7 +9,7 @@ #include "IO/FileDescription.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class IArchiveWriter { diff --git a/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp b/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp index 8d8559a..1610e14 100644 --- a/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp +++ b/openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp @@ -11,7 +11,7 @@ #include #include "Base/Logger.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { #ifdef _MSC_VER using mode_t = unsigned short; diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp index d42d3b8..8fc898a 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { MultiPartArchiveWriter::MultiPartArchiveWriter(const std::string& dir, const std::string& fileNamePattern, const ArchiveConfiguration& archiveConfiguration, diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp index da02723..8d82dbf 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp @@ -10,7 +10,7 @@ #include "Math/ByteSize.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class MultiPartArchiveWriter final : public IArchiveWriter { diff --git a/openVulkanoCpp/IO/FileDescription.hpp b/openVulkanoCpp/IO/FileDescription.hpp index 3903eeb..e74d6da 100644 --- a/openVulkanoCpp/IO/FileDescription.hpp +++ b/openVulkanoCpp/IO/FileDescription.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { struct FileDescription { diff --git a/openVulkanoCpp/IO/Files/Pfm.hpp b/openVulkanoCpp/IO/Files/Pfm.hpp index 42dbb59..182cfef 100644 --- a/openVulkanoCpp/IO/Files/Pfm.hpp +++ b/openVulkanoCpp/IO/Files/Pfm.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { //TODO handle comments class PfmHeader diff --git a/openVulkanoCpp/IO/Files/Pnm.hpp b/openVulkanoCpp/IO/Files/Pnm.hpp index e3df002..f5c4652 100644 --- a/openVulkanoCpp/IO/Files/Pnm.hpp +++ b/openVulkanoCpp/IO/Files/Pnm.hpp @@ -11,7 +11,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { //TODO handle comments /** diff --git a/openVulkanoCpp/IO/PlatformFolders.cpp b/openVulkanoCpp/IO/PlatformFolders.cpp index 87a7eb5..dab0c3b 100644 --- a/openVulkanoCpp/IO/PlatformFolders.cpp +++ b/openVulkanoCpp/IO/PlatformFolders.cpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace { @@ -38,7 +38,7 @@ namespace openVulkanoCpp } #endif -namespace openVulkanoCpp +namespace OpenVulkano { namespace { diff --git a/openVulkanoCpp/IO/PlatformFolders.hpp b/openVulkanoCpp/IO/PlatformFolders.hpp index 938b3ac..fbd025d 100644 --- a/openVulkanoCpp/IO/PlatformFolders.hpp +++ b/openVulkanoCpp/IO/PlatformFolders.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { class PlatformFolders { diff --git a/openVulkanoCpp/Image/YuvUtils.hpp b/openVulkanoCpp/Image/YuvUtils.hpp index 672b690..156b22e 100644 --- a/openVulkanoCpp/Image/YuvUtils.hpp +++ b/openVulkanoCpp/Image/YuvUtils.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace YuvUtils { diff --git a/openVulkanoCpp/Input/InputDevice.hpp b/openVulkanoCpp/Input/InputDevice.hpp index 136d2fc..394da73 100644 --- a/openVulkanoCpp/Input/InputDevice.hpp +++ b/openVulkanoCpp/Input/InputDevice.hpp @@ -9,7 +9,7 @@ #include "Base/ICloseable.hpp" #include "InputKey.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Input { diff --git a/openVulkanoCpp/Input/InputDeviceController.cpp b/openVulkanoCpp/Input/InputDeviceController.cpp index e0bee6e..a691505 100644 --- a/openVulkanoCpp/Input/InputDeviceController.cpp +++ b/openVulkanoCpp/Input/InputDeviceController.cpp @@ -7,7 +7,7 @@ #include "InputDeviceController.hpp" #include "Base/Logger.hpp" -namespace openVulkanoCpp::Input +namespace OpenVulkano::Input { void InputDeviceController::Init(const int index, const std::string& name) { diff --git a/openVulkanoCpp/Input/InputDeviceController.hpp b/openVulkanoCpp/Input/InputDeviceController.hpp index 7d64892..2eb8407 100644 --- a/openVulkanoCpp/Input/InputDeviceController.hpp +++ b/openVulkanoCpp/Input/InputDeviceController.hpp @@ -8,7 +8,7 @@ #include "InputDevice.hpp" -namespace openVulkanoCpp::Input +namespace OpenVulkano::Input { class ControllerType { diff --git a/openVulkanoCpp/Input/InputDeviceKeyboard.hpp b/openVulkanoCpp/Input/InputDeviceKeyboard.hpp index a67f7d7..4e55752 100644 --- a/openVulkanoCpp/Input/InputDeviceKeyboard.hpp +++ b/openVulkanoCpp/Input/InputDeviceKeyboard.hpp @@ -9,7 +9,7 @@ #include "InputDevice.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { class IWindow; diff --git a/openVulkanoCpp/Input/InputDeviceMouse.cpp b/openVulkanoCpp/Input/InputDeviceMouse.cpp index dfa38a7..00e47fe 100644 --- a/openVulkanoCpp/Input/InputDeviceMouse.cpp +++ b/openVulkanoCpp/Input/InputDeviceMouse.cpp @@ -7,7 +7,7 @@ #include "InputDeviceMouse.hpp" #include "Base/Logger.hpp" -namespace openVulkanoCpp::Input +namespace OpenVulkano::Input { void InputDeviceMouse::Init(const int index, const std::string& name) { diff --git a/openVulkanoCpp/Input/InputDeviceMouse.hpp b/openVulkanoCpp/Input/InputDeviceMouse.hpp index eae8fe4..d3a320b 100644 --- a/openVulkanoCpp/Input/InputDeviceMouse.hpp +++ b/openVulkanoCpp/Input/InputDeviceMouse.hpp @@ -9,7 +9,7 @@ #include "InputDevice.hpp" #include "Math/Math.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class IWindow; diff --git a/openVulkanoCpp/Input/InputDeviceType.hpp b/openVulkanoCpp/Input/InputDeviceType.hpp index 5653a2b..e716af8 100644 --- a/openVulkanoCpp/Input/InputDeviceType.hpp +++ b/openVulkanoCpp/Input/InputDeviceType.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp::Input +namespace OpenVulkano::Input { enum class InputDeviceType : uint8_t { diff --git a/openVulkanoCpp/Input/InputKey.hpp b/openVulkanoCpp/Input/InputKey.hpp index 713bf66..aa1cffe 100644 --- a/openVulkanoCpp/Input/InputKey.hpp +++ b/openVulkanoCpp/Input/InputKey.hpp @@ -1,7 +1,7 @@ #pragma once #include "InputDeviceType.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Input { diff --git a/openVulkanoCpp/Input/InputManager.hpp b/openVulkanoCpp/Input/InputManager.hpp index f249675..41c8e82 100644 --- a/openVulkanoCpp/Input/InputManager.hpp +++ b/openVulkanoCpp/Input/InputManager.hpp @@ -8,7 +8,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Input { diff --git a/openVulkanoCpp/Math/AABB.hpp b/openVulkanoCpp/Math/AABB.hpp index 4dcaac1..b4da7f2 100644 --- a/openVulkanoCpp/Math/AABB.hpp +++ b/openVulkanoCpp/Math/AABB.hpp @@ -9,7 +9,7 @@ #include "Math.hpp" #include "Range.hpp" -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { /** * \brief A class that represents an axis aligned bounding box diff --git a/openVulkanoCpp/Math/ByteSize.hpp b/openVulkanoCpp/Math/ByteSize.hpp index a158af1..bce6e1d 100644 --- a/openVulkanoCpp/Math/ByteSize.hpp +++ b/openVulkanoCpp/Math/ByteSize.hpp @@ -22,7 +22,7 @@ #endif #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace ByteSizeUnitHelper { @@ -162,14 +162,14 @@ namespace openVulkanoCpp } #ifndef OVKMBS_FMT_MISSING -template<> struct fmt::formatter +template<> struct fmt::formatter { template constexpr auto parse(ParseContext& ctx) { return ctx.begin(); } - template auto format(const openVulkanoCpp::ByteSize& bs, FormatContext& ctx) + template auto format(const OpenVulkano::ByteSize& bs, FormatContext& ctx) { return format_to(ctx.out(), "{}", bs.Format()); } diff --git a/openVulkanoCpp/Math/CameraIntrinsic.hpp b/openVulkanoCpp/Math/CameraIntrinsic.hpp index 02dfec5..1c64791 100644 --- a/openVulkanoCpp/Math/CameraIntrinsic.hpp +++ b/openVulkanoCpp/Math/CameraIntrinsic.hpp @@ -8,7 +8,7 @@ #include "Math.hpp" -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { class CameraIntrinsic { diff --git a/openVulkanoCpp/Math/DenseVector3i.hpp b/openVulkanoCpp/Math/DenseVector3i.hpp index 2b8815c..6e41b50 100644 --- a/openVulkanoCpp/Math/DenseVector3i.hpp +++ b/openVulkanoCpp/Math/DenseVector3i.hpp @@ -13,7 +13,7 @@ #include #include -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { /** * A templated vector implementation that allows for a lower resolution of the y axis. diff --git a/openVulkanoCpp/Math/Frustum.hpp b/openVulkanoCpp/Math/Frustum.hpp index 37c39d5..16ad91e 100644 --- a/openVulkanoCpp/Math/Frustum.hpp +++ b/openVulkanoCpp/Math/Frustum.hpp @@ -16,7 +16,7 @@ #undef FAR #endif -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { class Frustum { diff --git a/openVulkanoCpp/Math/Int24.hpp b/openVulkanoCpp/Math/Int24.hpp index a1181ad..5676084 100644 --- a/openVulkanoCpp/Math/Int24.hpp +++ b/openVulkanoCpp/Math/Int24.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { class int24 final { diff --git a/openVulkanoCpp/Math/Math.hpp b/openVulkanoCpp/Math/Math.hpp index 3031528..1f580d9 100644 --- a/openVulkanoCpp/Math/Math.hpp +++ b/openVulkanoCpp/Math/Math.hpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { namespace Utils { diff --git a/openVulkanoCpp/Math/Pose.hpp b/openVulkanoCpp/Math/Pose.hpp index b22ba01..3e12ff5 100644 --- a/openVulkanoCpp/Math/Pose.hpp +++ b/openVulkanoCpp/Math/Pose.hpp @@ -9,7 +9,7 @@ #include "Timestamp.hpp" #include "Math.hpp" -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { template>> class Pose diff --git a/openVulkanoCpp/Math/RGB10A2.hpp b/openVulkanoCpp/Math/RGB10A2.hpp index 97ce5cf..aac3434 100644 --- a/openVulkanoCpp/Math/RGB10A2.hpp +++ b/openVulkanoCpp/Math/RGB10A2.hpp @@ -8,7 +8,7 @@ #include "Math.hpp" -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { template struct RGB10A2 diff --git a/openVulkanoCpp/Math/Range.hpp b/openVulkanoCpp/Math/Range.hpp index 9a1d3c1..723978b 100644 --- a/openVulkanoCpp/Math/Range.hpp +++ b/openVulkanoCpp/Math/Range.hpp @@ -11,7 +11,7 @@ #undef max #endif -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { template class Range diff --git a/openVulkanoCpp/Math/Timestamp.hpp b/openVulkanoCpp/Math/Timestamp.hpp index 47fd9b0..b09b2f8 100644 --- a/openVulkanoCpp/Math/Timestamp.hpp +++ b/openVulkanoCpp/Math/Timestamp.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp::Math +namespace OpenVulkano::Math { class Timestamp final { diff --git a/openVulkanoCpp/Scene/Camera.hpp b/openVulkanoCpp/Scene/Camera.hpp index f851733..79877f5 100644 --- a/openVulkanoCpp/Scene/Camera.hpp +++ b/openVulkanoCpp/Scene/Camera.hpp @@ -11,7 +11,7 @@ #include "Math/Frustum.hpp" #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { class Camera : public Node { diff --git a/openVulkanoCpp/Scene/DataFormat.cpp b/openVulkanoCpp/Scene/DataFormat.cpp index 9a39da5..f0efca7 100644 --- a/openVulkanoCpp/Scene/DataFormat.cpp +++ b/openVulkanoCpp/Scene/DataFormat.cpp @@ -7,7 +7,7 @@ #include "DataFormat.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { std::string_view DataFormat::GetName() const { diff --git a/openVulkanoCpp/Scene/DataFormat.hpp b/openVulkanoCpp/Scene/DataFormat.hpp index 0737c3b..e33f466 100644 --- a/openVulkanoCpp/Scene/DataFormat.hpp +++ b/openVulkanoCpp/Scene/DataFormat.hpp @@ -9,7 +9,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class DataFormat { diff --git a/openVulkanoCpp/Scene/DrawEncoder.cpp b/openVulkanoCpp/Scene/DrawEncoder.cpp index b72c52b..fe388c0 100644 --- a/openVulkanoCpp/Scene/DrawEncoder.cpp +++ b/openVulkanoCpp/Scene/DrawEncoder.cpp @@ -8,7 +8,7 @@ #include #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { namespace { diff --git a/openVulkanoCpp/Scene/DrawEncoder.hpp b/openVulkanoCpp/Scene/DrawEncoder.hpp index 4583a77..6b13080 100644 --- a/openVulkanoCpp/Scene/DrawEncoder.hpp +++ b/openVulkanoCpp/Scene/DrawEncoder.hpp @@ -8,7 +8,7 @@ #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/Scene/Drawable.cpp b/openVulkanoCpp/Scene/Drawable.cpp index 9853031..c8e6e22 100644 --- a/openVulkanoCpp/Scene/Drawable.cpp +++ b/openVulkanoCpp/Scene/Drawable.cpp @@ -8,7 +8,7 @@ #include "Scene.hpp" #include "Base/Utils.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { void Drawable::Close() { diff --git a/openVulkanoCpp/Scene/Drawable.hpp b/openVulkanoCpp/Scene/Drawable.hpp index d2cd767..db76b90 100644 --- a/openVulkanoCpp/Scene/Drawable.hpp +++ b/openVulkanoCpp/Scene/Drawable.hpp @@ -11,7 +11,7 @@ #include #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { class Node; class Scene; diff --git a/openVulkanoCpp/Scene/Geometry.cpp b/openVulkanoCpp/Scene/Geometry.cpp index e601b3d..0421fe2 100644 --- a/openVulkanoCpp/Scene/Geometry.cpp +++ b/openVulkanoCpp/Scene/Geometry.cpp @@ -17,7 +17,7 @@ #endif #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { void Geometry::Init(uint32_t vertexCount, uint32_t indexCount) { diff --git a/openVulkanoCpp/Scene/Geometry.hpp b/openVulkanoCpp/Scene/Geometry.hpp index 61181ea..ae12e4a 100644 --- a/openVulkanoCpp/Scene/Geometry.hpp +++ b/openVulkanoCpp/Scene/Geometry.hpp @@ -12,7 +12,7 @@ class aiMesh; -namespace openVulkanoCpp +namespace OpenVulkano { struct Vertex; diff --git a/openVulkanoCpp/Scene/Material.hpp b/openVulkanoCpp/Scene/Material.hpp index adc4824..36c2e2b 100644 --- a/openVulkanoCpp/Scene/Material.hpp +++ b/openVulkanoCpp/Scene/Material.hpp @@ -9,7 +9,7 @@ #include "Shader/Shader.hpp" #include "Texture.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { struct MaterialProperties { diff --git a/openVulkanoCpp/Scene/Node.cpp b/openVulkanoCpp/Scene/Node.cpp index 5a4d122..6f60112 100644 --- a/openVulkanoCpp/Scene/Node.cpp +++ b/openVulkanoCpp/Scene/Node.cpp @@ -9,7 +9,7 @@ #include "Base/Logger.hpp" #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { Node::Node() : localMat(1), worldMat(1) diff --git a/openVulkanoCpp/Scene/Node.hpp b/openVulkanoCpp/Scene/Node.hpp index 3075d20..5a193b5 100644 --- a/openVulkanoCpp/Scene/Node.hpp +++ b/openVulkanoCpp/Scene/Node.hpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { class Scene; diff --git a/openVulkanoCpp/Scene/Prefabs/GridDrawable.cpp b/openVulkanoCpp/Scene/Prefabs/GridDrawable.cpp index 1dffff4..4bac9fc 100644 --- a/openVulkanoCpp/Scene/Prefabs/GridDrawable.cpp +++ b/openVulkanoCpp/Scene/Prefabs/GridDrawable.cpp @@ -6,7 +6,7 @@ #include "GridDrawable.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { GridDrawable::GridDrawable() : Drawable(DrawEncoder::GetDrawEncoder(), DrawPhase::POST) diff --git a/openVulkanoCpp/Scene/Prefabs/GridDrawable.hpp b/openVulkanoCpp/Scene/Prefabs/GridDrawable.hpp index 595db76..a19b1c4 100644 --- a/openVulkanoCpp/Scene/Prefabs/GridDrawable.hpp +++ b/openVulkanoCpp/Scene/Prefabs/GridDrawable.hpp @@ -9,7 +9,7 @@ #include "Scene/Drawable.hpp" #include "Scene/Shader/Shader.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { class GridDrawable : public Drawable { diff --git a/openVulkanoCpp/Scene/Scene.hpp b/openVulkanoCpp/Scene/Scene.hpp index d69c81a..84aadb1 100644 --- a/openVulkanoCpp/Scene/Scene.hpp +++ b/openVulkanoCpp/Scene/Scene.hpp @@ -11,7 +11,7 @@ #include "Base/Logger.hpp" #include "Base/Utils.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Scene { diff --git a/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp b/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp index 3b68017..8d15b4d 100644 --- a/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp +++ b/openVulkanoCpp/Scene/Shader/DescriptorInputDescription.hpp @@ -8,7 +8,7 @@ #include "ShaderProgramType.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { struct DescriptorSetLayoutBinding { diff --git a/openVulkanoCpp/Scene/Shader/Shader.hpp b/openVulkanoCpp/Scene/Shader/Shader.hpp index c0479bd..bae02ed 100644 --- a/openVulkanoCpp/Scene/Shader/Shader.hpp +++ b/openVulkanoCpp/Scene/Shader/Shader.hpp @@ -14,7 +14,7 @@ #include #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { enum class CullMode : uint32_t { diff --git a/openVulkanoCpp/Scene/Shader/ShaderProgramType.hpp b/openVulkanoCpp/Scene/Shader/ShaderProgramType.hpp index 89adbd7..2f2a2c7 100644 --- a/openVulkanoCpp/Scene/Shader/ShaderProgramType.hpp +++ b/openVulkanoCpp/Scene/Shader/ShaderProgramType.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { class ShaderProgramType { diff --git a/openVulkanoCpp/Scene/Shader/VertexInputDescription.hpp b/openVulkanoCpp/Scene/Shader/VertexInputDescription.hpp index 960b15b..c034ec6 100644 --- a/openVulkanoCpp/Scene/Shader/VertexInputDescription.hpp +++ b/openVulkanoCpp/Scene/Shader/VertexInputDescription.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { struct VertexInputParameter { diff --git a/openVulkanoCpp/Scene/SimpleDrawable.cpp b/openVulkanoCpp/Scene/SimpleDrawable.cpp index a61338a..7bc3fac 100644 --- a/openVulkanoCpp/Scene/SimpleDrawable.cpp +++ b/openVulkanoCpp/Scene/SimpleDrawable.cpp @@ -7,7 +7,7 @@ #include "SimpleDrawable.hpp" #include -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { void SimpleDrawable::Init(Shader* shader, Geometry* mesh, Material* material) { diff --git a/openVulkanoCpp/Scene/SimpleDrawable.hpp b/openVulkanoCpp/Scene/SimpleDrawable.hpp index 273e14b..321eee5 100644 --- a/openVulkanoCpp/Scene/SimpleDrawable.hpp +++ b/openVulkanoCpp/Scene/SimpleDrawable.hpp @@ -8,7 +8,7 @@ #include "Drawable.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { class Geometry; class Material; diff --git a/openVulkanoCpp/Scene/Texture.hpp b/openVulkanoCpp/Scene/Texture.hpp index e1e427d..943a133 100644 --- a/openVulkanoCpp/Scene/Texture.hpp +++ b/openVulkanoCpp/Scene/Texture.hpp @@ -9,7 +9,7 @@ #include "UpdateFrequency.hpp" #include "Base/ICloseable.hpp" -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { struct Texture { diff --git a/openVulkanoCpp/Scene/UI/UI.hpp b/openVulkanoCpp/Scene/UI/UI.hpp index 9c05aff..09e8560 100644 --- a/openVulkanoCpp/Scene/UI/UI.hpp +++ b/openVulkanoCpp/Scene/UI/UI.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp::Scene::UI +namespace OpenVulkano::Scene::UI { class UiElement : public ITickable { diff --git a/openVulkanoCpp/Scene/UpdateFrequency.hpp b/openVulkanoCpp/Scene/UpdateFrequency.hpp index a2f12c7..71a91ea 100644 --- a/openVulkanoCpp/Scene/UpdateFrequency.hpp +++ b/openVulkanoCpp/Scene/UpdateFrequency.hpp @@ -6,7 +6,7 @@ #pragma once -namespace openVulkanoCpp::Scene +namespace OpenVulkano::Scene { enum class UpdateFrequency : uint8_t { diff --git a/openVulkanoCpp/Scene/Vertex.hpp b/openVulkanoCpp/Scene/Vertex.hpp index e7ddd5d..da66f86 100644 --- a/openVulkanoCpp/Scene/Vertex.hpp +++ b/openVulkanoCpp/Scene/Vertex.hpp @@ -14,7 +14,7 @@ #include #endif -namespace openVulkanoCpp +namespace OpenVulkano { struct Vertex { diff --git a/openVulkanoCpp/Shader/ShaderRegistry.cpp b/openVulkanoCpp/Shader/ShaderRegistry.cpp index 47079d8..400c552 100644 --- a/openVulkanoCpp/Shader/ShaderRegistry.cpp +++ b/openVulkanoCpp/Shader/ShaderRegistry.cpp @@ -9,7 +9,7 @@ extern "C" { #include "Shaders.h" } -namespace openVulkanoCpp +namespace OpenVulkano { ShaderRegistry& ShaderRegistry::GetInstance() { diff --git a/openVulkanoCpp/Shader/ShaderRegistry.hpp b/openVulkanoCpp/Shader/ShaderRegistry.hpp index 31efe61..797248c 100644 --- a/openVulkanoCpp/Shader/ShaderRegistry.hpp +++ b/openVulkanoCpp/Shader/ShaderRegistry.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { struct ShaderTableEntry final { diff --git a/openVulkanoCpp/Vulkan/Buffer.hpp b/openVulkanoCpp/Vulkan/Buffer.hpp index 9b8d5da..373497c 100644 --- a/openVulkanoCpp/Vulkan/Buffer.hpp +++ b/openVulkanoCpp/Vulkan/Buffer.hpp @@ -2,7 +2,7 @@ #include "Base/ICloseable.hpp" #include "Device.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/Vulkan/CommandHelper.hpp b/openVulkanoCpp/Vulkan/CommandHelper.hpp index 46098a6..0ee2b79 100644 --- a/openVulkanoCpp/Vulkan/CommandHelper.hpp +++ b/openVulkanoCpp/Vulkan/CommandHelper.hpp @@ -9,7 +9,7 @@ #include "Base/ICloseable.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/Vulkan/Context.cpp b/openVulkanoCpp/Vulkan/Context.cpp index 03b8e8e..59706f5 100644 --- a/openVulkanoCpp/Vulkan/Context.cpp +++ b/openVulkanoCpp/Vulkan/Context.cpp @@ -13,7 +13,7 @@ #include "Base/UI/IVulkanWindow.hpp" #include "Debuging/ValidationLayer.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void Context::Init(IGraphicsAppManager* graphicsAppManager, IVulkanWindow* window) { diff --git a/openVulkanoCpp/Vulkan/Context.hpp b/openVulkanoCpp/Vulkan/Context.hpp index f9181be..d474963 100644 --- a/openVulkanoCpp/Vulkan/Context.hpp +++ b/openVulkanoCpp/Vulkan/Context.hpp @@ -11,7 +11,7 @@ #include "SwapChain.hpp" #include "RenderPass.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { class IVulkanWindow; class IGraphicsAppManager; diff --git a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp index 0732193..bcedf26 100644 --- a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp +++ b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.cpp @@ -10,7 +10,7 @@ //#define RENDER_DOC -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { const std::initializer_list activeValidationLayerNames = { "VK_LAYER_LUNARG_assistant_layer", diff --git a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.hpp b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.hpp index 97681e0..f195ee5 100644 --- a/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.hpp +++ b/openVulkanoCpp/Vulkan/Debuging/ValidationLayer.hpp @@ -11,7 +11,7 @@ #include #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class Debug { diff --git a/openVulkanoCpp/Vulkan/Device.cpp b/openVulkanoCpp/Vulkan/Device.cpp index 3d8a4d5..6080108 100644 --- a/openVulkanoCpp/Vulkan/Device.cpp +++ b/openVulkanoCpp/Vulkan/Device.cpp @@ -8,7 +8,7 @@ #include "Base/Utils.hpp" #include "Shader/ShaderRegistry.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { namespace { diff --git a/openVulkanoCpp/Vulkan/Device.hpp b/openVulkanoCpp/Vulkan/Device.hpp index 8e9ee3a..a951c1e 100644 --- a/openVulkanoCpp/Vulkan/Device.hpp +++ b/openVulkanoCpp/Vulkan/Device.hpp @@ -12,7 +12,7 @@ #include #include "Base/ICloseable.hpp" -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/Vulkan/DeviceManager.cpp b/openVulkanoCpp/Vulkan/DeviceManager.cpp index f3313da..d540e4e 100644 --- a/openVulkanoCpp/Vulkan/DeviceManager.cpp +++ b/openVulkanoCpp/Vulkan/DeviceManager.cpp @@ -8,7 +8,7 @@ #include "Device.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void DeviceManager::Init(const vk::Instance& instance) { diff --git a/openVulkanoCpp/Vulkan/DeviceManager.hpp b/openVulkanoCpp/Vulkan/DeviceManager.hpp index f60e906..a19bf46 100644 --- a/openVulkanoCpp/Vulkan/DeviceManager.hpp +++ b/openVulkanoCpp/Vulkan/DeviceManager.hpp @@ -10,7 +10,7 @@ #include #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class Device; diff --git a/openVulkanoCpp/Vulkan/FrameBuffer.cpp b/openVulkanoCpp/Vulkan/FrameBuffer.cpp index bd0ad9f..3790955 100644 --- a/openVulkanoCpp/Vulkan/FrameBuffer.cpp +++ b/openVulkanoCpp/Vulkan/FrameBuffer.cpp @@ -7,7 +7,7 @@ #include "FrameBuffer.hpp" #include "RenderPass.hpp" -void openVulkanoCpp::Vulkan::FrameBuffer::Init(Device* device, vk::Extent3D size, bool useDepthBuffer) +void OpenVulkano::Vulkan::FrameBuffer::Init(Device* device, vk::Extent3D size, bool useDepthBuffer) { this->size = size; this->device = device; @@ -20,7 +20,7 @@ void openVulkanoCpp::Vulkan::FrameBuffer::Init(Device* device, vk::Extent3D size } } -void openVulkanoCpp::Vulkan::FrameBuffer::RegisterRenderPass(RenderPass* renderPass) +void OpenVulkano::Vulkan::FrameBuffer::RegisterRenderPass(RenderPass* renderPass) { if (!device) throw std:: runtime_error("The frame buffer needs to be initialized before binding it to a render pass"); @@ -33,7 +33,7 @@ void openVulkanoCpp::Vulkan::FrameBuffer::RegisterRenderPass(RenderPass* renderP if (renderPasses.size() == 1) CreateFrameBuffer(); } -void openVulkanoCpp::Vulkan::FrameBuffer::Resize(vk::Extent3D size) +void OpenVulkano::Vulkan::FrameBuffer::Resize(vk::Extent3D size) { this->size = size; DestroyFrameBuffer(); @@ -46,7 +46,7 @@ void openVulkanoCpp::Vulkan::FrameBuffer::Resize(vk::Extent3D size) } } -void openVulkanoCpp::Vulkan::FrameBuffer::CreateDepthStencil() +void OpenVulkano::Vulkan::FrameBuffer::CreateDepthStencil() { vk::ImageCreateInfo depthStencilCreateInfo({}, vk::ImageType::e2D, depthBufferFormat, size, 1, 1); @@ -64,7 +64,7 @@ void openVulkanoCpp::Vulkan::FrameBuffer::CreateDepthStencil() }); } -void openVulkanoCpp::Vulkan::FrameBuffer::CreateFrameBuffer() +void OpenVulkano::Vulkan::FrameBuffer::CreateFrameBuffer() { vk::ImageView attachments[2]; // First attachment is the color buffer, second (optional) the depth buffer if (useDepthBuffer) attachments[1] = depthBuffer.view; //Depth buffer is the same for all frame buffers @@ -80,7 +80,7 @@ void openVulkanoCpp::Vulkan::FrameBuffer::CreateFrameBuffer() } } -void openVulkanoCpp::Vulkan::FrameBuffer::DestroyFrameBuffer() +void OpenVulkano::Vulkan::FrameBuffer::DestroyFrameBuffer() { for (const auto frameBuffer : frameBuffers) { diff --git a/openVulkanoCpp/Vulkan/FrameBuffer.hpp b/openVulkanoCpp/Vulkan/FrameBuffer.hpp index 2a0d2a0..9b78bf6 100644 --- a/openVulkanoCpp/Vulkan/FrameBuffer.hpp +++ b/openVulkanoCpp/Vulkan/FrameBuffer.hpp @@ -13,7 +13,7 @@ #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class RenderPass; diff --git a/openVulkanoCpp/Vulkan/Image.cpp b/openVulkanoCpp/Vulkan/Image.cpp index 7567f23..29ab8b9 100644 --- a/openVulkanoCpp/Vulkan/Image.cpp +++ b/openVulkanoCpp/Vulkan/Image.cpp @@ -6,7 +6,7 @@ #include "Image.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void Image::Init(const Device* device, const vk::ImageCreateInfo& imageCreateInfo, vk::ImageViewCreateInfo imageViewCreateInfo, const vk::MemoryPropertyFlags& memoryPropertyFlags) diff --git a/openVulkanoCpp/Vulkan/Image.hpp b/openVulkanoCpp/Vulkan/Image.hpp index 77e8527..f3304fc 100644 --- a/openVulkanoCpp/Vulkan/Image.hpp +++ b/openVulkanoCpp/Vulkan/Image.hpp @@ -10,7 +10,7 @@ #include "VulkanUtils.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class IImage { diff --git a/openVulkanoCpp/Vulkan/RenderPass.cpp b/openVulkanoCpp/Vulkan/RenderPass.cpp index c882bc8..b7afa50 100644 --- a/openVulkanoCpp/Vulkan/RenderPass.cpp +++ b/openVulkanoCpp/Vulkan/RenderPass.cpp @@ -8,7 +8,7 @@ #include "FrameBuffer.hpp" #include "Base/EngineConfiguration.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void RenderPass::Init(Device* device, FrameBuffer* frameBuffer, bool clearColor, bool clearDepth) { diff --git a/openVulkanoCpp/Vulkan/RenderPass.hpp b/openVulkanoCpp/Vulkan/RenderPass.hpp index 6afe571..71a7f3f 100644 --- a/openVulkanoCpp/Vulkan/RenderPass.hpp +++ b/openVulkanoCpp/Vulkan/RenderPass.hpp @@ -9,7 +9,7 @@ #include "Device.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class FrameBuffer; diff --git a/openVulkanoCpp/Vulkan/Renderer.cpp b/openVulkanoCpp/Vulkan/Renderer.cpp index 7374fb7..0911a38 100644 --- a/openVulkanoCpp/Vulkan/Renderer.cpp +++ b/openVulkanoCpp/Vulkan/Renderer.cpp @@ -16,7 +16,7 @@ #include "Vulkan/Scene/VulkanCamera.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void Renderer::Init(IGraphicsAppManager* graphicsAppManager, IWindow* window) { diff --git a/openVulkanoCpp/Vulkan/Renderer.hpp b/openVulkanoCpp/Vulkan/Renderer.hpp index df5cfc8..b56d686 100644 --- a/openVulkanoCpp/Vulkan/Renderer.hpp +++ b/openVulkanoCpp/Vulkan/Renderer.hpp @@ -19,7 +19,7 @@ #include #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct WaitSemaphores { diff --git a/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp b/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp index 0ebe2ed..01824f0 100644 --- a/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp +++ b/openVulkanoCpp/Vulkan/Resources/IShaderOwner.hpp @@ -6,7 +6,7 @@ #pragma once -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct VulkanShader; diff --git a/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp b/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp index 3c2dc5a..871f266 100644 --- a/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp +++ b/openVulkanoCpp/Vulkan/Resources/ManagedResource.cpp @@ -7,7 +7,7 @@ #include "ManagedResource.hpp" #include "Base/Logger.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void MemoryAllocation::HandleChildMappingValidation() const { diff --git a/openVulkanoCpp/Vulkan/Resources/ManagedResource.hpp b/openVulkanoCpp/Vulkan/Resources/ManagedResource.hpp index 91080ee..71df4dd 100644 --- a/openVulkanoCpp/Vulkan/Resources/ManagedResource.hpp +++ b/openVulkanoCpp/Vulkan/Resources/ManagedResource.hpp @@ -12,7 +12,7 @@ #include #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct MemoryAllocation { diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp index 716e868..5d1b409 100644 --- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp +++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp @@ -17,7 +17,7 @@ #include "Vulkan/Image.hpp" #include "Vulkan/Scene/VulkanCamera.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { ResourceManager* ResourceManager::INSTANCE; diff --git a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp index f983dea..51ad248 100644 --- a/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp +++ b/openVulkanoCpp/Vulkan/Resources/ResourceManager.hpp @@ -17,7 +17,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Scene { @@ -88,7 +88,7 @@ namespace openVulkanoCpp void RemoveShader(VulkanShader* shader) override; - void CopyDataToImage(vk::DeviceSize size, void* data, openVulkanoCpp::Vulkan::Image* image); + void CopyDataToImage(vk::DeviceSize size, void* data, OpenVulkano::Vulkan::Image* image); ManagedBuffer* CreateSharedMemoryBuffer(size_t size); diff --git a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.cpp b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.cpp index 42b329d..9deaf8b 100644 --- a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.cpp +++ b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.cpp @@ -10,7 +10,7 @@ #include "Vulkan/VulkanDrawContext.hpp" #include "Vulkan/Scene/VulkanShader.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void UniformBuffer::Init(ManagedBuffer* buffer, uint32_t frameOffset, uint32_t frameSize, vk::DescriptorSetLayout* descriptorSetLayout, const DescriptorSetLayoutBinding& binding, uint32_t setId) { diff --git a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp index c217056..cd83ecb 100644 --- a/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp +++ b/openVulkanoCpp/Vulkan/Resources/UniformBuffer.hpp @@ -9,7 +9,7 @@ #include "Base/ICloseable.hpp" #include "Vulkan/Scene/IRecordable.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct ManagedBuffer; diff --git a/openVulkanoCpp/Vulkan/Scene/GridDrawableVulkanEncoder.cpp b/openVulkanoCpp/Vulkan/Scene/GridDrawableVulkanEncoder.cpp index 386390e..98f4345 100644 --- a/openVulkanoCpp/Vulkan/Scene/GridDrawableVulkanEncoder.cpp +++ b/openVulkanoCpp/Vulkan/Scene/GridDrawableVulkanEncoder.cpp @@ -8,9 +8,9 @@ #include "VulkanGeometry.hpp" #include "Vulkan/VulkanDrawContext.hpp" -using namespace openVulkanoCpp::Scene; +using namespace OpenVulkano::Scene; -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void EncodeGridDrawable(Drawable* instance, Vulkan::VulkanDrawContext* drawContext) { @@ -20,5 +20,5 @@ namespace openVulkanoCpp::Vulkan namespace { - void* gridDrawableVulkanEncoderReg = DrawEncoder::RegisterVulkanEncodeFunction(&openVulkanoCpp::Vulkan::EncodeGridDrawable); + void* gridDrawableVulkanEncoderReg = DrawEncoder::RegisterVulkanEncodeFunction(&OpenVulkano::Vulkan::EncodeGridDrawable); } \ No newline at end of file diff --git a/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp b/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp index 1727021..e7e8173 100644 --- a/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp +++ b/openVulkanoCpp/Vulkan/Scene/IRecordable.hpp @@ -9,7 +9,7 @@ #include "Vulkan/VulkanDrawContext.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class IRecordable { diff --git a/openVulkanoCpp/Vulkan/Scene/SimpleDrawableVulkanEncoder.cpp b/openVulkanoCpp/Vulkan/Scene/SimpleDrawableVulkanEncoder.cpp index e1d3029..3d0c892 100644 --- a/openVulkanoCpp/Vulkan/Scene/SimpleDrawableVulkanEncoder.cpp +++ b/openVulkanoCpp/Vulkan/Scene/SimpleDrawableVulkanEncoder.cpp @@ -9,9 +9,9 @@ #include "VulkanNode.hpp" #include "Vulkan/VulkanDrawContext.hpp" -using namespace openVulkanoCpp::Scene; +using namespace OpenVulkano::Scene; -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void EncodeSimpleDrawable(Drawable* instance, Vulkan::VulkanDrawContext* drawContext) { @@ -30,5 +30,5 @@ namespace openVulkanoCpp::Vulkan namespace { - void* simpleDrawableVulkanEncoderReg = DrawEncoder::RegisterVulkanEncodeFunction(&openVulkanoCpp::Vulkan::EncodeSimpleDrawable); + void* simpleDrawableVulkanEncoderReg = DrawEncoder::RegisterVulkanEncodeFunction(&OpenVulkano::Vulkan::EncodeSimpleDrawable); } \ No newline at end of file diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp index fa7dc8e..9c0a835 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanCamera.hpp @@ -10,7 +10,7 @@ #include "IRecordable.hpp" #include "Vulkan/Resources/UniformBuffer.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class VulkanCamera : public ICloseable, public IRecordable { diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp index 920fc8d..4d6c9f2 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp @@ -11,7 +11,7 @@ #include "Scene/Geometry.hpp" #include "Vulkan/Resources/ManagedResource.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class VulkanGeometry final : public ICloseable { diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp index 1f0546e..8e4aced 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanNode.hpp @@ -11,7 +11,7 @@ #include "Scene/Camera.hpp" #include "Vulkan/Resources/UniformBuffer.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct VulkanNode : IRecordable, ICloseable { diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp index 74fdb8e..11870f3 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp @@ -10,7 +10,7 @@ #include "Vulkan/Resources/IShaderOwner.hpp" #include "Scene/Shader/DescriptorInputDescription.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { static_assert(sizeof(vk::DescriptorSetLayoutBinding) == sizeof(DescriptorSetLayoutBinding)); diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp index e5a5062..02cb77a 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanShader.hpp @@ -11,7 +11,7 @@ #include #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Scene { diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanTexture.hpp b/openVulkanoCpp/Vulkan/Scene/VulkanTexture.hpp index 8caac1e..63a061e 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanTexture.hpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanTexture.hpp @@ -12,7 +12,7 @@ #include "Vulkan/Resources/ResourceManager.hpp" #include "Scene/Texture.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { struct VulkanTexture : IRecordable, Image { diff --git a/openVulkanoCpp/Vulkan/SwapChain.cpp b/openVulkanoCpp/Vulkan/SwapChain.cpp index f0a6e73..6f8f565 100644 --- a/openVulkanoCpp/Vulkan/SwapChain.cpp +++ b/openVulkanoCpp/Vulkan/SwapChain.cpp @@ -12,7 +12,7 @@ #include "Scene/DataFormat.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void SwapChain::Init(Device* device, vk::SurfaceKHR surface, IVulkanWindow* window) { diff --git a/openVulkanoCpp/Vulkan/SwapChain.hpp b/openVulkanoCpp/Vulkan/SwapChain.hpp index c3e3a80..a2378a2 100644 --- a/openVulkanoCpp/Vulkan/SwapChain.hpp +++ b/openVulkanoCpp/Vulkan/SwapChain.hpp @@ -12,7 +12,7 @@ #include "Base/UI/IWindow.hpp" #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/Vulkan/UiRenderer.cpp b/openVulkanoCpp/Vulkan/UiRenderer.cpp index 7e15cae..f675f34 100644 --- a/openVulkanoCpp/Vulkan/UiRenderer.cpp +++ b/openVulkanoCpp/Vulkan/UiRenderer.cpp @@ -16,7 +16,7 @@ #include "Host/ImGuiImplOpenVulkano.hpp" #endif -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void UiRenderer::Init(Context* context) { diff --git a/openVulkanoCpp/Vulkan/UiRenderer.hpp b/openVulkanoCpp/Vulkan/UiRenderer.hpp index 83afb87..44dbd09 100644 --- a/openVulkanoCpp/Vulkan/UiRenderer.hpp +++ b/openVulkanoCpp/Vulkan/UiRenderer.hpp @@ -11,7 +11,7 @@ #include "Scene/UI/UI.hpp" #include -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class Context; diff --git a/openVulkanoCpp/Vulkan/VulkanDrawContext.cpp b/openVulkanoCpp/Vulkan/VulkanDrawContext.cpp index 1586ef1..7189144 100644 --- a/openVulkanoCpp/Vulkan/VulkanDrawContext.cpp +++ b/openVulkanoCpp/Vulkan/VulkanDrawContext.cpp @@ -9,7 +9,7 @@ #include "Scene/VulkanShader.hpp" #include "Scene/VulkanCamera.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { void VulkanDrawContext::EncodeShader(Scene::Shader* shader) { diff --git a/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp b/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp index 9b7a71d..ebb3ff8 100644 --- a/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp +++ b/openVulkanoCpp/Vulkan/VulkanDrawContext.hpp @@ -8,7 +8,7 @@ #include "Renderer.hpp" -namespace openVulkanoCpp::Vulkan +namespace OpenVulkano::Vulkan { class VulkanDrawContext { diff --git a/openVulkanoCpp/Vulkan/VulkanUtils.hpp b/openVulkanoCpp/Vulkan/VulkanUtils.hpp index 9b7ed10..0f0541e 100644 --- a/openVulkanoCpp/Vulkan/VulkanUtils.hpp +++ b/openVulkanoCpp/Vulkan/VulkanUtils.hpp @@ -1,7 +1,7 @@ #pragma once #include -namespace openVulkanoCpp +namespace OpenVulkano { namespace Vulkan { diff --git a/openVulkanoCpp/main.cpp b/openVulkanoCpp/main.cpp index c53641a..ad8ae41 100644 --- a/openVulkanoCpp/main.cpp +++ b/openVulkanoCpp/main.cpp @@ -8,7 +8,7 @@ #include "Base/EngineConfiguration.hpp" #include "ExampleApps/CubesExampleApp.hpp" -using namespace openVulkanoCpp; +using namespace OpenVulkano; int main(int argc, char** argv) {